Merge branch 'dev' into feat-melee-weapon

# Conflicts:
#	src/client/core/Inventory.ts
#	src/client/core/RemoteItemRenderer.ts
#	src/server/managers/ItemManager.ts

docs/Items.md

@@ -1,7 +1,10 @@
 ## Items
+
 Item ID list with implementation info
-| ID | Class        | Item Description                      | Inventory   | World |
-|----|--------------|---------------------------------------|-------------|-------|
-| 0  | ItemBase.ts  | Base item template (freaky green cube)| ✅          | ✅    |
-| 1  | BananaGun.ts | Banana gun                            | ✅          | ✅    |
-| 1  | FishGun.ts   | Fish gun >:)                          | ✅          | ✅    |
+
+| ID | Class        | Item Description                       | Inventory | World |
+| -- | ------------ | -------------------------------------- | --------- | ----- |
+| 0  | ItemBase.ts  | Base item template (freaky green cube) | ✅        | ✅    |
+| 1  | BananaGun.ts | Banana gun                             | ✅        | ✅    |
+| 2  | FishGun.ts   | Fish gun >:)                           | ✅        | ✅    |
+| 4  | FlagItem.ts  | FlagItem used in CTF                   | ✅        | ✅    |

docs/blender-texture-resolution.md

@@ -0,0 +1,42 @@
+# Reduce Texture Resolution of a Blender File
+
+The following python script reduces the resolution of all textures in a Blender file by 50%.
+
+```python
+import bpy
+
+def resize_image(image, scale_factor=0.5):
+    # Calculate new dimensions
+    new_width = int(image.size[0] * scale_factor)
+    new_height = int(image.size[1] * scale_factor)
+
+    # Ensure the image is packed or has a file path
+    if image.packed_file:
+        image.unpack(method='USE_ORIGINAL')
+
+    # Get the file path
+    filepath = bpy.path.abspath(image.filepath)
+
+    # Skip images without a valid file path
+    if not filepath:
+        print(f"Skipping image '{image.name}' because it has no valid file path.")
+        return
+
+    # Scale the image
+    image.scale(new_width, new_height)
+
+    # Save the resized image
+    image.filepath_raw = filepath
+    image.file_format = 'PNG'  # Change format if needed
+    image.save()
+
+def main():
+    # Iterate over all images in the Blender file
+    for image in bpy.data.images:
+        if image.size[0] > 0 and image.size[1] > 0:
+            print(f"Processing image: {image.name}")
+            resize_image(image)
+
+if __name__ == "__main__":
+    main()
+```

docs/gltf-compression.md

@@ -1,38 +1,46 @@
 # GLTF Compression
 
 ### use gltf-pipeline for compression
+
 https://github.com/CesiumGS/gltf-pipeline
 
 Can be installed using npm:
+
 ```bash
 npm install -g gltf-pipeline
 ```
 
 ### sane person compression if it's already stylized:
+
 ```bash
 gltf-pipeline -i input.glb -o output.glb --draco.compressionLevel 10 --texcomp.quality 50 --texcomp.powerOfTwoImage true
 ```
+
 This command:
 
 1. Uses Draco compression with maximum level (10)
-2. Reduces the precision of various attributes (position, normal, texture coordinates, color, and other generic attributes) by specifying fewer bits for each. This effectively removes data points. 3.
+2. Reduces the precision of various attributes (position, normal, texture coordinates, color, and other generic
+   attributes) by specifying fewer bits for each. This effectively removes data points. 3.
 3. Applies the --optimize.simplify flag, which attempts to simplify the geometry while preserving the overall shape.
 
-You can adjust the quantization bits (the numbers after each quantize...Bits option) to be even lower for more aggressive simplification. For example:
+You can adjust the quantization bits (the numbers after each quantize...Bits option) to be even lower for more
+aggressive simplification. For example:
 
 ```bash
 --draco.quantizePositionBits 8 --draco.quantizeNormalBits 6 --draco.quantizeTexcoordBits 6 --draco.quantizeColorBits 6 --draco.quantizeGenericBits 6
 ```
 
-
 ### really abysmal compression to "stylize" something normal
-(used for possum and banana so far)- uses 8 for quantization leading to gross blocky look sometimes unintended with holes
+
+(used for possum and banana so far)- uses 8 for quantization leading to gross blocky look sometimes unintended with
+holes
 
 ```bash
 gltf-pipeline -i possum.glb -o simplified_possum.glb --draco.compressionLevel 10 --draco.quantizePositionBits 6 --draco.quantizeNormalBits 4 --draco.quantizeTexcoordBits 4 --draco.quantizeColorBits 4 --draco.quantizeGenericBits 4 --optimize.simplify
 ```
 
 #### not sure what this one does, added a bunch more flags might break things lmk tho
+
 ```bash
 gltf-pipeline -i possum.glb -o simplified_possum.glb --draco.compressionLevel 10 --draco.quantizePositionBits 6 --draco.quantizeNormalBits 4 --draco.quantizeTexcoordBits 4 --draco.quantizeColorBits 4 --draco.quantizeGenericBits 4 --optimize.simplify --optimize.pruneUnused --optimize.mergeInstances --optimize.mergeMaterials --optimize.stripJoints
-```
+```

public/gameVersion.json

@@ -1 +1 @@
-{"version": "1.9.1"}
+{"version": "1.10.0"}

src/client/core/Game.ts

@@ -59,7 +59,6 @@ export class Game {
 		this.networking.updatePlayerData();
 		this.chatOverlay.onFrame();
 		this.inventoryManager.onFrame();
-		this.healthIndicator.onFrame();
 		this.renderer.onFrame(this.localPlayer);
 		if (this.networking.getServerInfo().mapName) {
 			this.mapLoader.load('/maps/' + this.networking.getServerInfo().mapName + '/map.glb');

src/client/core/Inventory.ts

@@ -8,6 +8,7 @@ import { ItemBase, ItemType } from '../items/ItemBase.ts';
 import { FishGun } from '../items/FishGun.ts';
 import { Player } from '../../shared/Player.ts';
 import { Bat } from '../items/Bat.ts';
+import { FlagItem } from '../items/FlagItem.ts';
 
 export class Inventory {
 	private inventoryItems: ItemBase[] = [];
@@ -69,6 +70,11 @@ export class Inventory {
 						this.inventoryItems.push(bat);
 						break;
 					}
+					case 4: {
+						const flag = new FlagItem(this.renderer, i, ItemType.InventoryItem);
+						this.inventoryItems.push(flag);
+						break;
+					}
 					default: {
 						const testItem = new ItemBase(
 							ItemType.InventoryItem,

src/client/core/Networking.ts

@@ -19,6 +19,7 @@ interface ServerInfo {
 	version: string;
 	gameMode: string;
 	playerMaxHealth: number;
+	skyColor: string;
 }
 
 interface LastUploadedLocalPlayer {
@@ -68,6 +69,7 @@ export class Networking {
 			version: '',
 			gameMode: '',
 			playerMaxHealth: 0,
+			skyColor: '#000000',
 		};
 
 		this.setupSocketListeners();
@@ -104,7 +106,9 @@ export class Networking {
 		});
 
 		this.socket.on('serverInfo', (data) => {
-			this.serverInfo = data;
+			this.serverInfo = {
+				...data,
+			};
 			this.onServerInfo();
 		});
 	}
@@ -176,17 +180,34 @@ export class Networking {
 				}
 				if (remotePlayer.health < this.localPlayer.health) this.damagedTimestamp = Date.now() / 1000;
 				this.localPlayer.health = remotePlayer.health;
+				this.localPlayer.highlightedVectors = remotePlayer.highlightedVectors.map(
+					(vec) => new THREE.Vector3(vec.x, vec.y, vec.z),
+				);
+				this.localPlayer.directionIndicatorVector = remotePlayer.directionIndicatorVector
+					? new THREE.Vector3(
+						remotePlayer.directionIndicatorVector.x,
+						remotePlayer.directionIndicatorVector.y,
+						remotePlayer.directionIndicatorVector.z,
+					)
+					: undefined;
+
 				this.localPlayer.idLastDamagedBy = remotePlayer.idLastDamagedBy;
 				this.localPlayer.inventory = remotePlayer.inventory;
 				this.localPlayer.playerSpectating = remotePlayer.playerSpectating;
 				this.localPlayer.gameMsgs = remotePlayer.gameMsgs;
 				this.localPlayer.gameMsgs2 = remotePlayer.gameMsgs2;
+				this.localPlayer.doPhysics = remotePlayer.doPhysics;
 				continue;
 			}
 			if (remotePlayer.chatActive) {
 				this.messagesBeingTyped.push(`${remotePlayer.name}: ${remotePlayer.chatMsg}`);
 			}
 		}
+		if (
+			this.getServerInfo().version && this.localPlayer.gameVersion !== this.getServerInfo().version
+		) {
+			this.localPlayer.gameMsgs = ['&c Your client may be outdated. Try refreshing the page.'];
+		}
 	}
 
 	private playersAreEqualEnough(player1: Player, player2: LastUploadedLocalPlayer | null) {

src/client/core/RemoteItemRenderer.ts

@@ -5,6 +5,7 @@ import { ItemBase, ItemType } from '../items/ItemBase.ts';
 import { BananaGun } from '../items/BananaGun.ts';
 import { FishGun } from '../items/FishGun.ts';
 import { Bat } from '../items/Bat.ts';
+import { FlagItem } from '../items/FlagItem.ts';
 
 // Custom types
 type Vector3Data = {
@@ -92,8 +93,11 @@ export class RemoteItemRenderer {
 				return new FishGun(this.renderer, this.networking, 0, ItemType.WorldItem);
 			case 3:
 				return new Bat(this.renderer, this.networking, 0, ItemType.WorldItem);
+			case 4:
+				return new FlagItem(this.renderer, 0, ItemType.WorldItem);
 			default:
 				// Return a generic item
+				console.log('Unknown item type:', itemType);
 				return new ItemBase(
 					ItemType.WorldItem,
 					this.renderer.getEntityScene(),