projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-15 05:13:08 -04:00
Code Issues Projects Releases Wiki Activity
2,638 Commits 16 Branches 86 Tags
2bbbcef7cae7e4eb6491d697b0b3c2b399dc844f
Commit Graph
1865 Commits
Author SHA1 Message Date
Mads Boddum 2bbbcef7ca Fixed an issue where faction status never changed 2016-10-18 04:18:46 +02:00
Mads Boddum 52dcac8eca Moved a case in a switch statement down a bit 2016-10-17 20:36:11 +02:00
Mads Boddum 6a50a64080 Fixed logging error in CorpseService.loadFacilityData() 2016-10-17 20:30:00 +02:00
Mads Boddum bfc5a2707d Cleaned up CorpseService and CityService 2016-10-17 20:28:23 +02:00
Mads Boddum 2746f4092c Fixed compiler error in FactionService.handleTypeChange() 2016-10-17 19:42:48 +02:00
Mads Boddum 634d8751a5 Renamed variables across methods in FactionService 2016-10-17 19:36:20 +02:00
Mads Boddum 32e2ad6ef4 Refactored FactionService.handleStatusChange() slightly 2016-10-17 19:17:12 +02:00
Mads Boddum 48f3db0140 Shortened some logic in CorpseService 2016-10-17 19:10:11 +02:00
Mads Boddum 33bbc8a8d3 Removed broken terrain and area mappings for cloning for now 2016-10-17 18:44:05 +02:00
Mads Boddum e94d11c23e Fixed broken faction status switching messages 2016-10-15 18:48:28 +02:00
Mads Boddum f80008bc5a Cloned players now go on leave 2016-10-13 04:24:42 +02:00
Mads Boddum 291961eac0 Merge holocore/quality_assurance into cloning 
Conflicts:
	src/services/faction/FactionService.java
 2016-10-13 03:40:32 +02:00
Mads Boddum cca8a0c725 Reduced the length of some logic in CorpseService 2016-10-13 03:35:39 +02:00
Mads Boddum fa46576f5a Removed an old TODO in StaticItemService 2016-10-12 18:43:47 +02:00
Mads Boddum c3eb3f9ed9 Fixed heavy weapons not being loaded and DPS attribute is now applied 2016-10-12 18:42:34 +02:00
Obique PSWG 77ed25fe51 Merged in M4SS/holocore/weapon_damage (pull request #323) 
NGE-466 - Account for weapon damage in combat calculations
 2016-10-12 15:02:49 +00:00
Mads Boddum 02973c7c82 Fixed WeaponObject versioning 2016-10-12 16:02:53 +02:00
Mads Boddum 22993660ae Weapon damage is now accounted for 2016-10-12 15:43:21 +02:00
Obique PSWG 539c4f2f45 Merged in M4SS/holocore/combat_xp (pull request #322) 
NGE-429 - Combat XP
 2016-10-12 13:34:55 +00:00
Mads Boddum 1ddd171f60 Split some big methods in CorpseService into smaller ones 2016-10-12 14:50:34 +02:00
Mads Boddum be4eff77a1 Fixed an issue where ranged weapons weren't shooting 2016-10-12 14:25:12 +02:00
Mads Boddum 709db360e1 Weapon damage now affects combat calculations 2016-10-12 14:24:28 +02:00
Mads Boddum 80bc19afae Split a big method in CombatXpService into smaller methods 2016-10-12 14:07:50 +02:00
Obique PSWG 8e31533377 Merged in M4SS/holocore/deathblow (pull request #313) 
NGE-459 - Deathblow
 2016-10-11 15:45:03 -05:00
Obique PSWG 39fb11f219 Merged in M4SS/holocore/lingering_threads (pull request #297) 
NGE-456 - Lingering threads
 2016-10-11 15:44:58 -05:00
Mads Boddum 4cfee25030 You no longer gain XP by killing players 2016-10-11 02:02:03 +02:00
Mads Boddum 513279a39e Fixed an issue where an entertainer killing a creature would block XP to otherwise eligible group members 2016-10-11 00:31:02 +02:00
Mads Boddum 6809647040 Combat XP is now only gained by nearby group members 2016-10-10 23:34:27 +02:00
Mads Boddum 08f807bd70 Added combat XP when killing creatures 2016-10-10 23:05:23 +02:00
Mads Boddum 85037e4e17 Revival timer is now cancelled for disappeared players 2016-10-10 13:38:15 +02:00
Mads Boddum cc8ce0d135 Simplified if-statement structure in CorpseService.clone() 2016-10-10 13:04:00 +02:00
Mads Boddum 134ffb1ca9 Merge origin/deathblow into cloning 
Conflicts:
	src/services/combat/CorpseService.java
 2016-10-10 12:58:44 +02:00
Mads Boddum 31374b3e2c Simplified deathblow code and renamed fields in DeathblowIntent and CreatureKilledIntent 2016-10-10 12:50:05 +02:00
Mads Boddum 6cafb546fc Split a big method up into smaller methods 2016-10-10 12:41:41 +02:00
Mads Boddum 5f53cf4110 Cloning is now possible for players were dead when the application stopped 2016-10-10 12:39:31 +02:00
Mads Boddum 017796dd39 Players now go on leave upon cloning 2016-10-10 12:13:31 +02:00
Mads Boddum 5b57d8091e Added terrain mapping support for buildout areas 2016-10-10 12:01:44 +02:00
Mads Boddum 02bc31145f Cloning facility names are now displayed in the cloning SUI window 2016-10-09 20:39:21 +02:00
Mads Boddum f0eac9761b Merge holocore/quality_assurance into cloning 2016-10-05 13:08:03 +02:00
Skyler Lehan 356add48fe Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into nge-330-storyteller 
# Conflicts:
#	src/services/objects/StaticItemService.java
 2016-10-04 11:44:43 -04:00
Skyler Lehan e2dc45bb7a NGE-330 complete, Storyteller items added 2016-10-04 11:42:59 -04:00
Mads Boddum 75cff90f82 Merge holocore/quality_assurance into cloning 2016-10-04 15:52:43 +02:00
Mads Boddum 7a8e723bf3 Optimised cloning facility tube data loading 2016-10-03 18:23:35 +02:00
Mads Boddum ccc8665b07 Initial work on cloning 2016-10-03 15:52:43 +02:00
Skyler Lehan 8a5a9d8d0a Added the ItemAttributes for NGE-328 2016-10-03 08:19:18 -04:00
Mads Boddum d322c873f7 Added incapacitation system messages 2016-10-03 13:55:17 +02:00
Obique PSWG fb9c3bc896 Merged in M4SS/holocore/cooldowns (pull request #312) 
NGE-458 - Cooldown Checks
 2016-10-03 06:52:45 -05:00
Mads Boddum 0d42d02749 DeathblowIntent is now only used for deathblow requests 2016-10-03 13:26:08 +02:00
Mads Boddum bc61075d6b Added deathblows, currently only seems to work through radial 2016-10-03 12:59:51 +02:00
Mads Boddum 0f8f1276e1 Fixed an issue where ability cooldowns were account-wide 2016-10-03 10:36:10 +02:00