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
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
Obique 02af0b4f48 Changed pipelines to a single step 2019-05-18 11:40:40 -05:00
Obique 237fa31f02 Changed openjdk image in bitbucket pipelines 2019-05-18 11:38:21 -05:00
Obique 02fe879a02 Updated bitbucket pipelines to include docker, and updated pswgcommon pointer 2019-05-18 11:36:05 -05:00
Obique 6db736db06 Removed unused variable in CombatCommandService 2019-05-18 11:13:28 -05:00
Obique 8d4bde233c Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2019-05-18 11:10:39 -05:00
Obique 6c3407d24b Added Dockerfile 2019-05-18 11:01:11 -05:00
Obique 95b3549c11 Removed Attributes.java in favor of Kotlin version 2019-05-18 11:00:45 -05:00
Obique 76812efecd Changed Attributes(Im/Mutable) from Java to Kotlin 2019-05-18 10:59:48 -05:00
Undercova PSWG 75f8557a98 Content update 2019-05-16 20:14:23 +02:00
Mads Boddum 51393aa182 #143: Server log available in-game as a chat room for admins 2019-05-12 16:47:15 +02:00
Mads Boddum 333d688606 Fixed a couple of extra bugs with PvP zones 2019-05-11 12:11:19 +02:00
Mads Boddum ca442585cb Fixed incorrect PvP Zone ID column name 2019-05-11 11:03:57 +02:00
Mads Boddum f64f9668b6 #164: Attackers can't damage themselves with AoE 2019-05-08 17:56:14 +02:00
Mads Boddum 156f87797f Merged in M4SS/holocore/36 (pull request #649) 
#36: Added forced PvP Zones
 2019-05-04 14:19:50 +00:00
Mads Boddum f71406f11d Merged in M4SS/holocore/162 (pull request #648) 
#162: Implemented special line action cost reduction
 2019-05-04 14:19:46 +00:00
Mads Boddum a757d2de25 36: Added forced PvP Zones 2019-04-28 13:33:33 +02:00
Mads Boddum dba51a05cf #162: Implemented special line action cost reduction 2019-04-28 11:42:58 +02:00
Obique 570e36d4cd Updated dependencies: jdk12, kotlin 1.3.30, gradle 5.4 2019-04-24 11:24:55 -05:00
Obique 4de51b40e6 Changed mongodb database to use kotlin, changed TCP to be insecure again 2019-04-24 11:22:45 -05:00
Obique b5e69fa995 Fixed the wipeObjects config; Fixed character deletion and creation checks 2019-04-07 13:30:05 -05:00
Obique a0615808fc Fixed 'gradle run' 2019-04-07 12:33:28 -05:00
Obique 7256c64cef Changed loot service object array to an object list 2019-04-07 12:21:16 -05:00
Obique 2e6ff3caab Updated gradle to 5.3.1, updated dependencies, and added kotlin support 2019-04-06 12:23:49 -05:00
Obique 894a0f479a Finished item refactor 2019-04-06 12:23:12 -05:00
Obique bb4c1d7426 Merge branch 'quality_assurance' of bitbucket.org:Undercova/holocore_undercova into quality_assurance 2019-03-28 08:04:36 -05:00
Undercova PSWG 65ee565432 Added item_stats_loading_order.sdb 2019-03-27 16:58:30 +00:00
Undercova PSWG 4abc94f732 Updated items_wearable.sdb 2019-03-27 16:57:05 +00:00
Obique caf18ac669 Fixed compile warnings 2019-03-26 08:37:23 -05:00
Obique 6e47f1c850 Merge branch 'quality_assurance' of bitbucket.org:Undercova/holocore_undercova into quality_assurance 2019-03-26 08:36:27 -05:00
Obique 61281d4aba Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2019-03-26 08:34:14 -05:00
Undercova PSWG fc7f88a065 Updated items_wearable.sdb 2019-03-24 19:45:29 +00:00
Undercova PSWG 5242a3bf75 Updated items_weapon.sdb 2019-03-24 19:44:50 +00:00
Undercova PSWG a2470ab7aa Updated items_item.sdb 2019-03-24 19:44:02 +00:00
Undercova PSWG 8577521694 Updated items_collection.sdb 2019-03-24 19:41:51 +00:00
Undercova PSWG 84c842f869 Updated items_armor.sdb 2019-03-24 19:41:04 +00:00
Undercova PSWG b83fd6620a Merged in Undercova/holocore (pull request #644) 
Updated item database
 2019-03-17 03:15:31 +00:00
Undercova PSWG 692f0a6c4d Merged projectswg/holocore into quality_assurance 2019-03-16 18:50:43 +01:00
Mads Boddum 19823248b4 Merged in M4SS/holocore/154 (pull request #642) 
#154: Armor mitigation in combat

Approved-by: Obique PSWG <[email protected]>
 2019-03-16 16:21:56 +00:00
Mads Boddum bb18398eec Merge remote-tracking branch 'origin/quality_assurance' into 154 2019-03-16 17:21:04 +01:00
Mads Boddum 25d6429ec8 Merged in M4SS/holocore/37 (pull request #645) 
#37: Implemented special lines and freeshot chance

Approved-by: Obique PSWG <[email protected]>
 2019-03-16 16:15:19 +00:00
Mads Boddum 11029f4815 Merged in M4SS/holocore/150 (pull request #640) 
#150: Set bonus equipment

Approved-by: Obique PSWG <[email protected]>
 2019-03-16 16:15:17 +00:00
Mads Boddum 8010ab691a Merged in M4SS/holocore/153 (pull request #643) 
#153: Innate armor

Approved-by: Obique PSWG <[email protected]>
 2019-03-16 16:15:14 +00:00
Mads Boddum b8933b19bb Merged in M4SS/holocore/156 (pull request #646) 
#156: Implemented SUI color picker and special edition goggle coloring

Approved-by: Obique PSWG <[email protected]>
 2019-03-16 16:15:10 +00:00
Undercova ca8bbd18af Added all entertainer instruments to item database 2019-03-16 13:25:38 +01:00
Undercova 524c0c0370 Content update 2019-03-16 02:40:43 +01:00
Undercova 3707ffb6ab Content update 2019-03-16 02:32:28 +01:00
Mads Boddum 305360b9d6 #156: Implemented SUI color picker and special edition goggle coloring 2019-03-15 23:20:15 +01:00
Mads Boddum 56085b785b #37: Implemented special lines and freeshot chance 2019-03-15 21:41:58 +01:00
Undercova 2d919013f4 Updated item database 2019-03-11 22:37:16 +01:00
Obique 4d95ce1162 When running tests, the default value for config options is now used 2019-03-10 19:35:13 -05:00