projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity
6,324 Commits 14 Branches 86 Tags
dependabot/github_actions/actions/setup-java-3
Commit Graph
6324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Larson da1ab94d3b Moved functions around in SWGFlag 2023-04-09 18:30:27 -05:00
Josh Larson 1e2821d71c Added wrapper around SWGFlag to reduce the number of helper functions 2023-04-09 18:28:03 -05:00
Undercova 1ab2476ffc Merge pull request #1258 from Undercova/master 
Updated content
 2023-04-10 01:04:28 +02:00
Josh fdd0a6cb21 Merge pull request #1255 from Josh-Larson/convert-objects-to-kotlin 
Convert SWG Objects to kotlin
 2023-04-09 18:03:37 -05:00
Undercova ac2315ce54 Merge branch 'ProjectSWGCore:master' into master 2023-04-10 00:44:34 +02:00
Undercova 5c83840461 Updated map locations database for buildings / trainers 
Updated creatures missions
Updated NPC missions
 2023-04-10 00:44:04 +02:00
Josh Larson 46999cde04 Removed unused PlayerObject files 2023-04-09 17:35:05 -05:00
Josh Larson b86d214928 Merge remote-tracking branch 'projectswg/master' into convert-objects-to-kotlin 2023-04-09 17:34:11 -05:00
Josh Larson 472a00e647 Converted PlayerObject to kotlin 2023-04-09 17:34:00 -05:00
Josh Larson 68120780d2 Added missing delegate 2023-04-09 16:55:17 -05:00
Josh Larson c50a1b0ce3 Converted PLAY9 to kotlin 2023-04-09 16:51:52 -05:00
Josh 861bac751c Merge pull request #1256 from Josh-Larson/improvement/sped-up-lairattacktest 
Sped up LairAttackTest by enabling custom intent handlers
 2023-04-09 16:29:15 -05:00
Josh Larson 35de371f87 Fixed consumerKey in TestRunnerSynchronousIntents 2023-04-09 16:22:08 -05:00
Josh Larson 1ecdc6cd4b Sped up LairAttackTest by enabling custom intent handlers 2023-04-09 16:15:45 -05:00
Josh Larson 3d20d4ab27 Formatting change in PlayerObjectOwner 2023-04-09 16:13:19 -05:00
Josh Larson 5b2c7be810 Reordered variables in PLAY8 for clarity 2023-04-09 15:30:17 -05:00
Josh Larson 6c76a7d3e2 Converted PLAY8 to kotlin 2023-04-09 15:27:33 -05:00
Josh Larson 3aa97687ed Converted PLAY3 to kotlin 2023-04-09 14:53:05 -05:00
Josh Larson 7a662cbbd5 Fixed same compilation error from pswgcommon 2023-04-09 14:38:07 -05:00
Josh Larson 312dec8fc0 Converted PLAY6 to kotlin 2023-04-09 14:37:56 -05:00
Josh Larson 93811b5cdb Converted Quest to kotlin 2023-04-09 13:27:09 -05:00
Josh Larson caaff76bba Converted the trivial object types to kotlin 2023-04-09 12:45:21 -05:00
Josh Larson 649809f3b9 Removed star import from CellObject 2023-04-09 12:41:29 -05:00
Josh Larson 2a7dcb9110 Fixed minor format issue identified in review 2023-04-09 12:40:47 -05:00
Josh Larson e26b02854b Converted BuildingObject and CellObject to kotlin 2023-04-09 12:37:26 -05:00
Josh Larson fe40cd9b13 Merge branch 'master' of https://github.com/ProjectSWGCore/Holocore 2023-04-09 11:16:53 -05:00
Josh Larson 4892b6735a Updated submodule pointer 2023-04-09 11:16:45 -05:00
Josh 8163f01efd Merge pull request #1250 from madsboddum/Holocore-1243 
[Misc] Move TestWeatherType from holocore to pswgcommon
 2023-04-09 11:15:00 -05:00
Ziggy 55f17ca892 [Misc] Move TestWeatherType from holocore to pswgcommon 
Relates to GitHub issue #1243
 2023-04-09 10:29:35 +02:00
Josh 5958e4c434 Merge pull request #1248 from madsboddum/Holocore-1244 
[Misc] Move authentication of user credentials inside PswgUserDatabas…
 2023-04-08 17:40:11 -05:00
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