xonotic-data.pk3dir:Mario/monster_updates: a L merge request: Fixes some issues with monsters and invasion
git-manager created issue #1937 (closed) on 2014-03-20T01:03:47Z:
Fixes some issues with monsters and invasion
Repository: xonotic/xonotic-data.pk3dir.git Commit: 8545da47 Branch: Mario/monster_updates
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '8545da470d39a8a9d15e7df35cd6ea70a6e10321'..'origin/Mario/monster_updates'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/Mario/monster_updates'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mario/monster_updates'
Diffstat:
qcsrc/common/mapinfo.qc | 3 +
qcsrc/common/mapinfo.qh | 1 +
qcsrc/common/monsters/monster/mage.qc | 7 +-
qcsrc/common/monsters/monster/shambler.qc | 7 +-
qcsrc/common/monsters/monster/spider.qc | 6 +-
qcsrc/common/monsters/monster/wyvern.qc | 6 +-
qcsrc/common/monsters/monster/zombie.qc | 10 +-
qcsrc/common/monsters/spawn.qc | 17 ++-
qcsrc/common/monsters/spawn.qh | 2 +-
qcsrc/common/monsters/sv_monsters.qc | 243 ++++++++++++++++++----------
qcsrc/common/monsters/sv_monsters.qh | 8 +-
qcsrc/server/command/cmd.qc | 5 +-
qcsrc/server/mutators/gamemode_invasion.qc | 8 +-
13 files changed, 204 insertions(+), 119 deletions(-)
Revision log:
commit 8545da470d39a8a9d15e7df35cd6ea70a6e10321
Author: Mario
Commit: Mario
Add a monsters mapinfo feature
commit 45b511affd5fed2e387493c5a908be42976d8756
Author: Mario
Commit: Mario
Fix invasion monster spawn counts, fix spawning random monsters, clean up monster spawn system to no longer abuse target_spawn_edit_entity, allow monsters to chase targets through warpzones, fix shambler stomping while in the air, add a new "invincible" spawnflag which prevents monster from taking damage, allow dragging monsters around in edit mode and fix monster count off when monster is gibbed
User agreed to the license.
Diff:
*** DIFF TOO LARGE, PLEASE CHECK YOURSELF ***