Kae
ce002fa0ef
Update CMakePresets.json
...
[skip ci]
2024-03-11 11:30:45 +11:00
Kae
dd43b176cd
Merge pull request #34 from WasabiRaptor/remove-missing-persistent-effects
...
remove missing persistent effects
2024-03-10 17:47:48 +11:00
WasabiRaptor
e89a9af075
whoops
2024-03-09 18:58:25 -05:00
WasabiRaptor
21f9ab763e
remove missing persistent effects
2024-03-09 16:26:13 -05:00
Kae
dc77061840
hopefully fix #33
...
in OpenStarbound, players can place blocks with their own collision type. this can cause objects to override the collision type if the object has material spaces and a previous attempt at accounting for this led to that bug: giving object collision its own field in the server tile should fix this
2024-03-09 12:18:22 +11:00
Kae
165bcbefee
minor code polish
2024-03-09 11:09:04 +11:00
Kae
52a6f200ed
Merge pull request #27 from WasabiRaptor/main
...
Inventory and Hotbar size mismatch fixes
2024-03-09 10:24:10 +11:00
Kae
74072959c5
Merge pull request #32 from WasabiRaptor/Perfectly-Generic-Item-fixes
...
Perfectly Generic Item Improvements
2024-03-09 10:23:15 +11:00
WasabiRaptor
84fe2dfd4c
Perfectly Generic Item improvements
...
spawnitem won't create generic items unless you intend to
generic items will retain the data for what item they were if a mod is uninstalled, and will attempt to restore themselves if re-installed
2024-03-08 18:14:40 -05:00
Kae
a6a1cc7f42
Merge pull request #29 from WasabiRaptor/json-patching
...
improvement to iterating through patch arrays
2024-03-09 09:54:23 +11:00
Kae
4c2e75b585
sccache is autodetected now - optional in presets
2024-03-09 09:49:00 +11:00
Kae
7b556b33f8
More compact search patch parsing
2024-03-09 09:48:21 +11:00
Kae
7bc9eaa432
Merge pull request #31 from JamesTheMaker/main
...
Added search bar to Songbook
2024-03-09 09:07:39 +11:00
JamesTheMaker
6bd1283078
Merge pull request #1 from JamesTheMaker/Songbook
...
Songbook
2024-03-08 15:18:51 -05:00
JamesTheMaker
d26a7dbd18
Merge branch 'OpenStarbound:main' into Songbook
2024-03-08 15:18:23 -05:00
Kae
35dc974a8f
Merge pull request #28 from JamesTheMaker/main
...
Added many new patch features
2024-03-09 06:25:55 +11:00
Kae
1cf7baa317
Update CMakeLists.txt
2024-03-09 04:42:26 +11:00
JamesTheMaker
2551298474
Merge branch 'Songbook' of https://github.com/JamesTheMaker/OpenStarbound into Songbook
2024-03-08 12:19:46 -05:00
JamesTheMaker
81ab5b638b
Added searchbar to songbook
2024-03-08 12:19:15 -05:00
Kae
e156fa6335
Update build_linux.yml
2024-03-09 04:08:28 +11:00
Kae
35e880c073
Update build_linux.yml
2024-03-09 04:06:27 +11:00
JamesTheMaker
53c102b0c7
Added searchbar to songbook
2024-03-08 11:39:39 -05:00
Kae
6c562470f3
Merge launcher branch
2024-03-08 20:09:27 +11:00
WasabiRaptor
f8a6a3e57d
inventory and hotbar size mismatch fixes
...
I realized why that was there
checking patch arrays in a more clean manner
also support for checking values in other files using a string in the patch arrays
Revert "checking patch arrays in a more clean manner"
sorry that wasn't supposed to be in this one
2024-03-07 19:18:28 -05:00
WasabiRaptor
c5e568e47c
fine
...
goodbye nice syntax highlighting
2024-03-07 18:56:13 -05:00
WasabiRaptor
f5400e5877
improvement to iterating through patch arrays
2024-03-07 18:06:30 -05:00
JamesTheMaker
15a12c06a6
Added the search operand to the move and copy operations, and added the new merge operation
2024-03-07 17:28:34 -05:00
JamesTheMaker
9b4ca69e0e
Added the search operand to the find, replace, and remove operations
2024-03-07 12:31:48 -05:00
JamesTheMaker
c808d207c9
Added search operator to the remove operation
2024-03-07 11:01:29 -05:00
JamesTheMaker
3c8a8619d5
Merge branch 'OpenStarbound:main' into main
2024-03-07 09:44:18 -05:00
JamesTheMaker
14ec64ace7
Added jsonCompare function
2024-03-07 09:43:36 -05:00
Kae
89fe1bf15b
oops.
2024-03-07 14:43:23 +11:00
Kae
170b913caa
fix fucked up line splits from cmake-format
2024-03-07 14:31:25 +11:00
Kae
edcefdc58b
ran cmake-format on CMakeLists.txt
...
it all being uppercase was insane
2024-03-07 14:16:30 +11:00
Kae
a1bcfe5f35
update sbinit scripts
2024-03-07 13:56:23 +11:00
JamesTheMaker
f1e3f6791d
Multiple patch files
2024-03-06 12:40:38 -05:00
Kae
79cd235939
Update StarClientApplication.cpp
2024-03-05 16:22:13 +11:00
Kae
9ae14a3d0b
Merge pull request #25 from N1ffe/dynamic-sun-image
...
Dynamic sun image
2024-03-02 14:58:30 +11:00
Niffe
4b4013e5c8
Dynamic sun image
...
Also adds access to sun scale, ray color, and fixes sun rendering in front of satellites
2024-03-01 18:28:13 +02:00
Kae
3453819837
fix debug logMap text stacking
...
bug was introduced in cd23817bf1
2024-02-29 19:22:22 +11:00
Kae
0b4119ce12
Fix possible Unicode exception in Directives parsing
2024-02-29 19:09:10 +11:00
Kae
7ff287511d
Merge pull request #24 from kblaschke/fix-more-compiler-warnings
...
Fix more compiler warnings
2024-02-29 18:17:57 +11:00
Kae
33d696d505
pointless commit to run checks
...
I shouldn't have skipped CI on the prev commit :V
2024-02-29 14:47:10 +11:00
Kae
4534172c2f
Fix build error compiling with Discord support
...
[skip ci]
2024-02-29 14:33:39 +11:00
Kae
667ca6025f
Merge pull request #23 from kblaschke/add-clang-format-file
...
Add .clang-format file
2024-02-29 14:19:50 +11:00
Kai Blaschke
cd23817bf1
Fixed remaining compiler warnings
...
Some warnings (e.g. in Opus and the tests) can't be fixed, only suppressed.
2024-02-28 18:30:27 +01:00
Kai Blaschke
28d486446c
Potential bugfix in quest coordinate matcher
2024-02-28 18:30:23 +01:00
Kai Blaschke
2c67296e0f
Add .clang-format file
...
Resembles the existing code style as closely as possible, so that future commits and reformatting won't change the code. Visual Studio (Code) and CLion support this file.
2024-02-28 17:35:05 +01:00
Kae
a1addf1ec2
Merge pull request #22 from kblaschke/use-pragma-once
...
Use "#pragma once" instead of include guards
2024-02-26 13:57:22 +11:00
Kai Blaschke
3073a88cd1
Use "#pragma once" instead of include guards
2024-02-25 15:46:47 +01:00
