Merge pull request #416 from cortex-command-community/pre4-testing

Pre4 testing

Author: garethyr

.github/workflows/build-check.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
+          sudo apt-get install --no-install-recommends liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
 
       - name: Install Clang
         # You may pin to the exact commit or the version.

.github/workflows/meson.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
 
       - name: Install Clang
         # You may pin to the exact commit or the version.
@@ -81,3 +81,75 @@ jobs:
         with:
           name: CortexCommand.AppImage
           path: CortexCommand.AppImage
+
+
+  build-debug-linux:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-20.04
+
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update -yq
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
+
+      - name: Install Clang
+        # You may pin to the exact commit or the version.
+        # uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
+        uses: egor-tensin/setup-clang@v1
+        with:
+          # Set up cc/c++ executables
+          cc: 1 # optional, default is 1
+
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: build-release-${{runner.os}}
+          max-size: 5G
+
+      - name: Build
+        # You may pin to the exact commit or the version.
+        # uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
+        uses: BSFishy/[email protected]
+        env:
+          CC: "clang"
+          CXX: "clang++"
+          CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
+        with:
+          # The action to run
+          setup-options: -Ddebug=true --optimization=g -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ -Ddebug_type=release
+          meson-version: 0.55.3
+          ninja-version: 1.10.0
+          action: build
+
+      - name: Create AppDir
+        run: |
+          echo "Setting output prefix"
+          DESTDIR=${GITHUB_WORKSPACE}/build/AppDir meson install -C $GITHUB_WORKSPACE"/build"
+
+      - name: Download linuxdeploy
+        working-directory: ${{env.GITHUB_WORKSPACE}}
+        run: |
+          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O lindeploy
+          chmod +x lindeploy
+
+      - name: Create AppImage
+        working-directory: ${{env.GITHUB_WORKSPACE}}
+        env:
+          LD_LIBRARY_PATH: ./external/lib/linux/x86_64/
+          OUTPUT: CortexCommand-debug.AppImage
+        run: |
+          echo ${LD_LIBRARY_PATH}
+          ./lindeploy --appdir=build/AppDir --output appimage
+
+      - name: Upload Appimage
+        uses: actions/upload-artifact@v2
+        with:
+          name: CortexCommand-debug.AppImage
+          path: CortexCommand-debug.AppImage

Activities/GameActivity.cpp

@@ -769,6 +769,7 @@ bool GameActivity::CreateDelivery(int player, int mode, Vector &waypoint, Actor
         newDelivery.pCraft = pDeliveryCraft;
         newDelivery.orderedByPlayer = player;
         newDelivery.landingZone = m_LandingZone[player];
+		newDelivery.multiOrderYOffset = 0;
         newDelivery.delay = m_DeliveryDelay * pDeliveryCraft->GetDeliveryDelayMultiplier();
         newDelivery.timer.Reset();
 
@@ -1459,7 +1460,7 @@ void GameActivity::Update()
             m_PlayerController[player].RelativeCursorMovement(m_ActorCursor[player]);
 
             // Find the actor closest to the cursor, if any within the radius
-            float markedDistance = -1;
+			Vector markedDistance;
             Actor *pMarkedActor = g_MovableMan.GetClosestTeamActor(team, player, m_ActorCursor[player], g_SceneMan.GetSceneWidth(), markedDistance);
 //            Actor *pMarkedActor = g_MovableMan.GetClosestTeamActor(team, player, m_ActorCursor[player], g_FrameMan.GetPlayerScreenWidth() / 4);
 
@@ -1509,7 +1510,7 @@ void GameActivity::Update()
                     // Show the pie menu switching animation over the highlighted Actor
                     m_pPieMenu[player]->SetPos(pMarkedActor->GetPos());
 
-                    if (markedDistance > g_FrameMan.GetPlayerFrameBufferWidth(player) / 4)
+                    if (markedDistance.GetMagnitude() > g_FrameMan.GetPlayerFrameBufferWidth(player) / 4)
                         m_pPieMenu[player]->Wobble();
                     else
                         m_pPieMenu[player]->FreezeAtRadius(30);
@@ -1684,8 +1685,7 @@ void GameActivity::Update()
 
         else if (m_ViewState[player] == ViewState::LandingZoneSelect)
         {
-            // Continuously display LZ message
-            g_FrameMan.SetScreenText("Choose your landing zone...", ScreenOfPlayer(player));
+			g_FrameMan.SetScreenText("Choose your landing zone... Hold UP or DOWN to place multiple orders", ScreenOfPlayer(player));
 
             // Save the x pos so we can see which direction the user is moving it
             float prevLZX = m_LandingZone[player].m_X;
@@ -1731,24 +1731,15 @@ void GameActivity::Update()
             }
 
             // Interface for the craft AI post-delivery mode
-            if (m_PlayerController[player].IsState(PRESS_DOWN))// || m_PlayerController[player].IsState(PRESS_SECONDARY))
-            {
-                if (m_AIReturnCraft[player])
-                    g_GUISound.SelectionChangeSound()->Play(player);
-                else
-                    g_GUISound.UserErrorSound()->Play(player);
+			if (m_PlayerController[player].IsState(PRESS_DOWN)) {
+				if (m_AIReturnCraft[player]) { g_GUISound.SelectionChangeSound()->Play(player); }
 
-                m_AIReturnCraft[player] = false;
-            }
-            else if (m_PlayerController[player].IsState(PRESS_UP))// || m_PlayerController[player].IsState(PRESS_SECONDARY))
-            {
-                if (!m_AIReturnCraft[player])
-                    g_GUISound.SelectionChangeSound()->Play(player);
-                else
-                    g_GUISound.UserErrorSound()->Play(player);
+				m_AIReturnCraft[player] = false;
+			} else if (m_PlayerController[player].IsState(PRESS_UP)) {
+				if (!m_AIReturnCraft[player]) { g_GUISound.SelectionChangeSound()->Play(player); }
 
-                m_AIReturnCraft[player] = true;
-            }
+				m_AIReturnCraft[player] = true;
+			}
 
             // Player canceled the order while selecting LZ - can't be done in pregame
             if (m_PlayerController[player].IsState(PRESS_SECONDARY) && m_ActivityState != ActivityState::PreGame)
@@ -1761,29 +1752,36 @@ void GameActivity::Update()
                 g_GUISound.UserErrorSound()->Play(player);
                 // Flash the same actor, jsut to show the control went back to him
                 m_pPieMenu[player]->DoDisableAnimation();
-            }
-            // Player is done selecting LZ,
-            else if (m_PlayerController[player].IsState(PRESS_FACEBUTTON) || m_PlayerController[player].IsState(PRESS_PRIMARY))
-            {
-                // Set the LZ cursor to be just over terran, to avoid getting stuck at halfway interpolating there
-                m_LandingZone[player].m_Y = 0;
-                m_LandingZone[player].m_Y = g_SceneMan.FindAltitude(m_LandingZone[player], g_SceneMan.GetSceneHeight(), 10);
-                // Complete the purchase by getting the order from the BuyGUI, build it, and stuff it into a delivery
-                CreateDelivery(player);
-                // If there are no other Actors on this team, just view the LZ we have selected
-                if (!g_MovableMan.GetNextTeamActor(team))
-                {
-                    m_ObservationTarget[player] = m_LandingZone[player];
-                    m_ViewState[player] = ViewState::Observe;
-                }
-                // If there are other guys around, switch back to normal view
-                else
-                    m_ViewState[player] = ViewState::Normal;
-                // Stop displaying the LZ message
-                g_FrameMan.ClearScreenText(ScreenOfPlayer(player));
-                // Flash the same actor, jsut to show the control went back to him
-                m_pPieMenu[player]->DoDisableAnimation();
-            }
+			} else if (m_PlayerController[player].IsState(PRESS_FACEBUTTON) || m_PlayerController[player].IsState(PRESS_PRIMARY)) {
+				m_LandingZone[player].m_Y = 0;
+				float lzOffsetY = 0;
+				// Holding up or down will allow the player to make multiple orders without exiting the delivery phase. TODO: this should probably have a cooldown?
+				if (!m_PlayerController[player].IsState(MOVE_UP) && !m_PlayerController[player].IsState(MOVE_DOWN)) {
+					m_LandingZone[player].m_Y = g_SceneMan.FindAltitude(m_LandingZone[player], g_SceneMan.GetSceneHeight(), 10);
+					if (!g_MovableMan.GetNextTeamActor(team)) {
+						m_ObservationTarget[player] = m_LandingZone[player];
+						m_ViewState[player] = ViewState::Observe;
+					} else {
+						m_ViewState[player] = ViewState::Normal;
+					}
+					g_FrameMan.ClearScreenText(ScreenOfPlayer(player));
+					m_pPieMenu[player]->DoDisableAnimation();
+				} else {
+					// Place the new marker above the cursor so that they don't intersect with each other.
+					lzOffsetY += m_AIReturnCraft[player] ? -32.0F : 32.0F;
+					m_LandingZone[player].m_Y = g_SceneMan.FindAltitude(m_LandingZone[player], g_SceneMan.GetSceneHeight(), 10) + lzOffsetY;
+				}
+
+				if (m_pBuyGUI[player]->GetTotalOrderCost() > GetTeamFunds(team)) {
+					g_GUISound.UserErrorSound()->Play(player);
+					m_FundsChanged[team] = true;
+				} else {
+					CreateDelivery(player);
+					m_Deliveries[team].rbegin()->multiOrderYOffset = lzOffsetY;
+				}
+				// Revert the Y offset so that the cursor doesn't flinch.
+				m_LandingZone[player].m_Y -= lzOffsetY;
+			}
 
             bool wrapped = g_SceneMan.ForceBounds(m_LandingZone[player]);
 
@@ -2227,6 +2225,14 @@ void GameActivity::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int w
         {
             int halfWidth = 24;
             landZone = itr->landingZone - targetPos;
+			bool anyPlayerOnTeamIsInLandingZoneSelectViewState = false;
+			for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
+				if (GetTeamOfPlayer(player) == team && m_ViewState[player] == ViewState::LandingZoneSelect) {
+					anyPlayerOnTeamIsInLandingZoneSelectViewState = true;
+					break;
+				}
+			}
+			if (!anyPlayerOnTeamIsInLandingZoneSelectViewState) { landZone.m_Y -= itr->multiOrderYOffset; }
             // Cursor
             draw_sprite(pTargetBitmap, m_aLZCursor[cursor][frame], landZone.m_X - halfWidth, landZone.m_Y - 48);
             draw_sprite_h_flip(pTargetBitmap, m_aLZCursor[cursor][frame], landZone.m_X + halfWidth - m_aLZCursor[cursor][frame]->w, landZone.m_Y - 48);

Activities/GameActivity.h

@@ -56,6 +56,8 @@ class GameActivity : public Activity {
         int orderedByPlayer;
         // Where to land
         Vector landingZone;
+		// How much this delivery was offset upwards for multi-ordering, stored to help with delivery icons. If 0, this was presumably not a multi-order.
+		float multiOrderYOffset;
         // How long left until entry, in ms
         long delay;
         // Times how long we've been in transit

Activities/MultiplayerServerLobby.cpp

@@ -354,7 +354,7 @@ namespace RTE {
 		UpdateActivityBox();
 
 		// This allow to reduce looby bandwidth by 50% while still somewhat descent looking
-		g_NetworkServer.SetInterlacingMode(true);
+		//g_NetworkServer.SetInterlacingMode(true);
 
 		return error;
 	}

CHANGELOG.md

@@ -216,7 +216,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - New `ACraft` INI and Lua (R/W) property `ScuttleOnDeath` which can be used to disable the automatic self-destruct sequence when the craft's health drops down to zero.
 
 - New `Settings.ini` property `UnheldItemsHUDDisplayRange = numPixels` that hides the HUD of stranded items at a set distance. Default is 500 (25 meters).
-	Value of -1 or anything below means all HUDs will be hidden and the only indication an item can be picked up will be on the Actor's HUD when standing on top of it.
+	Value of -1 or anything below means all HUDs will be hidden and the only indication an item can be picked up will be on the `Actor`'s HUD when standing on top of it.
 	Value of 0 means there is no range limit and all items on Scene will display the pick-up HUD.
 	Valid range values are 1-1000, anything above will be considered as no range limit.
 
@@ -227,10 +227,71 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `Settings.ini` property `SimplifiedCollisionDetection = 0/1` to enable more performant but less accurate MO collision detection (previously `PreciseCollisions = 0`). Disabled by default.
 
+- New INI property `BuyableMode` to specify in which buy lists a `Buyable = 1` item should appear in.  
+	`BuyableMode = 0 // No restrictions` - item will appear in both lists as usual. Default value, does not need to be explicitly specified.
+	`BuyableMode = 1 // BuyMenu only` - item will not appear in any group in the object picker during the editing phase, but will be available to purchase from the buy menu.  
+	`BuyableMode = 2 // ObjectPicker only` - item will not appear in any tab in the buy menu when making an order, but will be available for placement from the object picker during editing phase.
+
+- New `MovableMan` Lua function `KillAllTeamActors`, which kills all `Actor`s on the given `Team`.
+
+- New `ACRocket` INI property `MaxGimbalAngle`, which enables automatic stabilization via tilting of the main engine.
+
+- Added Lua bindings for `scene.Areas` and `area.Boxes` that you can iterate through to get all the `Areas` in a `Scene` and all the `Boxes` in an `Area`.
+
+- Added `Area` Lua function `area:RemoveBox(boxToRemove)` which removes the given `Box` from the `Area`. Note that this removal is done by comparing the `Box`'s `Corner`, `Width` and `Height`, so you're actually removing the first `Box` that matches the passed-in boxToRemove.
+
+- Added Lua binding for `AudioMan:StopMusic()`, which stops all playing music. `AudioMan:StopAll()` used to do this, but now it actually stops all sounds and music.
+
+- New `Actor` Lua (R) property `SharpAimProgress`, which returns the current sharp-aiming progress as a scalar from 0 to 1.
+
+- New `HeldDevice` Lua (R/W) property `Supported`, which indicates whether or not the device is currently being supported by a background hand.
+
+- New `HeldDevice` Lua function `IsEmpty`, which indicates whether the device is devoid of ammo. Can be used to skip an extra step to check for a `Magazine`. Will always return `false` for non-`HDFirearm` devices.
+
+- New `SoundContainer` INI and Lua (R/W) property `PitchVariation`, which can be used to randomize the pitch of the sounds being played.
+
+- New `AHuman` and `ACrab` INI and Lua (R/W) property `JetReplenishRate`, which determines how fast jump time (i.e. jetpack fuel) is replenished during downtime.
+
+- Added `Entity` Lua function `entity:RemoveFromGroup(groupToRemoveFrom)` which removes the given group from the `Entity`. The reverse of `AddToGroup`.
+
+- New `AHuman` Lua functions `GetWalkAngle(layer)` and `SetWalkAngle(layer, angle)`, which can be used to read and override walk path rotation of both Legs/Layers respectively. Note that the walk path rotation is automatically updated on each step to match the curvature of the terrain, so this value resets every update.
+
+- New `AHuman` INI and Lua (R/W) property `ArmSwingRate`, which now controls the arms' walking animation, according to each arm's `IdleOffset`. `1` is the default value, `0` means that the arms stay still.
+
+- New `Attachable` Lua (R) property `JointPos`, which gets the position of the object's joint in scene coordinates.
+
+- New `AHuman` Lua (R) property `IsClimbing`, which indicates whether the actor is currently climbing using either of the arms.
+
+- New `AHuman` Lua functions `UnequipFGArm()` and `UnequipArms()` which unequip the currently held item(s) and put them into the actor's inventory.
+
+- You can now execute multiple copies of your delivery order by holding UP or DOWN while choosing the landing zone.
+
+- New `MOSprite` INI property `IconFile`, which can be used to define a separate sprite to be displayed in GUI elements, such as the Buy Menu.  
+	Defined similarly to `SpriteFile`, i.e. `IconFile = ContentFile` followed up by a `FilePath` to the sprite.
+	
+- New `MOSprite` Lua functions `GetIconWidth()` and `GetIconHeight()` which return the dimensions of its GUI representation.
+
+- New `PrimitiveMan` Lua functions `DrawIconPrimitive(player, pos, entity)` and `DrawIconPrimitive(pos, entity)` which can be used to draw the GUI representation of the passed in entity.
+
+- New `AEmitter` and `PEmitter` Lua (R) property `ThrottleFactor`, which gets the throttle strength as a multiplier value that factors in either the positive or negative throttle multiplier according to throttle.
+
+- New `AHuman` Lua (R) property `EquippedMass`, which returns the total mass of any `HeldDevice`s currently equipped by the actor.
+
+- New Settings.ini flag `UseExperimentalMultiplayerSpeedBoosts = 1/0`. When turned on, it will use some code that **may** speed up multiplayer.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
 
+- `ACrab` actors will now default to showing their `Turret` sprite as their GUI icon. If no turret is defined, the `ACrab`'s own sprite will be used.  
+	In a similar fashion, `AHuman` will now default to its torso sprite as its GUI representation if no `Head` has somehow been defined.
+
+- `ThrownDevice`s will now use `StanceOffset`, `SharpStanceOffset` and `SupportOffset` in the same way as any other `HeldDevice`. In addition, `EndThrowOffset` will be used to set the BG hand position while sharp aiming or throwing.
+
+- `AHuman` throwing angle will no longer be affected by the rotation of the body.
+
+- Exposed `MovableObject` property `RestThreshold` to Lua (R/W).
+
 - `ACRocket`s can now function without a full set of thrusters. This also means that "Null Emitter" thrusters are no longer required for rockets.
 
 - Changed `MOSprite` property `SpriteAnimMode` `Enum` `LOOPWHENMOVING` to `LOOPWHENACTIVE` as it also describes active devices.
@@ -271,7 +332,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Recoil when firing weapons now affects sharp aim.
 
-- The third argument for `distance` to be filled out in `MovableMan:GetClosestActor()` is now a `Vector` rather than `float`.
+- The distance arguments for `MovableMan` functions `GetClosestActor` and `GetClosestTeamActor` are now of type `Vector` rather than `float`.
 
 - File paths in INIs are now case sensitive.
 
@@ -435,6 +496,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Console error spam will no longer cripple performance over time.
 
+- `AudioMan:StopAll()` now actually stops all sounds, instead of just stopping music.
+
 - Fixed incorrect mouse bounds during splitscreen when the mouse player was not Player 1.
 
 </details>