CharonInferar abe8d6475f Merge remote-tracking branch 'origin/master' into LootSystem ...

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

2014-04-10 00:38:13 +02:00

..

buffs

Fixed #255: Evasion not exiting combat

2014-04-07 16:22:36 -04:00

collections

Added Buff Workshop Collection, hologram variable to creatureobject

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

commands

Preliminary housing

2014-04-08 23:47:59 -04:00

conversation

Script syntax error

2014-04-07 18:56:32 +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

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

More Junk, Krayt Pearls added

2014-04-09 21:16:28 +02: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 LootSystem

2014-04-10 00:38:13 +02:00

radial

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

2014-04-10 00:38:13 +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

…

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

…