Merge branch 'development' into macos-build

Author: Causeless

.gitignore

@@ -13,6 +13,8 @@
 compile_commands.json
 **/.ccls-cache
 **/.cache
+**/.clangd
+
 
 **/build*
 
@@ -102,3 +104,4 @@ LogLoadingWarning.txt
 LogConsole.txt
 Console.dump.log
 Console.input.log
+imgui.ini

CHANGELOG.md

@@ -85,8 +85,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `Attachable` INI and Lua (R/W) properties `InheritsVelWhenDetached` and `InheritsAngularVelWhenDetached`, which determine how much of these velocities an attachable inherits from its parent when detached. Defaults to 1.
 
-- New GPU Renderer using OpenGL+Raylib, draw now takes 0ms in pretty much every instance.
-
 - New Z Order for scene layers and primitives: Background layer sits at z=100, Terrain Background at z=50, Terrain color and MO color at z=0, GUIs sit at z=-100, allowed z range is [-200, +200], in the future this'll be expanded to MO draw as well.
 - Added Lua-accessible bitmap manipulation functions to `MOSprite`s:	
 	```
@@ -138,6 +136,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	```
 	Original bindings with no scale argument are untouched and can be called as they were.
 
+- New option to mute audio when the game window loses focus.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -152,9 +152,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	Savefiles have the extension `.ccsave`, but their underlying format is really just a `.zip` file. This can be opened and modified as before with any zip file viewer.
 	These savefiles can be safely renamed and moved without breaking the savegame, unlike before.
 
+- New GPU Renderer using now OpenGL + Raylib, dramatically improving draw performance. Draw now takes a negligible amount of time.
+
 - All vanilla scenario activities have had their settings polished, respecting settings which make sense and disabling settings which don't.
 	You can now have fog of war in the test scene, and can no longer require path to orbit in Zero-G Diggers-Only One Man Army.
 
+- The "Clear" Preset button in the Buy Menu now clears the currently selected loadout, instead of the last one in the list.
+
+- Loadouts are now additive, and append their items into the cart instead of replacing the current cart item list.
+
 - Conquest activities will once again fall-back to using base dropships and rockets if a random selection of the selected tech's craft can't find one capable of carrying passengers and/or cargo.
 
 - `MovableMan:OpenAllDoors()`, when passed `NOTEAM`, will now open/close doors specifically for `NOTEAM` (instead of all doors).

Data/Base.rte/GUIs/BuyMenuGUI.ini

@@ -211,7 +211,7 @@ Anchor = Left, Top
 Text = Shields
 Checked = False
 
-[SetsTab]
+[LoadoutsTab]
 ControlType = TAB
 Parent = BuyGUIBox
 X = 2
@@ -220,9 +220,9 @@ Width = 57
 Height = 17
 Visible = True
 Enabled = True
-Name = SetsTab
+Name = LoadoutsTab
 Anchor = Left, Top
-Text = Presets
+Text = Loadouts
 Checked = False
 
 [CargoLabel]
@@ -439,7 +439,7 @@ Name = SaveButton
 Anchor = Left, Top
 Text = Save
 
-[ClearButton]
+[DeleteButton]
 ControlType = BUTTON
 Parent = BuyGUIBox
 X = 4
@@ -448,6 +448,6 @@ Width = 48
 Height = 18
 Visible = True
 Enabled = True
-Name = ClearButton
+Name = DeleteButton
 Anchor = Left, Top
-Text = Clear
+Text = Delete

Data/Base.rte/GUIs/MetagameGUI.ini

@@ -118,7 +118,7 @@ Visible = True
 Enabled = True
 Name = DifficultyLabel
 Anchor = Left, Top, Right
-ToolTip = Diificulty
+ToolTip = Difficulty
 Text = Difficulty: Medium
 HAlignment = centre
 VAlignment = middle

Data/Base.rte/GUIs/SaveLoadMenuGUI.ini

@@ -171,7 +171,7 @@ Anchor = Left, Top
 ToolTip = None
 Text = Delete Save
 
-[ActivityCannotBeSavedWarning]
+[DescriptionLabel]
 ControlType = LABEL
 Parent = CollectionBoxSaveGameMenu
 X = 7
@@ -180,9 +180,8 @@ Width = 287
 Height = 20
 Visible = True
 Enabled = True
-Name = ActivityCannotBeSavedWarning
+Name = DescriptionLabel
 Anchor = Left, Top
-Text = The currently played activity does not allow saving.
 HAlignment = Centre
 VAlignment = Centre
 

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -713,6 +713,20 @@ Anchor = Left, Top
 Checked = Unchecked
 Text = Mute
 
+[CheckboxMuteAudioOnFocusLoss]
+ControlType = CHECKBOX
+Parent = CollectionBoxAudioSettings
+X = 145
+Y = 189
+Width = 120
+Height = 20
+Visible = True
+Enabled = True
+Name = CheckboxMuteAudioOnFocusLoss
+Anchor = Middle, Top
+Checked = Unchecked
+Text = Mute On Focus Loss?
+
 ///////////////////////////////////////////////////////////////////////
 // Input Settings Menu
 

Data/Base.rte/GUIs/SettingsPauseGUI.ini

@@ -714,6 +714,20 @@ Anchor = Left, Top
 Checked = Unchecked
 Text = Mute
 
+[CheckboxMuteAudioOnFocusLoss]
+ControlType = CHECKBOX
+Parent = CollectionBoxAudioSettings
+X = 145
+Y = 189
+Width = 120
+Height = 20
+Visible = True
+Enabled = True
+Name = CheckboxMuteAudioOnFocusLoss
+Anchor = Middle, Top
+Checked = Unchecked
+Text = Mute On Focus Loss?
+
 ///////////////////////////////////////////////////////////////////////
 // Input Settings Menu