Mads Boddum
43e0e9c543
Merge holocore/quality_assurance into quality_assurance
Conflicts:
scripts/commands/generic/cmdPVP.js
src/network/packets/swg/zone/object_controller/DataTransformWithParent.java
src/resources/commands/callbacks/QaToolCmdCallback.java
src/resources/objects/SWGObject.java
src/resources/objects/creature/CreatureObject.java
src/resources/objects/creature/CreatureObjectSharedNP.java
src/services/collections/CollectionBadgeManager.java
src/services/combat/CombatManager.java
src/services/commands/CommandService.java
src/services/experience/ExperienceManager.java
src/services/experience/SkillService.java
src/services/experience/SkillTemplateService.java
src/services/galaxy/GameManager.java
src/services/objects/ObjectAwareness.java
src/services/player/CharacterCreationService.java
src/services/player/ZoneManager.java
2016-11-15 14:15:35 +01:00
..
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-08 22:27:38 +02:00
2015-10-08 22:27:38 +02:00
2015-10-09 18:57:47 +02:00
2015-10-08 22:27:38 +02:00
2016-10-03 13:26:08 +02:00
2016-05-24 14:57:22 -04:00
2016-10-27 20:23:41 +02:00
2016-07-05 18:07:14 -04:00
2015-10-13 09:35:18 -04:00
2016-08-14 22:35:01 -04:00
2015-10-04 17:40:40 -04:00
2016-04-03 02:05:58 +02:00
2016-09-14 04:50:18 +02:00
2015-10-04 17:40:40 -04:00
2016-09-14 04:50:18 +02:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2016-09-16 08:36:42 +02:00
2016-05-30 17:52:05 -04:00
2015-10-05 17:39:02 -04:00
2016-05-19 12:59:59 -04:00
2016-06-19 20:06:51 -04:00
2016-06-19 20:06:51 -04:00
2016-10-31 07:45:02 +01:00
2015-10-04 17:40:40 -04:00
2015-10-08 13:42:44 +02:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2016-05-15 15:23:50 +02:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00
2015-10-04 17:40:40 -04:00