Commit Graph

567 Commits

Author SHA1 Message Date
Kae
5da4b1a4e3 Make it clearer when the base Starbound assets are missing
until the installer can locate the user's original Starbound assets
2024-03-22 22:22:19 +11:00
Kae
4d84152609 Merge branch 'main' of https://github.com/OpenStarbound/OpenStarbound 2024-03-22 20:59:12 +11:00
Kae
c1592b079d Add readJson and writeJson for some packets 2024-03-22 20:59:02 +11:00
Kae
a08fe284d3
Merge pull request #47 from ErodeesFleurs/useful
Fix compilation error and add the 'world.id' function
2024-03-22 20:58:19 +11:00
Kae
e318098f0b Add equality operator for Directives (fixes networking bug) 2024-03-22 19:12:45 +11:00
ErodeesFleurs
443e6459b9 fix pushGlobalContext error 2024-03-22 15:56:20 +08:00
ErodeesFleurs
ec4787d78e world.id() for server 2024-03-22 15:46:30 +08:00
Kae
9b10964a3e Merge branch 'lighting' 2024-03-21 16:19:39 +11:00
ErodeesFleurs
868216a992 Add parseJson and clientWorld functions to LuaBindings 2024-03-21 10:10:22 +08:00
Kae
57ca6776e4 Lua patches 2024-03-21 00:57:49 +11:00
Kae
a096fa3ffc Update StarWorldPainter.cpp 2024-03-20 16:38:44 +11:00
Kae
bf73fbc1ad cursed point lights everywhere (but god it looks good) 2024-03-20 15:29:26 +11:00
Kae
6d76a11e25 experiment: unclamped lighting 2024-03-20 01:53:34 +11:00
ErodeesFleurs
a633070b3b oops 2024-03-19 16:50:05 +08:00
ErodeesFleurs
876cf6343d modify universe.sendPacket 2024-03-19 16:42:06 +08:00
Kae
e068172a09
Merge pull request #43 from ErodeesFleurs/sendPacket
Add the Lua function for sending packet.
2024-03-19 18:24:23 +11:00
Kae
983bb82a96 Async lighting improvements 2024-03-19 18:21:54 +11:00
ErodeesFleurs
b856377833 add sendPacket lua context 2024-03-19 12:46:50 +08:00
Kae
17ea975970 Update StarCommandProcessor.cpp 2024-03-19 14:44:21 +11:00
Kae
5ca42599ef make timescale a server command and add a tickrate command 2024-03-19 13:35:55 +11:00
Kae
5f01d2d4d7 Update StarWorldServer.cpp 2024-03-18 23:25:44 +11:00
Kae
5a48b0383a fix StepUpdate typos (oops) 2024-03-18 22:09:48 +11:00
Kae
647cd45dd5 Update StarPlayerUniverseMap.cpp 2024-03-18 17:37:43 +11:00
Kae
5d1e118a19 better UniverseMap checks 2024-03-18 17:34:02 +11:00
Kae
7d717489a9 Update StarUniverseClient.cpp 2024-03-18 17:12:42 +11:00
Kae
f15d50ec07 oops!! 2024-03-17 23:09:42 +11:00
Kae
faae6e715a fix minor interp bug 2024-03-17 18:06:12 +11:00
Kae
758a900e51 Update StarWorldServer.cpp 2024-03-17 17:37:32 +11:00
Kae
9dc1eb7312 InterpolationTracker operates on time in seconds instead of steps now 2024-03-17 17:33:31 +11:00
Kae
4e0d7598e1 omg 2024-03-17 15:56:29 +11:00
Kae
3650add73a Update CMakeLists.txt 2024-03-17 15:38:35 +11:00
Kae
68b1632b92 Update CMakeLists.txt 2024-03-17 15:36:50 +11:00
Kae
8d1d278e7b Update CMakeLists.txt 2024-03-17 15:32:05 +11:00
Kae
b98b0334a9 Update CMakeLists.txt 2024-03-17 15:29:38 +11:00
Kae
b2b6c05968 Update StarWorldServer.cpp 2024-03-17 15:12:08 +11:00
Kae
8559a46df2 fix RPATH and object material spaces from old worlds getting stuck 2024-03-17 15:11:29 +11:00
Kae
252ce113a5 add missing vars to linux and macOS CMakePresets 2024-03-17 13:45:30 +11:00
Kae
e867822a70 whoops, setMetatable call was accidentally removed 2024-03-17 13:36:30 +11:00
Kae
53c7c3775f Lua: new Image userdata (& cursor mod fix) 2024-03-17 01:53:46 +11:00
Kae
463205c09c remove unnecessary SDL2 include
[skip ci]
2024-03-17 01:52:34 +11:00
Kae
d577a98980 Lua: allow jarray and jobject to convert existing tables
[skip ci]
2024-03-17 01:52:02 +11:00
ErodeesFleurs
c6a2f4fa7d add clipboard lua binds 2024-03-16 20:00:53 +08:00
Kae
a63707cc59 Update word_count.cpp 2024-03-16 11:07:41 +11:00
Kae
78a68b6a20 postLoad scripts too 2024-03-16 00:02:51 +11:00
Kae
7eec15098e asset onLoad scripts can add and patch assets now 2024-03-15 22:47:02 +11:00
Kae
13f91aa195 Songbook search improvements 2024-03-15 21:29:14 +11:00
Kae
6fa0afd758 experimental asset load scripts 2024-03-15 21:28:11 +11:00
Kae
696abcca71 fix late aimPosition 2024-03-15 16:26:12 +11:00
Kae
658fab846e change net debug logging to kB/s 2024-03-15 16:00:56 +11:00
Kae
6208636d69 Fixes 2024-03-15 15:26:38 +11:00
Kae
662b83ff92 Initial commit of experimental zstd network compression
currently a bit buggy
2024-03-14 21:41:53 +11:00
Kae
8164e5ae6f Game window respects Windows theme setting 2024-03-14 21:17:05 +11:00
Kae
3534067801 Tile Prediction: make refunds silent 2024-03-11 17:03:09 +11:00
Kae
caf7abebfe change tickNetInterpolation calls to use dt value 2024-03-11 16:31:20 +11:00
Kae
e6d2f5975b Merge branch 'main' of https://github.com/OpenStarbound/OpenStarbound 2024-03-11 11:30:49 +11:00
Kae
ce002fa0ef Update CMakePresets.json
[skip ci]
2024-03-11 11:30:45 +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
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
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
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
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
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
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
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
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
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