projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e813f6
36a3cd7
)
Merge branch 'Mario/intrusive' into 'master'
author
TimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:35:07 +0000
(06:35 +0000)
committer
TimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:35:07 +0000
(06:35 +0000)
Merge branch Mario/intrusive (L merge request)
Moves a few more entities to the new intrusive list system, further improving performance.
See merge request !344
26 files changed:
1
2
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/monsters/monster/mage.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/monsters/monster/spider.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/monsters/monster/wyvern.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/mutators/mutator/nades/nades.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/mutators/mutator/overkill/rpc.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/turrets/sv_turrets.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/turrets/turret/walker.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/vehicles/sv_vehicles.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/vehicles/vehicle/raptor.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/blaster.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/crylink.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/devastator.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/electro.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/fireball.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/hagar.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/hlac.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/hook.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/minelayer.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/mortar.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/porto.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/seeker.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/vaporizer.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/g_hook.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_assault.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/weapons/weaponsystem.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge
diff --cc
qcsrc/common/monsters/monster/mage.qc
Simple merge
diff --cc
qcsrc/common/monsters/monster/spider.qc
Simple merge
diff --cc
qcsrc/common/monsters/monster/wyvern.qc
Simple merge
diff --cc
qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
diff --cc
qcsrc/common/mutators/mutator/overkill/rpc.qc
Simple merge
diff --cc
qcsrc/common/turrets/sv_turrets.qc
Simple merge
diff --cc
qcsrc/common/turrets/turret/walker.qc
Simple merge
diff --cc
qcsrc/common/vehicles/sv_vehicles.qc
Simple merge
diff --cc
qcsrc/common/vehicles/vehicle/raptor.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/blaster.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/crylink.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/devastator.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/electro.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/fireball.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/hagar.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/hlac.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/hook.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/minelayer.qc
index b4b38031fc80deda3690cbac489c2dc21e13a94f,70925b8352f8527f1208b8a11747fff9e19940fe..e5ba64f2464068102c2b5f568087c739eca3836c
---
1
/
qcsrc/common/weapons/weapon/minelayer.qc
---
2
/
qcsrc/common/weapons/weapon/minelayer.qc
+++ b/
qcsrc/common/weapons/weapon/minelayer.qc
@@@
-101,8
-102,9
+102,9
@@@
void W_MineLayer_Stick(entity this, ent
newmine.nextthink = time;
newmine.cnt = this.cnt;
newmine.flags = this.flags;
+ IL_PUSH(g_projectiles, newmine);
-
remov
e(this);
+
delet
e(this);
if(to)
SetMovetypeFollow(newmine, to);
diff --cc
qcsrc/common/weapons/weapon/mortar.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/porto.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/seeker.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon/vaporizer.qc
Simple merge
diff --cc
qcsrc/server/g_hook.qc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge
diff --cc
qcsrc/server/weapons/weaponsystem.qc
Simple merge