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
6,324 Commits 16 Branches 86 Tags
dependabot/github_actions/actions/setup-java-3
Commit Graph
6324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Obique PSWG 7a275719b6 Merged in Undercova/holocore (pull request #316) 
Updated cloning_respawn.sdb
 2016-10-04 05:45:01 -05:00
Undercova PSWG a42dad3be9 Updated cloning_respawn.sdb 2016-10-04 03:17:53 +00:00
Undercova PSWG ac1733d8f4 Added minetypes.sdb 2016-10-04 02:56:36 +00:00
Obique PSWG 219f871da7 Created logic for disappearing with null location 2016-10-03 17:21:33 -05:00
Obique PSWG b3c9768f85 Changed packet sending to be sent through Player instead of Service 2016-10-03 16:09:59 -05:00
Obique PSWG 4c93c24046 Added creation of crc database before awareness tests 2016-10-03 15:23:02 -05:00
Obique PSWG fd90338992 Massive refactor of awareness to include unit tests, different object storage system, and more independence from Holocore specifically 2016-10-03 12:28:04 -05:00
Mads Boddum 7a8e723bf3 Optimised cloning facility tube data loading 2016-10-03 18:23:35 +02:00
Obique PSWG 70cd8bf693 Merged in slehan/holocore/nge-328-items (pull request #314) 
Added the ItemAttributes for NGE-328
 2016-10-03 11:17:46 -05: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
Mads Boddum c213d3faa0 Removed a warning in CommandService that wouldn't apply to the CU emulator 2016-10-03 10:21:18 +02:00
Undercova PSWG b053abe6e4 Merged in Undercova/holocore (pull request #311) 
Updated item.sdb
 2016-10-03 00:43:53 +02:00
Undercova PSWG 457e71b919 Updated item.sdb 2016-10-02 22:43:24 +00:00
Obique PSWG 8ce8f39513 Merged in M4SS/holocore/command_queue (pull request #304) 
NGE-432 - Command Queue
 2016-09-29 08:30:00 -05:00
Mads Boddum 5853b48578 Added TODO for target checks 2016-09-29 12:19:42 +02:00
Mads Boddum 52cafe5936 Added cooldown controls 2016-09-29 11:42:14 +02:00
Mads Boddum 2d61b304c6 Merge origin/command_queue into cooldowns 2016-09-29 10:48:48 +02:00
Mads Boddum 19237b3308 Replaced a try-catch in CommandService 2016-09-29 10:47:48 +02:00
Obique PSWG 1ffcb1ff53 Merged in Undercova/holocore (pull request #310) 
Added spawn eggs for exploration and clicky collections (clicky only partially implemented for now)
 2016-09-28 22:19:59 -05:00
Undercova PSWG b42b282b99 Added spawn eggs for exploration and clicky collections (clicky only partially implemented for now) 2016-09-29 03:14:55 +00:00
Mads Boddum 475f9b3736 Initial work on cooldowns 2016-09-28 13:33:36 +02:00
Mads Boddum a45400ade7 Merge origin/command_queue into cooldowns 2016-09-28 10:50:23 +02:00
Obique PSWG 300867e541 Reverted getCounter update for now 2016-09-27 12:11:44 -05:00
Obique PSWG 7152f9e8e8 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-09-27 12:10:47 -05:00
Obique PSWG c3c51bec90 Made Log support non-service logging input tags 2016-09-27 12:10:22 -05:00
Obique PSWG cf15287c41 Merged in slehan/holocore/nge-165-roadmap (pull request #303) 
NGE-165 is ready for testing, added Roadmap Rewards
 2016-09-26 09:42:19 -05:00
Skyler Lehan 85109b2901 Fixed issues in pull request for NGE-165 2016-09-26 08:25:43 -04:00
Mads Boddum 169bd0a9ec Uniform box items are now shown in ShowLootBox 2016-09-26 11:38:52 +02:00
Skyler Lehan 0425dc1910 Fixed merge conflict 2016-09-25 21:57:57 -04:00
Obique PSWG c19ac0525d Merged in M4SS/holocore/radials_fix (pull request #307) 
NGE-426 - Radial menu for bank terminal is incorrect
 2016-09-25 19:33:53 -05:00
Obique PSWG 202ce07598 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-09-25 17:28:23 -05:00
Obique PSWG 273bf54aa4 Changed getCounter() to getUpdateCounter() in DataTransformWithParent 2016-09-25 10:20:51 -05:00
Skyler Lehan aa6705533d NGE-165: prevented blank items from being "added" to the inventory 2016-09-24 18:00:09 -04:00
Skyler Lehan fcb7e51bb3 Fixed issues in NGE-165, switched ArrayLists to a String array for the reward items 2016-09-24 17:46:03 -04:00