projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity
2,994 Commits 16 Branches 86 Tags
7f663dd8737a181ddf2bf2edbc33e7db7832ff2e
Commit Graph
2994 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Obique PSWG 7f663dd873 Changed ConcurrentHashMap to a custom SynchronizedHashMap for null value support 2016-12-30 12:45:41 -06:00
Obique PSWG f6d5bfbe93 Merged in M4SS/holocore (pull request #384) 
Slots now use a concurrent Map-implementation
 2016-12-30 12:33:47 -06:00
Mads Boddum 5a7547c41f Slots now use a concurrent Map-implementation 2016-12-30 19:32:06 +01:00
Obique PSWG bfe1cf9ba2 Merged in M4SS/holocore (pull request #383) 
NGE-492 - Teleporting removes your group (visually)
 2016-12-29 16:57:06 -06:00
Mads Boddum 51752ce413 Merge origin/quality_assurance into quality_assurance 2016-12-29 23:55:04 +01:00
Mads Boddum ece5cd13a9 Fixed an issue where your group would visually disappear when zoning 2016-12-29 23:50:37 +01:00
Obique PSWG c5f0d4ea00 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-12-29 13:16:09 -06:00
Obique PSWG f42d4111c0 Added Assert class 2016-12-29 13:15:31 -06:00
Obique PSWG db02525a17 Merged in M4SS/holocore/concurrent_swgmap (pull request #382) 
NGE-497, NGE-509 and NGE-518
 2016-12-29 08:53:23 -06:00
Mads Boddum 17eeb516ac SWGMap is now concurrent 2016-12-29 14:45:59 +01:00
Mads Boddum 4477383f24 Merge holocore/quality_assurance into quality_assurance 2016-12-29 14:04:36 +01:00
Undercova PSWG 6ab6eb5cac Merged in M4SS/holocore/xp_warning (pull request #381) 
Removed a warning that was displayed every time a level 90 killed a creature
 2016-12-23 10:52:48 +01:00
Mads Boddum cebe4fa2a5 Removed a warning that was displayed every time a level 90 killed a creature 2016-12-23 10:48:50 +01:00
Obique PSWG 14a8544e67 Merged in Undercova/holocore (pull request #380) 
Enabled Lifeday NPCs in Wayfar, Dearic and Doaba Guerfel
 2016-12-22 17:47:19 -06:00
Undercova PSWG f2a8014ec2 Enabled Lifeday NPCs in Wayfar, Dearic and Doaba Guerfel 2016-12-22 21:21:24 +00:00
Obique PSWG 65860e2b96 Merged in tacef/holocore (pull request #379) 
NGE-489: fixed issue where character got exp even when he has reached lvl 90
 2016-12-22 10:27:27 -06:00
Tacef Ine c6c2c6e75a NGE-489: fixed issue where character got exp even when he has reached lvl 90 2016-12-21 19:19:55 +01:00
Tacef Ine 9d1bb265d2 Merged projectswg/holocore into quality_assurance 2016-12-21 19:14:54 +01:00
Mads Boddum 5ecd79d642 Merge origin/quality_assurance into quality_assurance 2016-12-19 11:12:26 +01:00
Obique PSWG e3651e00eb Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-12-17 13:09:44 -06:00
Obique PSWG 8be384a5da Added a lot of client data loaders 2016-12-17 13:09:28 -06:00
Tacef Ine 209836930c Merged projectswg/holocore into quality_assurance 2016-12-10 18:36:04 +01:00
Undercova PSWG ad6723a7d4 Merged in Undercova/holocore (pull request #378) 
Quality assurance
 2016-12-09 02:10:54 +01:00
Undercova PSWG fb21f1a0bb Fixed Rebel and Imperial Galactic Marine Armor not being equippable for Ithorians 2016-12-09 01:10:19 +00:00
Undercova PSWG e88529f1cc Fixed issued commando backpack not being equippable for Ithorians and Wookiees 2016-12-09 01:09:28 +00:00
Obique PSWG 734c32b617 Merged in Undercova/holocore (pull request #376) 
Race restrictions updated in armor.sdb and wearable.sdb
 2016-12-08 12:47:20 -06:00
Obique PSWG 41bc06dbf9 Merged in slehan/holocore/nge-434-fixes (pull request #377) 
NGE-434: fixed bug that allowed items to be worn by races that shouldn't be able to
 2016-12-08 12:09:46 -06:00
Skyler Lehan 884314255b NGE-434: fixed bug that allowed items to be worn by races that shouldn't be able to 2016-12-08 12:00:41 -05:00
Undercova PSWG fa324b020a Updated wearable.sdb for Wookiee and Ithorian restrictions 2016-12-08 11:53:27 +00:00
Undercova PSWG 50e76522f5 Updated armor.sdb for Wookiee and Ithorian restrictions 2016-12-08 11:52:39 +00:00
Obique PSWG 079a659356 Merged in slehan/holocore/nge-452-fixes (pull request #375) 
Fixed issues with items that have no required profession
 2016-12-07 17:37:16 +00:00
Skyler Lehan 4db053b780 NGE-452: fixed bug that prevented items with no profession restriction from being equipped and hid the Required Profession attr if the item doesn't have one 2016-12-07 11:36:58 -05:00
Skyler Lehan 9ee79ddcd4 Merged projectswg/holocore into quality_assurance 2016-12-07 10:58:24 -05:00
Obique PSWG 4060192741 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-12-07 09:16:20 -06:00
Obique PSWG 6533c848e4 Added onObjectEnterAware and onObjectLeaveAware for possible in-range checks 2016-12-07 09:15:49 -06:00
Obique PSWG 9a1ae0b834 Merged in slehan/holocore/NGE-452 (pull request #374) 
NGE-452
 2016-12-07 14:59:59 +00:00
Obique PSWG 0f8048db9d Merged in slehan/holocore/nge-434 (pull request #355) 
Race Restrictions complete
 2016-12-07 14:51:57 +00:00
Undercova PSWG 104740fb56 Merged in Undercova/holocore (pull request #373) 
Added racial related stats
 2016-12-06 07:11:10 +00:00
Undercova PSWG d734211406 Added racial related stats 2016-12-06 07:10:19 +00:00
Mads Boddum 408efd6ee5 Merged projectswg/holocore into quality_assurance 2016-12-05 05:50:13 +01:00
Obique PSWG 94d3f1d969 Merged in M4SS/holocore/aoe (pull request #372) 
NGE-300 - Area of Effect (AoE)
 2016-12-02 21:08:21 +00:00
Obique PSWG c56a8ea614 Merged in M4SS/holocore/delay_attacks (pull request #371) 
NGE-435 - Delayed Attacks
 2016-12-02 12:23:31 +00:00
Mads Boddum 53b991f9c2 Merge holocore/quality_assurance into aoe 2016-12-02 10:39:11 +01:00
Mads Boddum f0612e3da0 Added support for AoE attacks in the combat engine 2016-12-02 10:29:05 +01:00
Mads Boddum 2aca3aa8e1 Fixed an issue where small delay eggs spawned unintentionally 2016-12-02 06:05:18 +01:00
Mads Boddum 192b99f46c Added support for delayed attacks in the combat engine 2016-12-02 05:54:56 +01:00
Obique PSWG 546d8816d1 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-12-01 21:22:49 -06:00
Obique PSWG 67ef774ec1 Simplified CRC's hashCode method 2016-12-01 21:21:30 -06:00
Obique PSWG 8793ff4bea Fixed CRC equals method 2016-12-01 21:20:28 -06:00
Obique PSWG 25e5bd464c Merged in M4SS/holocore/character_builder (pull request #369) 
Fixed an issue where every SUI event on the Character Builder Terminal was treated as OK
 2016-12-02 01:33:32 +00:00