Waverunner d15b0d83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 ...

Conflicts:
	src/services/EntertainmentService.java

2014-03-26 20:08:30 -04:00

..

buffs

Merge remote-tracking branch 'origin/master' into Wave_Entertainer

2014-03-23 14:32:45 -04:00

collections

Added Buff Workshop Collection, hologram variable to creatureobject

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

commands

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-03-26 20:08:30 -04:00

equipment

Misc - Cleaned up EquipmentService

2014-03-24 03:18:02 +01:00

expertise

Fixed BH + Commando armor upgrades

2014-03-26 22:34:43 +01:00

faction

FactionService, helper funcs, factionResponseMsg

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

instances

Instance implementation

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

mobiles

Added xp gain on killing NPCs, fixed some bugs, added 2 new config options

2014-03-26 23:37:10 +01:00

object

Initial work on Character Builder Terminal

2014-03-23 19:19:18 -04:00

radial

No exp for entertainer above 90, fixed unity radial, changed giveItems

2014-03-23 15:59:29 -04:00

roadmap

Scripts - Roadmap rewards are now located in profession roadmap scripts

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

skillMods

Fixed BH + Commando armor upgrades

2014-03-26 22:34:43 +01:00

static_spawns

Initial work on Character Builder Terminal

2014-03-23 19:19:18 -04:00

demo.py

Corrected commenting on unneeded script.

2013-12-14 18:48:26 -05: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

Corrected "Doaba Guerfel Starport" travel point.

2013-12-06 22:46:07 -05:00

weather.py

Added weather

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