Skyler Lehan cfe88e0032 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups ...

# Conflicts:
#	src/resources/objects/group/GroupObject.java

2016-06-06 19:25:02 -04:00

..

combat

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

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

generic

Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups

2016-06-06 19:25:02 -04:00

helper/qatool

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

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