CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn ...

Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java

2014-04-06 03:59:55 +02:00

..

buffs

Fixed error

2014-04-03 15:59:10 -04:00

collections

Added Buff Workshop Collection, hologram variable to creatureobject

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

commands

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

2014-04-06 03:59:55 +02:00

conversation

Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check

2014-04-02 18:12:08 +02:00

equipment

Added the ability to add items to a bonus set via STF Name, added Heroism Bonus Set, added Heroism Jewlery set to frog

2014-04-05 12:40:51 -04:00

expertise

Spy - expertise scripts reworked

2014-04-05 11:53:34 +02: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

AI changes, added Stormtrooper and fixed creature names for Krettle, Chuba, and Womprat

2014-03-31 14:14:51 -04:00

object

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

2014-04-06 03:59:55 +02:00

radial

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

2014-04-06 03:59:55 +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

Added Miscellanous Kaas Statics

2014-04-05 03:22:44 -04: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

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