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

..

creature

Overhauled Mounts (still buggy)

2014-04-18 19:09:45 +01:00

datapad

Overhauled Mounts (still buggy)

2014-04-18 19:09:45 +01:00

deeds

Overhauled Mounts (still buggy)

2014-04-18 19:09:45 +01:00

equipment

Tidied radials

2014-04-13 21:46:51 +01:00

holidays

Tidied radials

2014-04-13 21:46:51 +01:00

instances/exar_kun

Tidied radials

2014-04-13 21:46:51 +01:00

item

Tidied radials

2014-04-13 21:46:51 +01:00

npc

Loot window added

2014-04-16 05:23:30 +02:00

object

Tidied radials

2014-04-13 21:46:51 +01:00

ring

No exp for entertainer above 90, fixed unity radial, changed giveItems

2014-03-23 15:59:29 -04:00

structure

Tidied radials

2014-04-13 21:46:51 +01:00

terminal

Fixed #285

2014-03-28 21:41:57 -04:00

default.py

Fixed use(), needs radial_filename to be 'usable'

2013-12-09 10:30:09 +00:00

lootitem.py

Improvements on loot system

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

noradialoptions.py

Loot window added

2014-04-16 05:23:30 +02:00