projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-12 22:45:18 -04:00
Code Issues Projects Releases Wiki Activity
6,944 Commits 16 Branches 86 Tags
dependabot/github_actions/actions/setup-java-5
Commit Graph
6944 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Undercova b484dfd010 Merge branch 'ProjectSWGCore:master' into master 2023-04-09 00:05:14 +02:00
Josh eb99a33426 Merge pull request #1249 from Josh-Larson/upgrade-gradle-to-8.0.2 
Upgraded gradle to v8.0.2
 2023-04-08 15:53:27 -05:00
Josh Larson 1f458f6964 Upgraded gradle to v8.0.2 2023-04-08 15:45:37 -05:00
Ziggy 4fde46aff3 [Misc] Move authentication of user credentials inside PswgUserDatabase abstraction 
Relates to GitHub issue #1244
 2023-04-08 22:44:32 +02:00
Undercova 9b91c6a455 Merge branch 'ProjectSWGCore:master' into master 2023-04-08 21:30:50 +02:00
Josh a3a9ee266c Merge pull request #1247 from madsboddum/Holocore-1246 
[Mission] Vehicles in the datapad no longer count towards the cap of …
 2023-04-08 14:27:10 -05:00
Ziggy e8cd3e2266 [Mission] Vehicles in the datapad no longer count towards the cap of simultaneous terminal missions 
Relates to GitHub issue #1246
 2023-04-08 21:16:40 +02:00
Undercova 1d261d8077 Merge branch 'ProjectSWGCore:master' into master 2023-04-08 21:13:21 +02:00
Josh 810fc5e761 Merge pull request #1239 from madsboddum/Holocore-1227 
[Bazaar] Creating and viewing instant sale items
 2023-04-08 14:11:35 -05:00
Josh 20eb0901f9 Merge pull request #1245 from madsboddum/attackable_lairs 
[Combat] Ability to damage lairs
 2023-04-08 14:10:14 -05:00
Ziggy 8f8a31659e [Combat] Ability to damage lairs 
Relates to GitHub issue #1173
 2023-04-08 21:06:00 +02:00
Ziggy eac3e4fe9b [Bazaar] Creating and viewing instant sale items 
Relates to GitHub issue #1227
 2023-04-08 20:49:46 +02:00
Undercova 6d7eb262e2 Merge branch 'ProjectSWGCore:master' into master 2023-04-08 20:40:05 +02:00
Undercova dc35e56c42 Fixed Non-existing loot item liver_s02.iff is being dropped, causing errors #1220 2023-04-08 20:39:15 +02:00
Josh 1a9b82964c Merge pull request #1242 from madsboddum/Holocore-1241 
[Mission] System message no longer says you have earned 0 credits for…
 2023-04-08 12:49:23 -05:00
Ziggy 084d698761 [Mission] System message no longer says you have earned 0 credits for completing a mission 
Relates to GitHub issue #1241
 2023-04-08 10:21:02 +02:00
Josh 3ff6b30c60 Merge pull request #1235 from madsboddum/network_client_length_bug 
The log statement has a bug with the "Expected" part, where it displa…
 2023-04-05 18:23:46 -05:00
Josh 1fabd68207 Merge pull request #1236 from madsboddum/static_city_loader 
Extracted static city loading from CityService into StaticCityLoader,…
 2023-04-05 18:23:05 -05:00
Ziggy 139650ed68 Extracted static city loading from CityService into StaticCityLoader, so we can use it for bazaar terminals later 2023-04-05 19:50:39 +02:00
Ziggy 818b5ecca0 The log statement has a bug with the "Expected" part, where it displays the amount of bytes in excess instead of the expected buffer position 2023-04-05 19:46:46 +02:00
Josh 20c701f3bc Merge pull request #1212 from madsboddum/faction_points 
[Faction] Faction standing
2023.04.05 		2023-04-04 18:38:43 -05:00
Josh f2980e1447 Merge pull request #1215 from madsboddum/Holocore-1211 
Slitherhorn has 0 volume
 2023-04-04 18:35:10 -05:00
Josh 810887e092 Merge pull request #1216 from madsboddum/Holocore-677 
[Combat] Combat and the Combat Level - lowering/increasing XP
 2023-04-04 18:34:50 -05:00
Josh a16bf08639 Merge pull request #1221 from madsboddum/Holocore-1218 
[Mission] Nearby group members also receive the destroy mission rewar…
 2023-04-04 18:33:36 -05:00
Josh 63a09d500c Merge pull request #1222 from madsboddum/Holocore-697 
[Entertainer] Instruments and Props have their required skills set
 2023-04-04 18:31:24 -05:00
Josh 76abc556cb Merge pull request #1223 from madsboddum/Holocore-1219 
[Vehicles] The radial option for vehicle deeds should be "Generate", …
 2023-04-04 18:31:01 -05:00
Josh 936e9ce040 Merge pull request #1226 from madsboddum/stored_run_configs 
Stored commonly used run configurations, so it's easier to get started
 2023-04-04 18:30:42 -05:00
Ziggy 616902b74f Stored commonly used run configurations, so it's easier to get started 2023-04-04 14:15:49 +02:00
Ziggy a059900dd0 [Vehicles] The radial option for vehicle deeds should be "Generate", not "Call" 
Relates to GitHub issue #1219
 2023-04-04 13:10:29 +02:00
Ziggy d450c43177 [Entertainer] Instruments and Props have their required skills set 
Relates to GitHub issue #697
 2023-04-04 11:54:29 +02:00
Ziggy 96c73524c6 [Mission] Nearby group members also receive the destroy mission reward when the target is defeated 
Relates to GitHub issue #1218
 2023-04-04 11:21:03 +02:00
Ziggy 458b80e858 [Combat] Combat and the Combat Level - lowering/increasing XP 
Relates to GitHub issue #677
 2023-04-04 10:35:55 +02:00
Ziggy e06e1747a0 Slitherhorn has 0 volume 
Relates to GitHub issue #1211
 2023-04-04 10:15:29 +02:00
Ziggy a20710e04a [Faction] Faction standing 
Relates to GitHub issue #675
 2023-04-04 09:52:39 +02:00
Josh 6677d7d025 Merge pull request #1210 from madsboddum/auto_import_service 
Excluded java.security.Provider.Service from auto import suggestions,…
 2023-04-03 16:50:50 -05:00
Ziggy b7518f7533 Excluded java.security.Provider.Service from auto import suggestions, so me.joshlarson.jlcommon.control.Service is always the only suggestion 2023-04-03 16:22:47 +02:00
Josh c110f4ba2f Merge pull request #1209 from madsboddum/Holocore-749 
[General] Fixed a bug where you had to relog to see new names for way…
 2023-04-03 07:11:21 -05:00
Josh 8eebaafd0c Merge pull request #1206 from madsboddum/kotlin_support_data_services 
Converted support data services from Java to Kotlin
 2023-04-02 17:34:35 -05:00
Josh cb0b0e3da7 Merge pull request #1207 from madsboddum/dev_mongo_healthcheck 
Added healthcheck to the mongo container and the mongo-express contai…
 2023-04-02 17:30:46 -05:00
Josh 925e62b436 Merge pull request #1205 from madsboddum/kotlin_trade_service 
Moved TradeService away from CraftingManager as trading is not relate…
 2023-04-02 17:29:17 -05:00
Ziggy ddcf2ea6d2 Moved TradeService away from CraftingManager as trading is not related to crafting and converted TradeService to Kotlin 2023-04-03 00:05:27 +02:00
Ziggy 0c38db121f [General] Fixed a bug where you had to relog to see new names for waypoints 
Relates to GitHub issue #749
 2023-04-02 23:33:49 +02:00
Undercova c146c99b25 Merge pull request #1208 from Undercova/master 
Added more destroy missions to database
 2023-04-02 23:04:04 +02:00
Ziggy deaf57cb4e Added healthcheck to the mongo container and the mongo-express container now depends on the mongo container being health before attempting to start 
This way, we don't need "restart: always" to deal with the connection failures in mongo-express to mongo
 2023-04-02 22:57:29 +02:00
Undercova ff17fb1e31 Added more destroy missions to database 
Updated the directory for destroy missions
 2023-04-02 22:45:20 +02:00
Ziggy 8b684219c1 Converted support data services from Java to Kotlin 2023-04-02 22:02:04 +02:00
Josh 789ab1816f Merge pull request #1192 from madsboddum/mission_abort 
Added support for aborting destroy missions
 2023-04-02 13:44:17 -05:00
Josh 88567143e2 Merge pull request #1200 from madsboddum/sample_stack_resources 
Sampled resources are now added to an existing stack in the inventory…
 2023-04-02 13:34:15 -05:00
Josh 235daceda8 Merge pull request #1201 from madsboddum/namegen_warnings 
Fixed code inspection warnings in the SWG name generator and fixed a …
 2023-04-02 13:32:48 -05:00
Josh 375caa9366 Merge pull request #1202 from madsboddum/idea_exclude_dirs 
Marked some folders generated during runtime as excluded in IDEA, to …
 2023-04-02 13:31:58 -05:00