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

Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java

2014-04-29 05:04:23 +01:00

..

buffs

Fix of skill/stats in heroic sets

2014-04-19 20:44:51 +02:00

collections

…

commands

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

2014-04-29 05:04:23 +01:00

conversation

Changes to MissionObjective, started working on player bounties

2014-04-28 17:37:23 -04: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

…

houses

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

2014-04-29 05:04:23 +01:00

instances

…

loot

Fixed Loot Item

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

mobiles

Merge pull request #559 from tacef/master

2014-04-28 23:33:26 +01:00

object

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

2014-04-29 05:04:23 +01:00

radial

useObject adds the UseTarget

2014-04-29 04:49:42 +01: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

Added all (findable) junk dealer types

2014-04-29 02:54:59 +01:00

demo.py

…

gcwzones.py

…

static_map_locations.py

…

static_travel_points.py

Swapped correct Dantooine travel point names.

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

weather.py

…