Josh
9b325b8e50
Merge pull request #1203 from madsboddum/kotlin_jedi_services
...
Converted the last Jedi services written in Java to Kotlin
2023-04-02 13:31:49 -05:00
Josh
35e00e9122
Merge pull request #1204 from madsboddum/starter_clothing_volume_0
...
Fixed a bug where the starter clothing had 0 volume when examining th…
2023-04-02 13:30:33 -05:00
Ziggy
25d457198f
Fixed a bug where the starter clothing had 0 volume when examining the items
2023-04-02 19:51:08 +02:00
Ziggy
a009b5ffa0
Converted the last Jedi services written in Java to Kotlin
2023-04-02 19:44:28 +02:00
Ziggy
33fe99f1c3
Marked some folders generated during runtime as excluded in IDEA, to speed up indexing and to prevent irrelevant search results
2023-04-02 14:03:30 +02:00
Ziggy
38c56aebc6
Fixed code inspection warnings in the SWG name generator and fixed a leaked implementation detail of how resource name rules are stored
2023-04-02 13:34:25 +02:00
Ziggy
979cfe447b
Sampled resources are now added to an existing stack in the inventory if one exists, instead of creating a new stack every time
2023-04-02 11:45:46 +02:00
Josh Larson
706a287e11
Merge pull request #1196 from madsboddum/survey_npe_fix
...
Fixed being unable to use survey tools, caused by server reboots
2023-04-01 16:38:18 -05:00
Ziggy
af207eacf6
Fixed being unable to use survey tools, caused by server reboots
...
Slight refactor of the code, to avoid having GalacticResource reference ServerData
2023-04-01 23:30:33 +02:00
Josh Larson
934384a63f
Merge pull request #1199 from madsboddum/character_ability_check
...
Fixed a couple of bugs in command requirements, where they only affec…
2023-04-01 16:15:56 -05:00
Ziggy
98e5e871d8
Fixed a couple of bugs in command requirements, where they only affected combat commands and also possibly used the wrong ability name
2023-04-01 23:09:43 +02:00
Josh Larson
739746632f
Merge pull request #1198 from madsboddum/volume_0
...
Fixed issue where some looted items had "Volume: 0" when examining them
2023-04-01 15:03:59 -05:00
Ziggy
9fe87f03c0
Fixed issue where some looted items had "Volume: 0" when examining them
...
This won't fix existing items.
2023-04-01 21:59:15 +02:00
Josh Larson
acf35211cc
Merge pull request #1197 from madsboddum/codestyle_v2
...
Updated the project code style with the newest version of the ProjectSWG code style
2023-04-01 14:36:41 -05:00
Ziggy
e79d1a86d1
Updated the project code style with the newest version of the ProjectSWG code style
2023-04-01 21:30:06 +02:00
Josh Larson
50620f229e
Merge pull request #1195 from madsboddum/marker_txt_leak
...
marker.txt detection no longer opens an InputStream that's never closed
2023-03-30 16:29:45 -05:00
Josh Larson
b8c113f4d7
Merge pull request #1194 from madsboddum/combat_level_kt_tests
...
Converted some Combat XP testcases from Java to Kotlin
2023-03-30 16:28:55 -05:00
Josh Larson
7ae66a6f24
Merge pull request #1193 from madsboddum/server_keystore
...
Deleted keystore for the old HTTP web interface
2023-03-30 16:28:31 -05:00
Ziggy
9775877ab7
marker.txt detection no longer opens an InputStream that's never closed
2023-03-30 19:44:15 +02:00
Ziggy
2c8b7ed6c4
Converted some Combat XP testcases from Java to Kotlin
2023-03-30 16:16:03 +02:00
Ziggy
175d8ff7b0
Deleted keystore for the old HTTP web interface
2023-03-30 15:48:44 +02:00
Ziggy
015179bc9e
Added support for aborting destroy missions
2023-03-30 15:35:42 +02:00
Josh Larson
6078649e25
Merge pull request #1191 from madsboddum/random_credit_reward
...
Added randomized credit reward for destroy missions
2023-03-25 16:11:47 -05:00
Ziggy
2a703e8915
Added randomized credit reward for destroy missions
2023-03-25 22:07:30 +01:00
Josh Larson
b2126162cd
Merge pull request #1190 from madsboddum/randomized_mission_location
...
Added location randomization to destroy terminal missions
2023-03-25 15:42:58 -05:00
Ziggy
17c22b6c48
Added location randomization to destroy terminal missions
2023-03-25 21:38:53 +01:00
Josh Larson
9e9da08c0d
Merge pull request #1189 from madsboddum/randomized_destroy_missions
...
Randomized destroy missions with option for defining new missions in …
2023-03-25 12:27:21 -05:00
Ziggy
6cad271317
Randomized destroy missions with option for defining new missions in a sdb
2023-03-25 18:23:25 +01:00
Josh Larson
ed3b22d5ef
Merge pull request #1188 from madsboddum/dynamic_lair_loader
...
Added dataloader for dynamic_lairs.sdb
2023-03-25 12:03:26 -05:00
Ziggy
3bf76cda67
Added dataloader for dynamic_lairs.sdb
2023-03-25 13:19:09 +01:00
Josh Larson
48a8024d68
Merge pull request #1187 from madsboddum/master
...
Added option to find a dynamic spawn by dynamic_id, so we look up lair IDs later for terminal destroy missions
2023-03-24 16:22:29 -05:00
Ziggy
784d35bfc5
Added option to find a dynamic spawn by dynamic_id, so we look up lair IDs later for terminal destroy missions
2023-03-24 14:43:06 +01:00
Josh Larson
3ce7f48d60
Merge pull request #1186 from madsboddum/destroy_mission_dynamic_difficulty
...
Dynamic difficulty for destroy missions, based on the current planet
2023-03-20 11:30:46 -05:00
Ziggy
9b4bcc7ca3
Added dynamic difficulty to destroy missions, based on the level range of the current planet
2023-03-20 17:02:10 +01:00
Josh Larson
2cbd9e6924
Merge pull request #1185 from madsboddum/automatic_copyright
...
IDEA automatically manages copyright notices
2023-03-20 10:36:23 -05:00
Ziggy
75c92b1803
Added shared IDEA settings that contains copyright notices for Holocore and PSWGCommon
...
For new files, the notices are automatically inserted.
For old files, one can be inserted with Alt+Insert. Additionally, you can go to File | Settings | Tools | Actions on Save and put a checkmark in "Update copyright notice".
2023-03-20 16:29:51 +01:00
Josh Larson
61df769a92
Merge pull request #1184 from madsboddum/versioned_code_style
...
Added the ProjectSWG codestyle to version control
2023-03-19 15:54:01 -05:00
Josh Larson
cfe6ff47dd
Merge pull request #1183 from madsboddum/destroy_missions
...
Very basic implementation of destroy missions
2023-03-19 15:53:19 -05:00
Ziggy
6b828d1d22
Version controlled the code style, so it's always active
2023-03-19 21:47:09 +01:00
Ziggy
257482f73a
Very basic implementation of destroy missions
2023-03-19 21:42:36 +01:00
Josh Larson
597b512a39
Merge pull request #1182 from madsboddum/mission_object_deltas
...
Added delta methods to MissionObject, so we can use them for mission terminals later
2023-03-19 13:13:12 -05:00
Ziggy
1e969dcfe7
Added delta methods to MissionObject, so we can use them for mission terminals later
2023-03-19 19:09:05 +01:00
Josh Larson
21fbeb9353
Merge pull request #1180 from madsboddum/baseline_delegate_strings
...
String support for BaselineDelegate
2023-03-19 10:32:46 -05:00
Josh Larson
5ae41e6810
Merge pull request #1181 from madsboddum/objectcreator_simplify_updatemaxobjectid
...
Fixed IDE warnings in ObjectCreator
2023-03-19 10:31:57 -05:00
Ziggy
7cfaac9e6d
Fixed IDE warnings in ObjectCreator
2023-03-19 13:04:44 +01:00
Ziggy
3f28cacbd8
Added String support to BaselineDelegate, so we can use it for objects that contain Strings in the future
2023-03-19 12:43:38 +01:00
Undercova
58a92fa082
Merge pull request #1179 from Undercova/master
...
Various additions/edits of space content
2023-02-12 00:26:46 +01:00
Undercova
b0e050bef4
Merge branch 'ProjectSWGCore:master' into master
2023-02-12 00:12:12 +01:00
Undercova
e44162ce69
Renamed folder for JTL related stuff from "ship" to "space"
...
Added more data for interior objects of player ships
Added Tatooine space buildout
Added launch locations for ships
2023-02-12 00:11:46 +01:00
Undercova
004d7aabc6
Merge pull request #1178 from Undercova/master
...
Added wrong data to chassis modifiers database by mistake
2023-02-11 21:09:55 +01:00
Josh