CharonInferar 53c1ea65e9 merge conflict fix 2

2014-04-13 20:39:36 +02:00

..

buffs

Delete set_bonus_jedi_utility_b_3.py

2014-04-13 11:17:42 -04:00

collections

Added Buff Workshop Collection, hologram variable to creatureobject

2014-03-23 13:42:18 -04:00

commands

Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates

2014-04-13 13:37:54 -04:00

conversation

godLevel is now set and used

2014-04-13 14:50:21 +02:00

equipment

Delete set_bonus_jedi_utility_b.py

2014-04-13 11:18:28 -04:00

expertise

Fixed #396: Environmental Purge not granting.

2014-04-08 16:30:19 -04:00

faction

FactionService, helper funcs, factionResponseMsg

2013-12-06 12:14:13 +00:00

houses

Changes to housing, added real player lot count to character sheet

2014-04-09 11:56:56 -04:00

instances

Instance implementation

2014-03-19 19:43:29 +00:00

loot

Rare loot system stage added

2014-04-10 17:04:52 +02:00

mobiles

Fixed some housing bugs and Tusken Raider mobile template - see extended

2014-04-12 18:13:11 -04:00

object

merge conflict fix 2

2014-04-13 20:39:36 +02:00

radial

merge conflict fix 2

2014-04-13 20:39:36 +02:00

roadmap

Scripts - Roadmap rewards are now located in profession roadmap scripts

2014-03-23 06:26:32 +01:00

skillMods

Temporarily disabled actionPercent and healthPercent skillmods

2014-04-01 17:36:16 -04:00

static_spawns

More unnecessary distractive Content Development

2014-04-07 18:56:33 +02:00

demo.py

Removed structure trader, start work on guildbanks

2014-04-01 03:18:58 +01:00

gcwzones.py

GCWZones work fully, completely in their entirety

2013-08-23 23:29:15 +01:00

static_map_locations.py

Corrected Deeja Peak Location

2013-12-04 19:39:46 -05:00

static_travel_points.py

Swapped correct Dantooine travel point names.

2014-04-10 06:39:52 -05:00

weather.py

Added weather

2013-11-21 15:17:32 +01:00