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

Conflicts:
	src/resources/common/BountyListItem.java

2014-04-30 15:57:30 -04:00

..

buffs

Fix of skill/stats in heroic sets

2014-04-19 20:44:51 +02: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-04-30 15:57:30 -04:00

conversation

merge conflict resolve

2014-04-30 19:45:12 +02:00

equipment

Fixed bonus sets equip message

2014-04-24 16:31:52 +02:00

expertise

Bounty Hunter - Fixed Fumble expertise

2014-04-26 19:23:55 +02:00

faction

FactionService, helper funcs, factionResponseMsg

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

houses

Reconstruction of classes

2014-04-30 21:48:07 +02:00

instances

Instance implementation

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

loot

Fixed Loot Item

2014-04-26 23:05:07 -04:00

mobiles

merge conflict resolve

2014-04-30 19:45:12 +02:00

object

Reconstruction of classes

2014-04-30 21:48:07 +02:00

radial

merge conflict

2014-04-30 19:58:18 +02:00

roadmap

Added Commando roadmap rewards

2014-04-15 18:10:46 +02:00

skillMods

Fixed minor agility_modified.py error

2014-04-27 01:06:57 +01:00

static_spawns

Revert "Temp Fix to Static Spawns"

2014-04-29 18:33:00 +01:00

demo.py

Removed structure trader, start work on guildbanks

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

gcwzones.py

…

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

…