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

..

commands

Merge holocore/quality_assurance into quality_assurance

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

objects

Redid observers and awareness and fixed NPCs inside buildings

2016-05-15 17:14:55 -05:00

radial

Merge holocore/quality_assurance into quality_assurance

2016-08-07 14:47:53 +02:00