projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-10-18 10:02:58 -04:00
Code Issues Projects Releases Wiki Activity

Merge holocore/quality_assurance into expertise_training

Browse Source 
Conflicts:
	src/services/experience/SkillService.java
	src/services/experience/SkillTemplateService.java
	src/services/player/CharacterCreationService.java
This commit is contained in:
Mads Boddum
2016-10-29 08:09:36 +02:00
parent 730632f9bc 07eb924bd4
commit 8bc33ac932
56 changed files with 2632 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatManager.java
+2
View File
@@ -484,6 +484,8 @@ public class CombatManager extends Manager {
case DEAD:
case INCAPACITATED:
return CombatStatus.INVALID_TARGET;
default:
break;
}
}