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

Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java

2014-04-18 21:10:53 +01:00

..

buffs

Burst of Shadows Now Works Properly

2014-04-15 16:35:59 -04:00

collections

…

commands

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

2014-04-18 21:10:53 +01:00

conversation

godLevel is now set and used

2014-04-13 14:50:21 +02:00

equipment

Refactored WeaponObject

2014-04-14 19:58:43 +02:00

expertise

Fixed an issue where saber reflect would not be granted upon speccing it in expertise - fixed a vehicle radial bug

2014-04-16 13:27:12 -04:00

faction

…

houses

Added Generic House Small Style 02

2014-04-18 18:16:36 +02:00

instances

…

loot

Improvements on loot system

2014-04-16 17:18:59 +02:00

mobiles

preliminary armor drops test

2014-04-15 20:34:58 +02:00

object

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

2014-04-18 21:10:53 +01:00

radial

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

2014-04-18 21:10:53 +01:00

roadmap

Added Commando roadmap rewards

2014-04-15 18:10:46 +02: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

…

static_travel_points.py

Swapped correct Dantooine travel point names.

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

weather.py

…