]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2da426d 9ce33ce)
Merge branch 'master' into 'terencehill/nades_stuff'
authorterencehill <piuntn@gmail.com>
Wed, 10 Apr 2024 23:07:17 +0000 (23:07 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 10 Apr 2024 23:07:17 +0000 (23:07 +0000)
# Conflicts:
#   qcsrc/common/mutators/mutator/nades/nades.qc

1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history
qcsrc/common/mutators/mutator/nades/nades.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
index 3ca3eb69fcd29f099d1ee0c6154440787a6c6095,e32cd20d8ab87eeb54f7fd1fff678886a9b6682b..3d3849f628d04ba2d315126c3b20359f862c59c8
--- 1/qcsrc/common/mutators/mutator/nades/nades.qc
--- 2/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@@ -37,6 -37,9 +37,7 @@@ entity Nade_TrailEffect(int proj, int n
  
      return EFFECT_Null;
  }
 -REGISTER_NET_TEMP(TE_CSQC_DARKBLINKING);
 -
+ 
  #endif
  
  #ifdef CSQC