]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Cleaning a bit, some empty variable and leaving a TODO for models
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 23 Dec 2021 04:06:15 +0000 (05:06 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 23 Dec 2021 04:06:15 +0000 (05:06 +0100)
models/containers/barrel01.blend
models/containers/barrel01.iqm
models/containers/crate01.blend
models/containers/crate01.iqm
models/containers/if_isnt_loading.txt [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
qcsrc/common/gamemodes/gamemode/mh/sv_mh.qh

index d2acf3155ccf5c15b64b0093f849a733b77b0d19..243abcf809282df809536cc8a95981889b32ae16 100644 (file)
Binary files a/models/containers/barrel01.blend and b/models/containers/barrel01.blend differ
index 776d559d4fa3d1fbb0a31be3b9bd0eb7cebee3f6..32713d0e50fad709d4d952f9a6fc5b30d32bbc35 100644 (file)
Binary files a/models/containers/barrel01.iqm and b/models/containers/barrel01.iqm differ
index d77ffb477e86745a4c3c9bf80b48283a185ccef0..99228e49952c1a7f7d0a95b32602d70fba6fb462 100644 (file)
Binary files a/models/containers/crate01.blend and b/models/containers/crate01.blend differ
index 669c2e84bf66cb51a10966635afaee9ed19c12bc..becda4d82b8ca6d61ce1f4384a1ed56ac2aa3d3c 100644 (file)
Binary files a/models/containers/crate01.iqm and b/models/containers/crate01.iqm differ
diff --git a/models/containers/if_isnt_loading.txt b/models/containers/if_isnt_loading.txt
new file mode 100644 (file)
index 0000000..7387444
--- /dev/null
@@ -0,0 +1,9 @@
+if some model doesnt load, it's because Materials are called the same as the texture:
+example:
+"Main"
+
+in barrrel01 model
+
+it should be replaced to "barrel01" the same as the assigned texture
+
+More TODO for models
\ No newline at end of file
index 30550dbedef2ab5e4a82a5640cff78070733d1db..b178402e515b16d758fcb4be13b55bee5fe03e9a 100644 (file)
@@ -5,7 +5,6 @@
 .vector taggedplayervelocity;
 .vector taggedplayerviewangles;
 .float RunnerSoundTaunt_time;
-.float proptime;
 
 void MH_FakeTimeLimit(entity e, float t)
 {
@@ -97,6 +96,7 @@ MUTATOR_HOOKFUNCTION(mh, PlayerPreThink)
        else if(player.team == Team_IndexToTeam(2))
                player.mh_status = MH_STATUS_RUNNER;
        
+       // TODO: Runners using prop must select an object in the map
        if(!IS_DEAD(player) && player.team == Team_IndexToTeam(2))
                traceline_antilag(
                        player, 
index ea3847ff8f02b6ed42516689e3845df3c5817c49..0c35a89909788c272070ab06f24e1b085f91f913 100644 (file)
@@ -50,7 +50,7 @@ Sound SND_RUNNER_TAUNT_RANDOM() {
 MODEL(RUNNER_PROP1, "models/containers/barrel01.iqm");
 MODEL(RUNNER_PROP2, "models/containers/crate01.iqm");
 Model MDL_RUNNER_PROP_RANDOM() {
-    return REGISTRY_GET(Sounds, MDL_RUNNER_PROP1.m_id + floor(prandom() * 2));
+    return REGISTRY_GET(Models, MDL_RUNNER_PROP1.m_id + floor(prandom() * 2));
 }
 
 bool MH_CheckTeams();