Commit Graph

700 Commits

Author SHA1 Message Date
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
Kae
7d9c9d3b32 move oddly placed player input code 2024-02-22 17:38:47 +11:00
Kae
9485aff8b8 minor input bug fix 2024-02-22 17:26:12 +11:00
Kae
ae3ecabcea loadstring shouldn't accept bytecode 2024-02-22 17:25:46 +11:00
Kae
f5ddb00675 Update CMakeLists.txt 2024-02-22 16:46:45 +11:00
Kae
3b25df55b5
Merge pull request #21 from kblaschke/allow-jemalloc-from-system
Support prefixed and non-prefixed JeMalloc functions
2024-02-22 12:00:37 +11:00
Kai Blaschke
9029f897da
Support prefixed and non-prefixed JeMalloc functions
Note that linking a JeMalloc library without prefixed functions will replace all memory allocations, including any call to "new", not just the ones specifically called via Star::malloc etc.
2024-02-21 18:08:56 +01:00
Kae
b8da62bf43
Update README.md 2024-02-21 10:15:17 +11:00
Kae
e6f96cb2bd std::allocator::rebind is deprecated
Clang should no longer scream
2024-02-20 19:34:58 +11:00
Kae
43b2fa53e7 I hate Freetype 2024-02-20 17:44:53 +11:00
Kae
e891499a9f Update CMakeLists.txt 2024-02-20 17:39:16 +11:00
Kae
533ad7f943 Update CMakeLists.txt 2024-02-20 16:59:47 +11:00
Kae
33c61c540e Update CMakeLists.txt 2024-02-20 16:01:45 +11:00
Kae
941bcb5bf8 Update build_windows.yml 2024-02-20 15:42:54 +11:00
Kae
187ab51df0 custom vcpkg triplet 2024-02-20 15:32:35 +11:00
Kae
fc6391e4db
Update build_windows.yml 2024-02-20 13:32:20 +11:00
Kae
c58c0acddb Revert "Update build_windows.yml"
This reverts commit e0a9d9a5e3.
2024-02-20 11:34:46 +11:00
Kae
e0a9d9a5e3
Update build_windows.yml
Use static linking with vcpkg dependencies
2024-02-20 11:26:40 +11:00
Kae
e50842e48d
Update build_windows.yml 2024-02-20 10:43:33 +11:00
Kae
442347d82e fix minor Image memleak 2024-02-20 10:00:35 +11:00
Kae
a7cfe73544
Merge pull request #18 from kblaschke/add-github-actions-workflow-files
Add initial GitHub Actions workflow files to run build checks
2024-02-20 09:50:40 +11:00
Kae
00cf86f240
Merge pull request #20 from kblaschke/small-fixes
A few small fixes
2024-02-20 09:49:50 +11:00
Kae
aa987a2177
Merge branch 'main' into small-fixes 2024-02-20 09:49:42 +11:00