diff options
| author | WasabiRaptor <ketchupraptor@gmail.com> | 2025-05-25 13:24:44 -0400 |
|---|---|---|
| committer | WasabiRaptor <ketchupraptor@gmail.com> | 2025-05-25 13:24:44 -0400 |
| commit | 59854f015602b791b51c20a008e78aaed68d20b9 (patch) | |
| tree | 7b2f17dc60ad192fddec182f982f6feb5781eddd /assets/opensb | |
| parent | 96b86c63fd168df1a8463f184932d1b39c4284ec (diff) | |
| parent | 1eac38c5526f6d4deee811e9995ed5579cdda46c (diff) | |
Merge branch 'main' into networked-animator-improvements
Diffstat (limited to 'assets/opensb')
| -rw-r--r-- | assets/opensb/interface/opensb/shaders/select.png | bin | 4583 -> 4514 bytes | |||
| -rw-r--r-- | assets/opensb/interface/opensb/shaders/selectend.png | bin | 4094 -> 4046 bytes | |||
| -rw-r--r-- | assets/opensb/interface/title/barstound.png | bin | 77149 -> 76361 bytes | |||
| -rw-r--r-- | assets/opensb/interface/title/starbound.png | bin | 76785 -> 75764 bytes | |||
| -rw-r--r-- | assets/opensb/rendering/sprites/error.png | bin | 145 -> 144 bytes | |||
| -rw-r--r-- | assets/opensb/scripts/opensb/player/commands.lua | 2 | ||||
| -rw-r--r-- | assets/opensb/sky/orbitals/bluestar.png | bin | 10007 -> 9975 bytes | |||
| -rw-r--r-- | assets/opensb/sky/orbitals/whitestar.png | bin | 10491 -> 10456 bytes | |||
| -rw-r--r-- | assets/opensb/sky/orbitals/yellowstar.png | bin | 10513 -> 10481 bytes |
9 files changed, 2 insertions, 0 deletions
diff --git a/assets/opensb/interface/opensb/shaders/select.png b/assets/opensb/interface/opensb/shaders/select.png Binary files differindex dc649b4..880a270 100644 --- a/assets/opensb/interface/opensb/shaders/select.png +++ b/assets/opensb/interface/opensb/shaders/select.png diff --git a/assets/opensb/interface/opensb/shaders/selectend.png b/assets/opensb/interface/opensb/shaders/selectend.png Binary files differindex 99908d6..b524acf 100644 --- a/assets/opensb/interface/opensb/shaders/selectend.png +++ b/assets/opensb/interface/opensb/shaders/selectend.png diff --git a/assets/opensb/interface/title/barstound.png b/assets/opensb/interface/title/barstound.png Binary files differindex d6e14af..23324ab 100644 --- a/assets/opensb/interface/title/barstound.png +++ b/assets/opensb/interface/title/barstound.png diff --git a/assets/opensb/interface/title/starbound.png b/assets/opensb/interface/title/starbound.png Binary files differindex 33647cc..c650d46 100644 --- a/assets/opensb/interface/title/starbound.png +++ b/assets/opensb/interface/title/starbound.png diff --git a/assets/opensb/rendering/sprites/error.png b/assets/opensb/rendering/sprites/error.png Binary files differindex b5bd3e7..84a4a55 100644 --- a/assets/opensb/rendering/sprites/error.png +++ b/assets/opensb/rendering/sprites/error.png diff --git a/assets/opensb/scripts/opensb/player/commands.lua b/assets/opensb/scripts/opensb/player/commands.lua index 2d83106..0094dba 100644 --- a/assets/opensb/scripts/opensb/player/commands.lua +++ b/assets/opensb/scripts/opensb/player/commands.lua @@ -22,6 +22,8 @@ register("run", function(src) return "^#f00;error: " .. result elseif result == nil then return nil + elseif type(result) == "string" then + return result else local success, printed = pcall(sb.printJson, result) if not success then diff --git a/assets/opensb/sky/orbitals/bluestar.png b/assets/opensb/sky/orbitals/bluestar.png Binary files differindex d174138..11cd274 100644 --- a/assets/opensb/sky/orbitals/bluestar.png +++ b/assets/opensb/sky/orbitals/bluestar.png diff --git a/assets/opensb/sky/orbitals/whitestar.png b/assets/opensb/sky/orbitals/whitestar.png Binary files differindex 87e11eb..8ebafb3 100644 --- a/assets/opensb/sky/orbitals/whitestar.png +++ b/assets/opensb/sky/orbitals/whitestar.png diff --git a/assets/opensb/sky/orbitals/yellowstar.png b/assets/opensb/sky/orbitals/yellowstar.png Binary files differindex 8979000..216a63a 100644 --- a/assets/opensb/sky/orbitals/yellowstar.png +++ b/assets/opensb/sky/orbitals/yellowstar.png |
