projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-18 08:02:56 -04:00
Code Issues Projects Releases Wiki Activity
2,630 Commits 16 Branches 86 Tags
33bbc8a8d39b431e26651d3054b309f8defc079e
Commit Graph
2630 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 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 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 0e2e896fd6 Fixed cfg/nge.cfg not being ignored properly 2016-10-10 16:26:59 +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
Obique PSWG db9cba3910 Merged in Undercova/holocore (pull request #319) 
Updates about cloning
 2016-10-04 17:52:27 -05:00
Undercova PSWG d2abe20614 Removed cloning_respawn.sdb 2016-10-04 22:51:05 +00:00
Undercova PSWG cb312b03f8 Moved cloning_respawn.sdb to cloning folder 2016-10-04 22:50:44 +00:00
Undercova PSWG 319e535554 Added repair_costs.sdb 2016-10-04 22:49:54 +00:00
Undercova PSWG 70bf3af71e Added clone_mapping.sdb 2016-10-04 22:48:57 +00:00
Undercova PSWG 76f2c2cfbc Added clone_cost.sdb 2016-10-04 22:48:14 +00:00
Obique PSWG 4a9b8e5922 Merged in Undercova/holocore (pull request #318) 
Updated cloning_respawn.sdb
 2016-10-04 15:05:55 -05:00
Undercova PSWG 815be7e181 Updated cloning_respawn.sdb 2016-10-04 19:21:32 +00:00
Obique PSWG bea0867989 Merged in slehan/holocore/nge-330-storyteller (pull request #317) 
NGE-330 complete, Storyteller items added
 2016-10-04 11:42:25 -05: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