Merge remote-tracking branch 'upstream/master'

SlawekNowy · May 18, 2024 · 98d2b49 · 98d2b49
2 parents fbf9e2b + 2cd6189
commit 98d2b49
Show file tree

Hide file tree

Showing 27 changed files with 283,856 additions and 242,612 deletions.
diff --git a/.github/workflows/pragma-linux-ci.yml b/.github/workflows/pragma-linux-ci.yml
diff --git a/.github/workflows/pragma-windows-ci.yml b/.github/workflows/pragma-windows-ci.yml
diff --git a/assets/doc/lua/pragma.ldoc b/assets/doc/lua/pragma.ldoc
diff --git a/assets/lua/entities/components/game_animation_recorder/shared.lua b/assets/lua/entities/components/game_animation_recorder/shared.lua
diff --git a/assets/scripts/physics/materials.udm b/assets/scripts/physics/materials.udm
diff --git a/assets/scripts/physics/tire_types.udm b/assets/scripts/physics/tire_types.udm
diff --git a/assets/scripts/sounds/fx.udm b/assets/scripts/sounds/fx.udm
diff --git a/assets/scripts/sounds/fx_footsteps.udm b/assets/scripts/sounds/fx_footsteps.udm
diff --git a/assets/scripts/sounds/fx_physics_impact.udm b/assets/scripts/sounds/fx_physics_impact.udm
diff --git a/build_scripts/build.py b/build_scripts/build.py
diff --git a/build_scripts/scripts/external_libs.py b/build_scripts/scripts/external_libs.py
diff --git a/build_scripts/scripts/third_party_libs.py b/build_scripts/scripts/third_party_libs.py
diff --git a/core/client/include/pragma/c_engine.h b/core/client/include/pragma/c_engine.h
diff --git a/core/client/include/pragma/clientstate/clientstate.h b/core/client/include/pragma/clientstate/clientstate.h
diff --git a/core/client/include/pragma/game/c_game.h b/core/client/include/pragma/game/c_game.h
diff --git a/core/client/src/c_engine.cpp b/core/client/src/c_engine.cpp
diff --git a/core/client/src/debug/c_debugoverlay.cpp b/core/client/src/debug/c_debugoverlay.cpp
diff --git a/core/client/src/game/c_game_input.cpp b/core/client/src/game/c_game_input.cpp
diff --git a/core/client/src/lua/libraries/c_input.cpp b/core/client/src/lua/libraries/c_input.cpp
diff --git a/core/client/src/rendering/c_render.cpp b/core/client/src/rendering/c_render.cpp
diff --git a/core/shared/src/game/game_resources_sound_scripts.cpp b/core/shared/src/game/game_resources_sound_scripts.cpp
diff --git a/core/shared/src/lua/libraries/lanimation_lib.cpp b/core/shared/src/lua/libraries/lanimation_lib.cpp
diff --git a/core/shared/src/lua/libraries/ludm.cpp b/core/shared/src/lua/libraries/ludm.cpp
diff --git a/core/shared/src/lua/libraries/ludm2.cpp b/core/shared/src/lua/libraries/ludm2.cpp
diff --git a/core/shared/src/util/rig_config.cpp b/core/shared/src/util/rig_config.cpp
diff --git a/core/shared/src/util/util_game.cpp b/core/shared/src/util/util_game.cpp
diff --git a/tools/udm_convert/src/main.cpp b/tools/udm_convert/src/main.cpp