Stefan Maier 6057146244 Merge remote-tracking branch 'upstream/main' into merge/upstream-2026-10-03 ...

# Conflicts:
#	port/linux/game/network_distributed.c
#	port/linux/game/network_distributed.h

2026-10-03 07:38:52 +02:00

..

aim_assist.c

Merge upstream (92 commits) into the VR port

2026-10-01 10:30:05 +02:00

aim_assist.h

Declare the weapon trigger graph's cross-object callees in their owner headers

2026-09-13 19:47:36 -07:00

cheats.c

Fix seventh netcode review

2026-10-01 12:03:52 +13:00

cheats.h

Fix seventh netcode review

2026-10-01 12:03:52 +13:00

game_allegiance.c

Remove matching tooling and HALO_LINUX ifdefs

2026-09-30 21:49:46 +13:00

game_allegiance.h

Reconcile five Halo functions and approved declaration batches

2026-09-28 23:17:10 -07:00

game_engine_bomb.c

Initial commit

2025-11-27 02:27:27 +00:00

game_engine_ctf.c

Fix second netcode review

2026-10-01 03:54:02 +13:00

game_engine_defend.c

Initial commit

2025-11-27 02:27:27 +00:00

game_engine_king.c

Fix second netcode review

2026-10-01 03:54:02 +13:00

game_engine_king.h

Remove matching tooling and HALO_LINUX ifdefs

2026-09-30 21:49:46 +13:00

game_engine_list.c

Reconcile Fable Race exact functions

2026-09-02 14:37:12 -07:00

game_engine_list.h

Match game engine registry

2026-07-14 18:21:53 -07:00

game_engine_multiplayer_sounds.c

Reconcile five Halo functions and approved declaration batches

2026-09-28 23:17:10 -07:00

game_engine_oddball.c

Fix fifth netcode review

2026-10-01 09:12:07 +13:00

game_engine_place.h

Salvage and admit Fable game_engine wave

2026-09-02 08:41:09 -07:00

game_engine_playlist.h

Complete Claude reconciliation closeouts

2026-09-13 04:32:37 -07:00

game_engine_race.c

Fix second netcode review

2026-10-01 03:54:02 +13:00

game_engine_race.h

Reconcile approved frontier ownership and admission packets

2026-09-27 17:12:48 -07:00

game_engine_slayer.c

Fix fourth netcode review

2026-10-01 06:23:16 +13:00

game_engine_slayer.h

Complete and admit Slayer engine object

2026-09-02 11:22:21 -07:00

game_engine_stub.c

Reconcile approved frontier ownership and admission packets

2026-09-27 17:12:48 -07:00

game_engine_terminator.c

Initial commit

2025-11-27 02:27:27 +00:00

game_engine.c

Rework the multiplayer scoreboard

2026-10-03 01:16:09 +13:00

game_engine.h

Fix client flags in the second game

2026-10-01 02:37:43 +13:00

game_globals.c

Reconcile five Halo functions and approved declaration batches

2026-09-28 23:17:10 -07:00

game_globals.h

Reconcile approved frontier ownership and admission packets

2026-09-27 17:12:48 -07:00

game_statistics_internal.h

Reconcile seventh 10K exact source batch

2026-09-12 17:23:46 -07:00

game_statistics.c

Reconcile approved frontier ownership and admission packets

2026-09-27 17:12:48 -07:00

game_time.c

Fix seventh netcode review

2026-10-01 12:03:52 +13:00

game.c

Fix seventh netcode review

2026-10-01 12:03:52 +13:00

game.h

Harden and fix the netcode

2026-10-01 01:22:46 +13:00

local_players.h

Reconcile Opus network client reconstruction

2026-09-04 02:31:03 -07:00

player_control_runtime.h

Complete player control input cluster

2026-09-03 05:46:48 -07:00

player_control.c

Merge upstream (92 commits) into the VR port

2026-10-01 10:30:05 +02:00

player_queues_new.c

Fix second netcode review

2026-10-01 03:54:02 +13:00

player_queues_new.h

Remove the lockstep netcode

2026-09-30 22:12:05 +13:00

player_rumble_definition.c

Initial commit

2025-11-27 02:27:27 +00:00

player_rumble.c

Reconcile five Halo functions and approved declaration batches

2026-09-28 23:17:10 -07:00

player_rumble.h

Recover player rumble with authenticated fast_ftol

2026-08-31 04:45:17 -07:00

players_runtime.h

Reconcile Fable CTF salvage

2026-09-02 14:59:28 -07:00

players.c

Merge remote-tracking branch 'upstream/main' into merge/upstream-2026-10-03

2026-10-03 07:38:52 +02:00

players.h

Keep player names bannable

2026-10-02 22:12:16 +13:00