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,678 Commits 16 Branches 86 Tags
48cb3ebde05cfb0d2bceb045e276e8a4c9cece0b
Commit Graph
2678 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Boddum 48cb3ebde0 Added incapacitation and cloning sickness debuffs 2016-10-18 14:50:58 +02:00
Mads Boddum 7d4d14a3fa Merge holocore/quality_assurance into buffs 2016-10-18 12:56:32 +02:00
Undercova PSWG 4857cd3e98 Merged in M4SS/holocore/cloning (pull request #329) 
Fixed an issue where faction status never changed
 2016-10-18 03:10:29 +00:00
Mads Boddum 2bbbcef7ca Fixed an issue where faction status never changed 2016-10-18 04:18:46 +02:00
Obique PSWG a845000d6f Merged in M4SS/holocore/cloning (pull request #328) 
NGE-450 - Cloning
 2016-10-17 18:37:01 +00: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 a598630109 Rewrote a couple of TODOs in BuffService 2016-10-17 20:09:30 +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
Obique PSWG f56a3e4a96 Merged in AnonymousMan/holocore-1/AnonymousMan/why-not-1476500812220 (pull request #326) 
Why not?
 2016-10-15 03:12:20 +00:00
Gene Pressinger 6b90dc1762 Why not? 2016-10-15 03:07:10 +00:00
Mads Boddum 2bbf7e63af Fixed /pvp 2016-10-13 04:25:24 +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 8b0cb181df Made a couple of inner classes of BuffService static 2016-10-13 03:31:36 +02:00
Obique PSWG f2535603f1 Merged in M4SS/holocore/heavy_weapon_fix (pull request #325) 
Fixed heavy weapons not being loaded and DPS attribute is now applied
 2016-10-12 16:45:25 +00: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 f1daf0f057 Merged in Undercova/holocore (pull request #324) 
Fixed weapon type for "Pulse Cannon" and Commando CL30 roadmap reward rifle
 2016-10-12 16:04:53 +00:00
Undercova PSWG e0feeaa19f Fixed weapon type for "Pulse Cannon" and Commando CL30 roadmap reward rifle 2016-10-12 15:49:13 +00: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
Mads Boddum c6159b0e23 Carbines can now be fired 2016-10-12 15:42:53 +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 1315c2455f Removed old TODOs in BuffService 2016-10-12 15:08:28 +02:00
Mads Boddum a349c08ee7 Removed a couple of one-liner methods in BuffService 2016-10-12 15:03:17 +02:00
Mads Boddum 6196862b39 Moved some logic from BuffService.onIntentReceived() into a method 2016-10-12 15:00:56 +02:00
Mads Boddum 5596d27953 Added license to intents.BuffIntent 2016-10-12 14:55:03 +02: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
Obique PSWG be43cfa636 Merged in M4SS/holocore/nge_cfg_untrack (pull request #320) 
Fixed cfg/nge.cfg not being ignored properly
 2016-10-11 15:30:50 -05:00
Obique PSWG 62b80a92ed Merged in Undercova/holocore (pull request #321) 
- Smuggler roadmap pistol (CL30) changed from unarmed to pistol weapon category
 2016-10-11 15:30:22 -05:00
Undercova PSWG 5511a93095 - Smuggler roadmap pistol (CL30) changed from unarmed to pistol weapon category 
- Jedi roadmap polearm restricted to Force-Sensitive profession only
 2016-10-11 20:03:30 +00:00
Mads Boddum 4cfee25030 You no longer gain XP by killing players 2016-10-11 02:02:03 +02:00
Mads Boddum e719b1fa72 Fixed an issue where buffs weren't expiring 2016-10-11 00:39:42 +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