Mads Boddum 21ea900c3c Merge holocore/quality_assurance into quality_assurance ...

Conflicts:
	src/resources/commands/callbacks/QaToolCmdCallback.java
	src/services/collections/CollectionBadgeManager.java
	src/services/experience/ExperienceManager.java
	src/services/experience/SkillTemplateService.java
	src/services/group/GroupService.java
	src/services/objects/UniformBoxService.java

2016-08-24 23:41:04 +02:00

..

combat

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

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

generic

Merge holocore/quality_assurance into quality_assurance

2016-08-24 23:41:04 +02:00

helper/qatool

Made intent factory broadcasts sequential and added additional awareness debug to details.js

2016-06-06 08:00:56 -05:00