Mads Boddum 431845aec7 Merge holocore/quality_assurance into new_forwarder ...

Conflicts:
	src/network/packets/swg/zone/object_controller/DataTransform.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/services/combat/CombatService.java
	src/services/dev/DeveloperService.java
	src/services/player/ZoneManager.java

2016-05-14 13:15:16 +02:00

..

combat

Added easier way of doing damage in scripts and fixed CombatAction implementation

2016-05-09 09:15:32 -05:00

generic

Deleted NGE /pvp command script

2016-04-30 10:37:10 +02:00

helper/qatool

Added health information to the qatool detail script

2016-05-13 16:23:48 -05:00