projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da22c67
858873d
)
Merge branch 'Mario/weaponentities' into 'master'
author
Mario <zacjardine@y7mail.com>
Sun, 14 Aug 2016 02:31:49 +0000
(
02:31
+0000)
committer
Mario <zacjardine@y7mail.com>
Sun, 14 Aug 2016 02:31:49 +0000
(
02:31
+0000)
Merge branch Mario/weaponentities (XL merge request)
Purges most checks like weaponentities[0], allowing for potentially multiple weapon entities.
See merge request !347
1
2
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/monsters/sv_monsters.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/mutators/mutator/nades/nades.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon.qh
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/weapons/weapon/porto.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/bot/default/scripting.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/weapons/selection.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/sv_monsters.qc
Simple merge
diff --cc
qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
diff --cc
qcsrc/common/weapons/weapon.qh
Simple merge
diff --cc
qcsrc/common/weapons/weapon/porto.qc
Simple merge
diff --cc
qcsrc/server/bot/default/scripting.qc
Simple merge
diff --cc
qcsrc/server/weapons/selection.qc
Simple merge
diff --cc
qcsrc/server/weapons/weaponsystem.qc
Simple merge