Merge branch 'master' into Mirio/balance
authorMirio <opivy@hotmail.de>
Sat, 30 Apr 2016 10:23:24 +0000 (12:23 +0200)
committerMirio <opivy@hotmail.de>
Sat, 30 Apr 2016 10:23:24 +0000 (12:23 +0200)
1127 files changed:
.gitattributes
.gitignore
.gitlab-ci.yml
CMakeLists.txt [new file with mode: 0644]
_hud_common.cfg
_hud_descriptions.cfg
bal-wep-nexuiz25.cfg
bal-wep-overkill.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
bal-wep-xpm.cfg
cmake/CMakeASMCompiler.cmake.in [new file with mode: 0644]
cmake/CMakeASMInformation.cmake [new file with mode: 0644]
cmake/CMakeDetermineASMCompiler.cmake [new file with mode: 0644]
cmake/CMakeTestASMCompiler.cmake [new file with mode: 0644]
cmake/qcc.sh [new file with mode: 0755]
defaultXonotic.cfg
gamemodes.cfg
gfx/crosshair55.tga
gfx/crosshair56.tga
gfx/crosshair57.tga
gfx/crosshair58.tga
gfx/crosshair59.tga
gfx/crosshair60.tga
gfx/crosshair61.tga
gfx/crosshair62.tga
gfx/crosshair63.tga
gfx/crosshair64.tga
gfx/crosshair65.tga
gfx/crosshair66.tga
gfx/hud/default/buff_ammo.tga
gfx/hud/default/buff_bash.tga
gfx/hud/default/buff_blessed.tga
gfx/hud/default/buff_disability.tga
gfx/hud/default/buff_flight.tga
gfx/hud/default/buff_inferno.tga
gfx/hud/default/buff_invisible.tga
gfx/hud/default/buff_jump.tga
gfx/hud/default/buff_luck.tga
gfx/hud/default/buff_magnet.tga
gfx/hud/default/buff_medic.tga
gfx/hud/default/buff_resistance.tga
gfx/hud/default/buff_speed.tga
gfx/hud/default/buff_swapper.tga
gfx/hud/default/buff_vampire.tga
gfx/hud/default/buff_vengeance.tga
gfx/hud/luma/buff_ammo.tga
gfx/hud/luma/buff_bash.tga
gfx/hud/luma/buff_blessed.tga
gfx/hud/luma/buff_disability.tga
gfx/hud/luma/buff_flight.tga
gfx/hud/luma/buff_inferno.tga
gfx/hud/luma/buff_invisible.tga
gfx/hud/luma/buff_jump.tga
gfx/hud/luma/buff_luck.tga
gfx/hud/luma/buff_magnet.tga
gfx/hud/luma/buff_medic.tga
gfx/hud/luma/buff_resistance.tga
gfx/hud/luma/buff_speed.tga
gfx/hud/luma/buff_swapper.tga
gfx/hud/luma/buff_vampire.tga
gfx/hud/luma/buff_vengeance.tga
gfx/menu/luma/background.tga
gfx/menu/luma/background.txt [new file with mode: 0644]
gfx/menu/luma/gametype_as.tga
gfx/menu/luma/gametype_ca.tga
gfx/menu/luma/gametype_ctf.tga
gfx/menu/luma/gametype_cts.tga
gfx/menu/luma/gametype_dm.tga
gfx/menu/luma/gametype_dom.tga
gfx/menu/luma/gametype_duel.tga
gfx/menu/luma/gametype_ft.tga
gfx/menu/luma/gametype_inf.tga
gfx/menu/luma/gametype_inv.tga
gfx/menu/luma/gametype_jb.tga
gfx/menu/luma/gametype_ka.tga
gfx/menu/luma/gametype_kh.tga
gfx/menu/luma/gametype_lms.tga
gfx/menu/luma/gametype_nb.tga
gfx/menu/luma/gametype_ons.tga
gfx/menu/luma/gametype_rc.tga
gfx/menu/luma/gametype_tdm.tga
gfx/menu/luma/gametype_vip.tga
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
models/relics/sign_luck.tga
models/relics/sign_luck_glow.tga
mutators.cfg
notifications.cfg
qcsrc/.gitignore
qcsrc/Doxyfile
qcsrc/Makefile
qcsrc/autocvarize-update.sh [deleted file]
qcsrc/autocvarize.pl [deleted file]
qcsrc/client/_all.qh
qcsrc/client/_mod.inc [new file with mode: 0644]
qcsrc/client/_mod.qh [new file with mode: 0644]
qcsrc/client/announcer.qc
qcsrc/client/announcer.qh
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qh
qcsrc/client/commands/_mod.inc [new file with mode: 0644]
qcsrc/client/commands/_mod.qh [new file with mode: 0644]
qcsrc/client/commands/all.qc
qcsrc/client/commands/all.qh
qcsrc/client/commands/cl_cmd.qc
qcsrc/client/commands/cl_cmd.qh
qcsrc/client/credit.txt [deleted file]
qcsrc/client/csqc_constants.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/csqcmodel_hooks.qh [new file with mode: 0644]
qcsrc/client/defs.qh
qcsrc/client/hud/_mod.inc [new file with mode: 0644]
qcsrc/client/hud/_mod.qh [new file with mode: 0644]
qcsrc/client/hud/all.qc [deleted file]
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/hud_config.qc
qcsrc/client/hud/hud_config.qh
qcsrc/client/hud/panel.qh [new file with mode: 0644]
qcsrc/client/hud/panel/_mod.inc [new file with mode: 0644]
qcsrc/client/hud/panel/_mod.qh [new file with mode: 0644]
qcsrc/client/hud/panel/ammo.qc
qcsrc/client/hud/panel/ammo.qh [new file with mode: 0644]
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/centerprint.qh [new file with mode: 0644]
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/chat.qh [new file with mode: 0644]
qcsrc/client/hud/panel/engineinfo.qc
qcsrc/client/hud/panel/engineinfo.qh [new file with mode: 0644]
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/client/hud/panel/healtharmor.qh [new file with mode: 0644]
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/infomessages.qh [new file with mode: 0644]
qcsrc/client/hud/panel/minigame.qc
qcsrc/client/hud/panel/minigame.qh [new file with mode: 0644]
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/hud/panel/modicons.qh [new file with mode: 0644]
qcsrc/client/hud/panel/notify.qc
qcsrc/client/hud/panel/notify.qh [new file with mode: 0644]
qcsrc/client/hud/panel/physics.qc
qcsrc/client/hud/panel/physics.qh [new file with mode: 0644]
qcsrc/client/hud/panel/powerups.qc
qcsrc/client/hud/panel/powerups.qh [new file with mode: 0644]
qcsrc/client/hud/panel/pressedkeys.qc
qcsrc/client/hud/panel/pressedkeys.qh [new file with mode: 0644]
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/quickmenu.qh [new file with mode: 0644]
qcsrc/client/hud/panel/racetimer.qc
qcsrc/client/hud/panel/racetimer.qh [new file with mode: 0644]
qcsrc/client/hud/panel/radar.qc
qcsrc/client/hud/panel/radar.qh [new file with mode: 0644]
qcsrc/client/hud/panel/score.qc
qcsrc/client/hud/panel/score.qh [new file with mode: 0644]
qcsrc/client/hud/panel/timer.qc
qcsrc/client/hud/panel/timer.qh [new file with mode: 0644]
qcsrc/client/hud/panel/vote.qc
qcsrc/client/hud/panel/vote.qh [new file with mode: 0644]
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/hud/panel/weapons.qh [new file with mode: 0644]
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/mapvoting.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/miscfunctions.qh
qcsrc/client/mutators/_mod.inc [new file with mode: 0644]
qcsrc/client/mutators/_mod.qh [new file with mode: 0644]
qcsrc/client/mutators/events.qh
qcsrc/client/player_skeleton.qc
qcsrc/client/player_skeleton.qh
qcsrc/client/progs.inc
qcsrc/client/quickmenu.qc [deleted file]
qcsrc/client/quickmenu.qh [deleted file]
qcsrc/client/scoreboard.qc
qcsrc/client/scoreboard.qh
qcsrc/client/shownames.qc
qcsrc/client/shownames.qh
qcsrc/client/teamradar.qc
qcsrc/client/teamradar.qh
qcsrc/client/view.qc
qcsrc/client/view.qh [new file with mode: 0644]
qcsrc/client/wall.qh
qcsrc/client/weapons/_mod.inc [new file with mode: 0644]
qcsrc/client/weapons/_mod.qh [new file with mode: 0644]
qcsrc/client/weapons/projectile.qc
qcsrc/client/weapons/projectile.qh
qcsrc/common/_all.inc
qcsrc/common/_mod.inc [new file with mode: 0644]
qcsrc/common/_mod.qh [new file with mode: 0644]
qcsrc/common/animdecide.qc
qcsrc/common/command/_mod.inc [new file with mode: 0644]
qcsrc/common/command/_mod.qh [new file with mode: 0644]
qcsrc/common/command/all.qh
qcsrc/common/command/command.qh
qcsrc/common/command/generic.qc
qcsrc/common/command/generic.qh
qcsrc/common/command/rpn.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/deathtypes/_mod.inc [new file with mode: 0644]
qcsrc/common/deathtypes/_mod.qh [new file with mode: 0644]
qcsrc/common/deathtypes/all.inc
qcsrc/common/deathtypes/all.qh
qcsrc/common/debug.qh
qcsrc/common/effects/_mod.inc [new file with mode: 0644]
qcsrc/common/effects/_mod.qh [new file with mode: 0644]
qcsrc/common/effects/all.qc
qcsrc/common/effects/effectinfo.qc
qcsrc/common/effects/qc/_mod.inc [new file with mode: 0644]
qcsrc/common/effects/qc/_mod.qh [new file with mode: 0644]
qcsrc/common/effects/qc/casings.qc
qcsrc/common/effects/qc/damageeffects.qc
qcsrc/common/effects/qc/gibs.qc
qcsrc/common/effects/qc/gibs.qh [new file with mode: 0644]
qcsrc/common/effects/qc/globalsound.qc
qcsrc/common/effects/qc/globalsound.qh
qcsrc/common/effects/qc/lightningarc.qc
qcsrc/common/effects/qc/lightningarc.qh [new file with mode: 0644]
qcsrc/common/effects/qc/modeleffects.qc
qcsrc/common/effects/qc/modeleffects.qh [new file with mode: 0644]
qcsrc/common/effects/qc/rubble.qh
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/_mod.inc [new file with mode: 0644]
qcsrc/common/gamemodes/_mod.qh [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/_mod.inc [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/_mod.qh [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/nexball/_mod.inc [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/nexball/_mod.qh [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/_mod.inc [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/onslaught/_mod.qh [new file with mode: 0644]
qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/common/impulses/_mod.inc [new file with mode: 0644]
qcsrc/common/impulses/_mod.qh [new file with mode: 0644]
qcsrc/common/impulses/all.qh
qcsrc/common/items/_mod.inc [new file with mode: 0644]
qcsrc/common/items/_mod.qh [new file with mode: 0644]
qcsrc/common/items/all.inc [deleted file]
qcsrc/common/items/all.qc
qcsrc/common/items/all.qh
qcsrc/common/items/inventory.qh
qcsrc/common/items/item.qh
qcsrc/common/items/item/_mod.inc [new file with mode: 0644]
qcsrc/common/items/item/_mod.qh [new file with mode: 0644]
qcsrc/common/items/item/pickup.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/minigames/_mod.inc [new file with mode: 0644]
qcsrc/common/minigames/_mod.qh [new file with mode: 0644]
qcsrc/common/minigames/cl_minigames.qc
qcsrc/common/minigames/cl_minigames.qh
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/minigames/minigame/_mod.inc [new file with mode: 0644]
qcsrc/common/minigames/minigame/_mod.qh [new file with mode: 0644]
qcsrc/common/minigames/minigame/all.qh
qcsrc/common/minigames/minigame/snake.qc
qcsrc/common/minigames/minigames.qc
qcsrc/common/minigames/sv_minigames.qc
qcsrc/common/minigames/sv_minigames.qh
qcsrc/common/models/_mod.inc [new file with mode: 0644]
qcsrc/common/models/_mod.qh [new file with mode: 0644]
qcsrc/common/models/all.qh
qcsrc/common/models/model.qh
qcsrc/common/monsters/_mod.inc [new file with mode: 0644]
qcsrc/common/monsters/_mod.qh [new file with mode: 0644]
qcsrc/common/monsters/all.inc [deleted file]
qcsrc/common/monsters/all.qc
qcsrc/common/monsters/all.qh
qcsrc/common/monsters/monster.qh
qcsrc/common/monsters/monster/_mod.inc [new file with mode: 0644]
qcsrc/common/monsters/monster/_mod.qh [new file with mode: 0644]
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/monster/zombie.qc
qcsrc/common/monsters/spawn.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/mutators/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/base.qh
qcsrc/common/mutators/mutator/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/bloodloss/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/bloodloss/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/bloodloss/bloodloss.qc
qcsrc/common/mutators/mutator/breakablehook/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/breakablehook/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/buffs/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/buffs/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/buffs/all.qh
qcsrc/common/mutators/mutator/buffs/buffs.qc
qcsrc/common/mutators/mutator/bugrigs/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/bugrigs/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
qcsrc/common/mutators/mutator/campcheck/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/campcheck/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/campcheck/campcheck.qc
qcsrc/common/mutators/mutator/cloaked/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/cloaked/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/damagetext/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/damagetext/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/damagetext/damagetext.qc
qcsrc/common/mutators/mutator/dodging/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/dodging/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/dodging/dodging.qc
qcsrc/common/mutators/mutator/doublejump/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/doublejump/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/doublejump/doublejump.qc
qcsrc/common/mutators/mutator/hook/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/hook/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/hook/hook.qc
qcsrc/common/mutators/mutator/instagib/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/instagib/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/instagib/instagib.qc
qcsrc/common/mutators/mutator/instagib/items.qc
qcsrc/common/mutators/mutator/invincibleproj/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/invincibleproj/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/itemstime.qc
qcsrc/common/mutators/mutator/melee_only/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/melee_only/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/midair/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/midair/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/midair/midair.qc
qcsrc/common/mutators/mutator/multijump/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/multijump/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/multijump/multijump.qc
qcsrc/common/mutators/mutator/nades/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/nades/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/new_toys/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/new_toys/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/nix/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/nix/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/nix/nix.qc
qcsrc/common/mutators/mutator/overkill/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/overkill/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/overkill/hmg.qc
qcsrc/common/mutators/mutator/overkill/overkill.qc
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/mutators/mutator/physical_items/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/physical_items/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/physical_items/physical_items.qc
qcsrc/common/mutators/mutator/pinata/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/pinata/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/random_gravity/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/random_gravity/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/rocketflying/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/rocketflying/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/rocketminsta/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/rocketminsta/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/running_guns/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/running_guns/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/sandbox/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/sandbox/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/sandbox/sandbox.qc
qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
qcsrc/common/mutators/mutator/superspec/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/superspec/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/superspec/superspec.qc
qcsrc/common/mutators/mutator/touchexplode/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/touchexplode/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/vampire/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/vampire/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/vampirehook/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/vampirehook/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/waypoints/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/waypoints/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/waypoints/all.qh
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/mutators/mutator/weaponarena_random/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/weaponarena_random/_mod.qh [new file with mode: 0644]
qcsrc/common/net_notice.qc
qcsrc/common/notifications.inc [deleted file]
qcsrc/common/notifications.qc [deleted file]
qcsrc/common/notifications.qh [deleted file]
qcsrc/common/notifications/_mod.inc [new file with mode: 0644]
qcsrc/common/notifications/_mod.qh [new file with mode: 0644]
qcsrc/common/notifications/all.inc [new file with mode: 0644]
qcsrc/common/notifications/all.qc [new file with mode: 0644]
qcsrc/common/notifications/all.qh [new file with mode: 0644]
qcsrc/common/physics/_mod.inc [new file with mode: 0644]
qcsrc/common/physics/_mod.qh [new file with mode: 0644]
qcsrc/common/physics/movelib.qc
qcsrc/common/physics/movelib.qh
qcsrc/common/physics/movetypes/_mod.inc [new file with mode: 0644]
qcsrc/common/physics/movetypes/_mod.qh [new file with mode: 0644]
qcsrc/common/physics/movetypes/movetypes.qc
qcsrc/common/physics/movetypes/movetypes.qh
qcsrc/common/physics/movetypes/push.qc
qcsrc/common/physics/player.qc
qcsrc/common/physics/player.qh
qcsrc/common/playerstats.qc
qcsrc/common/sounds/_mod.inc [new file with mode: 0644]
qcsrc/common/sounds/_mod.qh [new file with mode: 0644]
qcsrc/common/sounds/all.qc
qcsrc/common/sounds/all.qh
qcsrc/common/sounds/sound.qh
qcsrc/common/state.qc [new file with mode: 0644]
qcsrc/common/state.qh
qcsrc/common/stats.qh
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh
qcsrc/common/teams.qh
qcsrc/common/triggers/_mod.inc [new file with mode: 0644]
qcsrc/common/triggers/_mod.qh [new file with mode: 0644]
qcsrc/common/triggers/func/_mod.inc [new file with mode: 0644]
qcsrc/common/triggers/func/_mod.qh [new file with mode: 0644]
qcsrc/common/triggers/func/breakable.qc
qcsrc/common/triggers/func/button.qc
qcsrc/common/triggers/func/conveyor.qc
qcsrc/common/triggers/func/door.qc
qcsrc/common/triggers/func/door_rotating.qc
qcsrc/common/triggers/func/door_secret.qc
qcsrc/common/triggers/func/ladder.qc
qcsrc/common/triggers/func/plat.qc
qcsrc/common/triggers/func/pointparticles.qc
qcsrc/common/triggers/func/rotating.qc
qcsrc/common/triggers/func/train.qc
qcsrc/common/triggers/func/vectormamamam.qc
qcsrc/common/triggers/misc/_mod.inc [new file with mode: 0644]
qcsrc/common/triggers/misc/_mod.qh [new file with mode: 0644]
qcsrc/common/triggers/misc/follow.qc
qcsrc/common/triggers/misc/laser.qc
qcsrc/common/triggers/misc/teleport_dest.qc
qcsrc/common/triggers/platforms.qc
qcsrc/common/triggers/platforms.qh
qcsrc/common/triggers/subs.qc
qcsrc/common/triggers/subs.qh
qcsrc/common/triggers/target/_mod.inc [new file with mode: 0644]
qcsrc/common/triggers/target/_mod.qh [new file with mode: 0644]
qcsrc/common/triggers/target/changelevel.qc
qcsrc/common/triggers/target/location.qc
qcsrc/common/triggers/target/music.qc
qcsrc/common/triggers/target/spawn.qc
qcsrc/common/triggers/target/speaker.qc
qcsrc/common/triggers/target/voicescript.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/teleporters.qh
qcsrc/common/triggers/trigger/_mod.inc [new file with mode: 0644]
qcsrc/common/triggers/trigger/_mod.qh [new file with mode: 0644]
qcsrc/common/triggers/trigger/counter.qc
qcsrc/common/triggers/trigger/delay.qc
qcsrc/common/triggers/trigger/disablerelay.qc
qcsrc/common/triggers/trigger/flipflop.qc
qcsrc/common/triggers/trigger/gamestart.qc
qcsrc/common/triggers/trigger/gravity.qc
qcsrc/common/triggers/trigger/hurt.qc
qcsrc/common/triggers/trigger/impulse.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/jumppads.qh
qcsrc/common/triggers/trigger/keylock.qc
qcsrc/common/triggers/trigger/magicear.qc
qcsrc/common/triggers/trigger/monoflop.qc
qcsrc/common/triggers/trigger/multi.qc
qcsrc/common/triggers/trigger/multivibrator.qc
qcsrc/common/triggers/trigger/relay_activators.qc
qcsrc/common/triggers/trigger/relay_if.qc
qcsrc/common/triggers/trigger/relay_teamcheck.qc
qcsrc/common/triggers/trigger/secret.qc
qcsrc/common/triggers/trigger/teleport.qc
qcsrc/common/triggers/trigger/viewloc.qc
qcsrc/common/triggers/triggers.qc
qcsrc/common/turrets/_mod.inc [new file with mode: 0644]
qcsrc/common/turrets/_mod.qh [new file with mode: 0644]
qcsrc/common/turrets/all.inc [deleted file]
qcsrc/common/turrets/all.qc
qcsrc/common/turrets/all.qh
qcsrc/common/turrets/config.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/sv_turrets.qh
qcsrc/common/turrets/turret.qh
qcsrc/common/turrets/turret/_mod.inc [new file with mode: 0644]
qcsrc/common/turrets/turret/_mod.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/ewheel.qc
qcsrc/common/turrets/turret/ewheel_weapon.qc
qcsrc/common/turrets/turret/ewheel_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/flac.qc
qcsrc/common/turrets/turret/flac_weapon.qc
qcsrc/common/turrets/turret/flac_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/fusionreactor.qc
qcsrc/common/turrets/turret/hellion.qc
qcsrc/common/turrets/turret/hellion_weapon.qc
qcsrc/common/turrets/turret/hellion_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/hk.qc
qcsrc/common/turrets/turret/hk_weapon.qc
qcsrc/common/turrets/turret/hk_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/machinegun.qc
qcsrc/common/turrets/turret/machinegun_weapon.qc
qcsrc/common/turrets/turret/machinegun_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/mlrs.qc
qcsrc/common/turrets/turret/mlrs_weapon.qc
qcsrc/common/turrets/turret/mlrs_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/phaser.qc
qcsrc/common/turrets/turret/phaser_weapon.qc
qcsrc/common/turrets/turret/phaser_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/plasma.qc
qcsrc/common/turrets/turret/plasma_dual.qc
qcsrc/common/turrets/turret/plasma_weapon.qc
qcsrc/common/turrets/turret/plasma_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/tesla.qc
qcsrc/common/turrets/turret/tesla_weapon.qc
qcsrc/common/turrets/turret/tesla_weapon.qh [new file with mode: 0644]
qcsrc/common/turrets/turret/walker.qc
qcsrc/common/turrets/turret/walker_weapon.qc
qcsrc/common/turrets/turret/walker_weapon.qh [new file with mode: 0644]
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/vehicles/_mod.inc [new file with mode: 0644]
qcsrc/common/vehicles/_mod.qh [new file with mode: 0644]
qcsrc/common/vehicles/all.inc [deleted file]
qcsrc/common/vehicles/all.qc
qcsrc/common/vehicles/all.qh
qcsrc/common/vehicles/cl_vehicles.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/vehicles/sv_vehicles.qh
qcsrc/common/vehicles/vehicle.qh
qcsrc/common/vehicles/vehicle/_mod.inc [new file with mode: 0644]
qcsrc/common/vehicles/vehicle/_mod.qh [new file with mode: 0644]
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/bumblebee.qh
qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
qcsrc/common/vehicles/vehicle/bumblebee_weapons.qh [new file with mode: 0644]
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/racer_weapon.qc
qcsrc/common/vehicles/vehicle/racer_weapon.qh [new file with mode: 0644]
qcsrc/common/vehicles/vehicle/raptor.qc
qcsrc/common/vehicles/vehicle/raptor_weapons.qc
qcsrc/common/vehicles/vehicle/raptor_weapons.qh [new file with mode: 0644]
qcsrc/common/vehicles/vehicle/spiderbot.qc
qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
qcsrc/common/vehicles/vehicle/spiderbot_weapons.qh [new file with mode: 0644]
qcsrc/common/viewloc.qc
qcsrc/common/weapons/_mod.inc [new file with mode: 0644]
qcsrc/common/weapons/_mod.qh [new file with mode: 0644]
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/calculations.qc
qcsrc/common/weapons/config.qc
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/_mod.inc [new file with mode: 0644]
qcsrc/common/weapons/weapon/_mod.qh [new file with mode: 0644]
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/blaster.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/common/weapons/weapon/hlac.qc
qcsrc/common/weapons/weapon/hook.qc
qcsrc/common/weapons/weapon/machinegun.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/mortar.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/common/weapons/weapon/rifle.qc
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/shockwave.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/tuba.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/dpdefs/doc.md
qcsrc/dpdefs/progsdefs.qh
qcsrc/lib/_all.inc
qcsrc/lib/_mod.inc [new file with mode: 0644]
qcsrc/lib/_mod.qh [new file with mode: 0644]
qcsrc/lib/accumulate.qh
qcsrc/lib/arraylist.qh
qcsrc/lib/bool.qh
qcsrc/lib/compiler.qh
qcsrc/lib/csqcmodel/_mod.inc [new file with mode: 0644]
qcsrc/lib/csqcmodel/_mod.qh [new file with mode: 0644]
qcsrc/lib/csqcmodel/cl_model.qc
qcsrc/lib/csqcmodel/cl_player.qc
qcsrc/lib/csqcmodel/sv_model.qc
qcsrc/lib/defer.qh
qcsrc/lib/enumclass.qh
qcsrc/lib/iter.qh
qcsrc/lib/json.qc [new file with mode: 0644]
qcsrc/lib/linkedlist.qh
qcsrc/lib/log.qh
qcsrc/lib/map.qh
qcsrc/lib/matrix/_mod.inc [new file with mode: 0644]
qcsrc/lib/matrix/_mod.qh [new file with mode: 0644]
qcsrc/lib/matrix/command.qc [new file with mode: 0644]
qcsrc/lib/matrix/command.qh [new file with mode: 0644]
qcsrc/lib/matrix/matrix.qc [new file with mode: 0644]
qcsrc/lib/matrix/matrix.qh [new file with mode: 0644]
qcsrc/lib/net.qh
qcsrc/lib/oo.qh
qcsrc/lib/registry.qh
qcsrc/lib/replicate.qh
qcsrc/lib/self.qh
qcsrc/lib/sort.qh
qcsrc/lib/sortlist.qc
qcsrc/lib/spawnfunc.qh
qcsrc/lib/stats.qh
qcsrc/lib/string.qh
qcsrc/lib/test.qc
qcsrc/lib/test.qh
qcsrc/lib/unsafe.qh
qcsrc/lib/urllib.qc
qcsrc/lib/urllib.qh
qcsrc/lib/vector.qh
qcsrc/lib/warpzone/_mod.inc [new file with mode: 0644]
qcsrc/lib/warpzone/_mod.qh [new file with mode: 0644]
qcsrc/lib/warpzone/client.qc
qcsrc/lib/warpzone/common.qc
qcsrc/lib/warpzone/common.qh
qcsrc/lib/warpzone/server.qc
qcsrc/lib/warpzone/server.qh
qcsrc/lib/warpzone/util_server.qc
qcsrc/menu/_all.qh
qcsrc/menu/_mod.inc [new file with mode: 0644]
qcsrc/menu/_mod.qh [new file with mode: 0644]
qcsrc/menu/anim/_mod.inc [new file with mode: 0644]
qcsrc/menu/anim/_mod.qh [new file with mode: 0644]
qcsrc/menu/anim/animation.qc
qcsrc/menu/anim/animation.qh [new file with mode: 0644]
qcsrc/menu/anim/animhost.qc
qcsrc/menu/anim/animhost.qh [new file with mode: 0644]
qcsrc/menu/anim/easing.qc
qcsrc/menu/anim/easing.qh [new file with mode: 0644]
qcsrc/menu/anim/keyframe.qc
qcsrc/menu/anim/keyframe.qh [new file with mode: 0644]
qcsrc/menu/classes.inc
qcsrc/menu/classes.qc [deleted file]
qcsrc/menu/command/_mod.inc [new file with mode: 0644]
qcsrc/menu/command/_mod.qh [new file with mode: 0644]
qcsrc/menu/command/all.qc
qcsrc/menu/command/all.qh [deleted file]
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/command/menu_cmd.qh
qcsrc/menu/draw.qh
qcsrc/menu/gamesettings.qh
qcsrc/menu/item.qc
qcsrc/menu/item.qh [new file with mode: 0644]
qcsrc/menu/item/_mod.inc [new file with mode: 0644]
qcsrc/menu/item/_mod.qh [new file with mode: 0644]
qcsrc/menu/item/borderimage.qc
qcsrc/menu/item/borderimage.qh [new file with mode: 0644]
qcsrc/menu/item/button.qc
qcsrc/menu/item/button.qh [new file with mode: 0644]
qcsrc/menu/item/checkbox.qc
qcsrc/menu/item/checkbox.qh [new file with mode: 0644]
qcsrc/menu/item/container.qc
qcsrc/menu/item/container.qh [new file with mode: 0644]
qcsrc/menu/item/dialog.qc
qcsrc/menu/item/dialog.qh [new file with mode: 0644]
qcsrc/menu/item/image.qc
qcsrc/menu/item/image.qh [new file with mode: 0644]
qcsrc/menu/item/inputbox.qc
qcsrc/menu/item/inputbox.qh [new file with mode: 0644]
qcsrc/menu/item/inputcontainer.qc
qcsrc/menu/item/inputcontainer.qh [new file with mode: 0644]
qcsrc/menu/item/label.qc
qcsrc/menu/item/label.qh [new file with mode: 0644]
qcsrc/menu/item/listbox.qc
qcsrc/menu/item/listbox.qh [new file with mode: 0644]
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/item/modalcontroller.qh [new file with mode: 0644]
qcsrc/menu/item/nexposee.qc
qcsrc/menu/item/nexposee.qh [new file with mode: 0644]
qcsrc/menu/item/radiobutton.qc
qcsrc/menu/item/radiobutton.qh [new file with mode: 0644]
qcsrc/menu/item/slider.qc
qcsrc/menu/item/slider.qh [new file with mode: 0644]
qcsrc/menu/item/tab.qc
qcsrc/menu/item/tab.qh [new file with mode: 0644]
qcsrc/menu/item/textslider.qc
qcsrc/menu/item/textslider.qh [new file with mode: 0644]
qcsrc/menu/matrix.qc [new file with mode: 0644]
qcsrc/menu/menu.qc
qcsrc/menu/menu.qh
qcsrc/menu/mutators/_mod.inc [new file with mode: 0644]
qcsrc/menu/mutators/_mod.qh [new file with mode: 0644]
qcsrc/menu/mutators/events.qh
qcsrc/menu/progs.inc
qcsrc/menu/skin.qh
qcsrc/menu/xonotic/_mod.inc [new file with mode: 0644]
qcsrc/menu/xonotic/_mod.qh [new file with mode: 0644]
qcsrc/menu/xonotic/bigbutton.qc
qcsrc/menu/xonotic/bigbutton.qh [new file with mode: 0644]
qcsrc/menu/xonotic/bigcommandbutton.qc
qcsrc/menu/xonotic/bigcommandbutton.qh [new file with mode: 0644]
qcsrc/menu/xonotic/button.qc
qcsrc/menu/xonotic/button.qh [new file with mode: 0644]
qcsrc/menu/xonotic/campaign.qc
qcsrc/menu/xonotic/campaign.qh [new file with mode: 0644]
qcsrc/menu/xonotic/charmap.qc
qcsrc/menu/xonotic/charmap.qh [new file with mode: 0644]
qcsrc/menu/xonotic/checkbox.qc
qcsrc/menu/xonotic/checkbox.qh [new file with mode: 0644]
qcsrc/menu/xonotic/checkbox_slider_invalid.qc
qcsrc/menu/xonotic/checkbox_slider_invalid.qh [new file with mode: 0644]
qcsrc/menu/xonotic/checkbox_string.qc
qcsrc/menu/xonotic/checkbox_string.qh [new file with mode: 0644]
qcsrc/menu/xonotic/colorbutton.qc
qcsrc/menu/xonotic/colorbutton.qh [new file with mode: 0644]
qcsrc/menu/xonotic/colorpicker.qc
qcsrc/menu/xonotic/colorpicker.qh [new file with mode: 0644]
qcsrc/menu/xonotic/colorpicker_string.qc
qcsrc/menu/xonotic/colorpicker_string.qh [new file with mode: 0644]
qcsrc/menu/xonotic/commandbutton.qc
qcsrc/menu/xonotic/commandbutton.qh [new file with mode: 0644]
qcsrc/menu/xonotic/credits.qc
qcsrc/menu/xonotic/credits.qh [new file with mode: 0644]
qcsrc/menu/xonotic/crosshairpicker.qc
qcsrc/menu/xonotic/crosshairpicker.qh [new file with mode: 0644]
qcsrc/menu/xonotic/crosshairpreview.qc
qcsrc/menu/xonotic/crosshairpreview.qh [new file with mode: 0644]
qcsrc/menu/xonotic/cvarlist.qc
qcsrc/menu/xonotic/cvarlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/datasource.qc
qcsrc/menu/xonotic/datasource.qh [new file with mode: 0644]
qcsrc/menu/xonotic/demolist.qc
qcsrc/menu/xonotic/demolist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog.qc
qcsrc/menu/xonotic/dialog.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_credits.qc
qcsrc/menu/xonotic/dialog_credits.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_firstrun.qc
qcsrc/menu/xonotic/dialog_firstrun.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc
qcsrc/menu/xonotic/dialog_hudpanel_ammo.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_chat.qc
qcsrc/menu/xonotic/dialog_hudpanel_chat.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc
qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc
qcsrc/menu/xonotic/dialog_hudpanel_modicons.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_notification.qc
qcsrc/menu/xonotic/dialog_hudpanel_notification.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_physics.qc
qcsrc/menu/xonotic/dialog_hudpanel_physics.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc
qcsrc/menu/xonotic/dialog_hudpanel_powerups.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc
qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_radar.qc
qcsrc/menu/xonotic/dialog_hudpanel_radar.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_score.qc
qcsrc/menu/xonotic/dialog_hudpanel_score.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
qcsrc/menu/xonotic/dialog_hudpanel_timer.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_vote.qc
qcsrc/menu/xonotic/dialog_hudpanel_vote.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
qcsrc/menu/xonotic/dialog_hudpanel_weapons.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
qcsrc/menu/xonotic/dialog_hudsetup_exit.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_monstertools.qc
qcsrc/menu/xonotic/dialog_monstertools.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer.qc
qcsrc/menu/xonotic/dialog_multiplayer.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_create.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join.qc
qcsrc/menu/xonotic/dialog_multiplayer_join.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media.qc
qcsrc/menu/xonotic/dialog_multiplayer_media.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_quit.qc
qcsrc/menu/xonotic/dialog_quit.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_sandboxtools.qc
qcsrc/menu/xonotic/dialog_sandboxtools.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings.qc
qcsrc/menu/xonotic/dialog_settings.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_audio.qc
qcsrc/menu/xonotic/dialog_settings_audio.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_effects.qc
qcsrc/menu/xonotic/dialog_settings_effects.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game.qc
qcsrc/menu/xonotic/dialog_settings_game.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_hud.qc
qcsrc/menu/xonotic/dialog_settings_game_hud.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_messages.qc
qcsrc/menu/xonotic/dialog_settings_game_messages.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_model.qc
qcsrc/menu/xonotic/dialog_settings_game_model.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_view.qc
qcsrc/menu/xonotic/dialog_settings_game_view.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
qcsrc/menu/xonotic/dialog_settings_game_weapons.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_input.qc
qcsrc/menu/xonotic/dialog_settings_input.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_input_userbind.qc
qcsrc/menu/xonotic/dialog_settings_input_userbind.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_misc.qc
qcsrc/menu/xonotic/dialog_settings_misc.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc
qcsrc/menu/xonotic/dialog_settings_misc_cvars.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_misc_reset.qc
qcsrc/menu/xonotic/dialog_settings_misc_reset.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_user.qc
qcsrc/menu/xonotic/dialog_settings_user.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc
qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_settings_video.qc
qcsrc/menu/xonotic/dialog_settings_video.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_singleplayer.qc
qcsrc/menu/xonotic/dialog_singleplayer.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_singleplayer_winner.qc
qcsrc/menu/xonotic/dialog_singleplayer_winner.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_teamselect.qc
qcsrc/menu/xonotic/dialog_teamselect.qh [new file with mode: 0644]
qcsrc/menu/xonotic/gametypebutton.qc [deleted file]
qcsrc/menu/xonotic/gametypelist.qc
qcsrc/menu/xonotic/gametypelist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/hudskinlist.qc
qcsrc/menu/xonotic/hudskinlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/image.qc
qcsrc/menu/xonotic/image.qh [new file with mode: 0644]
qcsrc/menu/xonotic/inputbox.qc
qcsrc/menu/xonotic/inputbox.qh [new file with mode: 0644]
qcsrc/menu/xonotic/keybinder.qc
qcsrc/menu/xonotic/keybinder.qh [new file with mode: 0644]
qcsrc/menu/xonotic/languagelist.qc
qcsrc/menu/xonotic/languagelist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/listbox.qc
qcsrc/menu/xonotic/listbox.qh [new file with mode: 0644]
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/menu/xonotic/mainwindow.qh [new file with mode: 0644]
qcsrc/menu/xonotic/maplist.qc
qcsrc/menu/xonotic/maplist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/nexposee.qc
qcsrc/menu/xonotic/nexposee.qh [new file with mode: 0644]
qcsrc/menu/xonotic/picker.qc
qcsrc/menu/xonotic/picker.qh [new file with mode: 0644]
qcsrc/menu/xonotic/playerlist.qc
qcsrc/menu/xonotic/playerlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/playermodel.qc
qcsrc/menu/xonotic/playermodel.qh [new file with mode: 0644]
qcsrc/menu/xonotic/playlist.qc
qcsrc/menu/xonotic/playlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/radiobutton.qc
qcsrc/menu/xonotic/radiobutton.qh [new file with mode: 0644]
qcsrc/menu/xonotic/rootdialog.qc
qcsrc/menu/xonotic/rootdialog.qh [new file with mode: 0644]
qcsrc/menu/xonotic/screenshotimage.qc
qcsrc/menu/xonotic/screenshotimage.qh [new file with mode: 0644]
qcsrc/menu/xonotic/screenshotlist.qc
qcsrc/menu/xonotic/screenshotlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/serverlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/skinlist.qc
qcsrc/menu/xonotic/skinlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/slider.qc
qcsrc/menu/xonotic/slider.qh [new file with mode: 0644]
qcsrc/menu/xonotic/slider_decibels.qc
qcsrc/menu/xonotic/slider_decibels.qh [new file with mode: 0644]
qcsrc/menu/xonotic/slider_particles.qc
qcsrc/menu/xonotic/slider_particles.qh [new file with mode: 0644]
qcsrc/menu/xonotic/slider_picmip.qc
qcsrc/menu/xonotic/slider_picmip.qh [new file with mode: 0644]
qcsrc/menu/xonotic/slider_resolution.qc
qcsrc/menu/xonotic/slider_resolution.qh [new file with mode: 0644]
qcsrc/menu/xonotic/slider_sbfadetime.qc
qcsrc/menu/xonotic/slider_sbfadetime.qh [new file with mode: 0644]
qcsrc/menu/xonotic/soundlist.qc
qcsrc/menu/xonotic/soundlist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/statslist.qc
qcsrc/menu/xonotic/statslist.qh [new file with mode: 0644]
qcsrc/menu/xonotic/tab.qc
qcsrc/menu/xonotic/tab.qh [new file with mode: 0644]
qcsrc/menu/xonotic/tabcontroller.qc
qcsrc/menu/xonotic/tabcontroller.qh [new file with mode: 0644]
qcsrc/menu/xonotic/textlabel.qc
qcsrc/menu/xonotic/textlabel.qh [new file with mode: 0644]
qcsrc/menu/xonotic/textslider.qc
qcsrc/menu/xonotic/textslider.qh [new file with mode: 0644]
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
qcsrc/menu/xonotic/weaponarenacheckbox.qc
qcsrc/menu/xonotic/weaponarenacheckbox.qh [new file with mode: 0644]
qcsrc/menu/xonotic/weaponslist.qc
qcsrc/menu/xonotic/weaponslist.qh [new file with mode: 0644]
qcsrc/qcc.sh [deleted file]
qcsrc/server/_all.qh
qcsrc/server/_mod.inc [new file with mode: 0644]
qcsrc/server/_mod.qh [new file with mode: 0644]
qcsrc/server/anticheat.qc
qcsrc/server/anticheat.qh
qcsrc/server/antilag.qc
qcsrc/server/antilag.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/_all.inc [deleted file]
qcsrc/server/bot/_mod.inc [new file with mode: 0644]
qcsrc/server/bot/_mod.qh [new file with mode: 0644]
qcsrc/server/bot/aim.qc
qcsrc/server/bot/aim.qh
qcsrc/server/bot/bot.qc
qcsrc/server/bot/bot.qh
qcsrc/server/bot/havocbot/_all.inc [deleted file]
qcsrc/server/bot/havocbot/_mod.inc [new file with mode: 0644]
qcsrc/server/bot/havocbot/_mod.qh [new file with mode: 0644]
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/havocbot.qh
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/bot/havocbot/roles.qh
qcsrc/server/bot/havocbot/scripting.qh
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/navigation.qh
qcsrc/server/bot/scripting.qc
qcsrc/server/bot/scripting.qh
qcsrc/server/bot/waypoints.qc
qcsrc/server/bot/waypoints.qh
qcsrc/server/campaign.qh
qcsrc/server/cheats.qc
qcsrc/server/cheats.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_client.qh
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_impulse.qh
qcsrc/server/cl_player.qc
qcsrc/server/cl_player.qh
qcsrc/server/command/_mod.inc [new file with mode: 0644]
qcsrc/server/command/_mod.qh [new file with mode: 0644]
qcsrc/server/command/all.qc
qcsrc/server/command/all.qh
qcsrc/server/command/banning.qc
qcsrc/server/command/banning.qh
qcsrc/server/command/cmd.qc
qcsrc/server/command/cmd.qh
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/getreplies.qc
qcsrc/server/command/getreplies.qh
qcsrc/server/command/radarmap.qc
qcsrc/server/command/radarmap.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/sv_cmd.qh
qcsrc/server/command/vote.qc
qcsrc/server/command/vote.qh
qcsrc/server/constants.qh
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh
qcsrc/server/g_hook.qc
qcsrc/server/g_hook.qh
qcsrc/server/g_lights.qc
qcsrc/server/g_lights.qh [new file with mode: 0644]
qcsrc/server/g_models.qc
qcsrc/server/g_models.qh [new file with mode: 0644]
qcsrc/server/g_subs.qc
qcsrc/server/g_subs.qh
qcsrc/server/g_world.qc
qcsrc/server/g_world.qh
qcsrc/server/ipban.qc
qcsrc/server/ipban.qh
qcsrc/server/item_key.qc
qcsrc/server/item_key.qh
qcsrc/server/mapvoting.qc
qcsrc/server/mapvoting.qh
qcsrc/server/matrix.qc [new file with mode: 0644]
qcsrc/server/matrix.qh [new file with mode: 0644]
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/_mod.inc [new file with mode: 0644]
qcsrc/server/mutators/_mod.qh [new file with mode: 0644]
qcsrc/server/mutators/all.qc
qcsrc/server/mutators/all.qh
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/gamemode.qh
qcsrc/server/mutators/mutator.qh
qcsrc/server/mutators/mutator/_mod.inc [new file with mode: 0644]
qcsrc/server/mutators/mutator/_mod.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_assault.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_ca.qc
qcsrc/server/mutators/mutator/gamemode_ca.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_cts.qc
qcsrc/server/mutators/mutator/gamemode_cts.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_deathmatch.qc
qcsrc/server/mutators/mutator/gamemode_deathmatch.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_domination.qc
qcsrc/server/mutators/mutator/gamemode_domination.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_freezetag.qc
qcsrc/server/mutators/mutator/gamemode_freezetag.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_invasion.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_keepaway.qc
qcsrc/server/mutators/mutator/gamemode_keepaway.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_lms.qc
qcsrc/server/mutators/mutator/gamemode_lms.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_race.qc
qcsrc/server/mutators/mutator/gamemode_race.qh [new file with mode: 0644]
qcsrc/server/mutators/mutator/gamemode_tdm.qc
qcsrc/server/mutators/mutator/gamemode_tdm.qh [new file with mode: 0644]
qcsrc/server/pathlib/_all.inc
qcsrc/server/pathlib/_mod.inc [new file with mode: 0644]
qcsrc/server/pathlib/_mod.qh [new file with mode: 0644]
qcsrc/server/pathlib/costs.qc
qcsrc/server/pathlib/costs.qh [new file with mode: 0644]
qcsrc/server/pathlib/debug.qc
qcsrc/server/pathlib/debug.qh [new file with mode: 0644]
qcsrc/server/pathlib/expandnode.qc
qcsrc/server/pathlib/expandnode.qh [new file with mode: 0644]
qcsrc/server/pathlib/main.qc
qcsrc/server/pathlib/main.qh
qcsrc/server/pathlib/movenode.qc
qcsrc/server/pathlib/movenode.qh [new file with mode: 0644]
qcsrc/server/pathlib/path_waypoint.qc
qcsrc/server/pathlib/path_waypoint.qh [new file with mode: 0644]
qcsrc/server/pathlib/pathlib.qh
qcsrc/server/pathlib/utility.qh
qcsrc/server/playerdemo.qc
qcsrc/server/playerdemo.qh
qcsrc/server/portals.qc
qcsrc/server/portals.qh
qcsrc/server/progdefs.h [deleted file]
qcsrc/server/progs.inc
qcsrc/server/race.qc
qcsrc/server/race.qh
qcsrc/server/round_handler.qh
qcsrc/server/scores.qc
qcsrc/server/scores.qh
qcsrc/server/scores_rules.qh
qcsrc/server/spawnpoints.qc
qcsrc/server/spawnpoints.qh
qcsrc/server/steerlib.qc
qcsrc/server/steerlib.qh
qcsrc/server/sv_main.qc
qcsrc/server/sv_main.qh [new file with mode: 0644]
qcsrc/server/sys-post.qh
qcsrc/server/sys-pre.qh
qcsrc/server/t_halflife.qc
qcsrc/server/t_halflife.qh [new file with mode: 0644]
qcsrc/server/t_quake.qc
qcsrc/server/t_quake.qh [new file with mode: 0644]
qcsrc/server/t_quake3.qc
qcsrc/server/t_quake3.qh [new file with mode: 0644]
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh
qcsrc/server/tests.qc [new file with mode: 0644]
qcsrc/server/tests.qh [new file with mode: 0644]
qcsrc/server/weapons/_mod.inc [new file with mode: 0644]
qcsrc/server/weapons/_mod.qh [new file with mode: 0644]
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/accuracy.qh
qcsrc/server/weapons/common.qc
qcsrc/server/weapons/common.qh
qcsrc/server/weapons/csqcprojectile.qh
qcsrc/server/weapons/hitplot.qc
qcsrc/server/weapons/hitplot.qh
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/selection.qh
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/spawning.qh
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/throwing.qh
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/tracing.qh
qcsrc/server/weapons/weaponstats.qh
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/weapons/weaponsystem.qh
qcsrc/test/compilationunit.sh [deleted file]
qcsrc/tools/autocvarize-update.sh [new file with mode: 0755]
qcsrc/tools/autocvarize.pl [new file with mode: 0644]
qcsrc/tools/compilationunits.sh [new file with mode: 0755]
qcsrc/tools/genmod.sh [new file with mode: 0755]
qcsrc/tools/headerstyle.sh [new file with mode: 0755]
qcsrc/tools/qcc.sh [new file with mode: 0755]
qcsrc/tools/uncrusticracy.sh [new file with mode: 0644]
qcsrc/tools/uncrustify.sh [new file with mode: 0755]
qcsrc/tools/whitespace.sh [new file with mode: 0755]
qcsrc/uncrusticracy.sh [deleted file]
qcsrc/uncrustify.cfg
qcsrc/uncrustify.sh [deleted file]
qcsrc/whitespace.sh [deleted file]
serverbench.cfg
turrets.cfg
vehicle_bumblebee.cfg [deleted file]
vehicle_racer.cfg [deleted file]
vehicle_raptor.cfg [deleted file]
vehicle_spiderbot.cfg [deleted file]
vehicles.cfg [deleted file]

index bf8bf302160967d1887e0490d3d16b3d6fe1d3a1..0a63b24a2fb6e01bb1ae1d4482111d47d612a0a1 100644 (file)
@@ -1,3 +1,6 @@
+*.q[ch] linguist-language=C
+*.inc linguist-language=C
+
 * -crlf
 *.0 -diff -crlf
 *.1 crlf=input
index 6ecb3d2eb62e1c68d9602b7391a23ec2a6aa44e2..f4611af9310bd9c5c7ab12a06bf04387fd72d086 100644 (file)
@@ -1,6 +1,5 @@
-csprogs.dat
-menu.dat
-progs.dat
-*.lno
+/*.dat
+/*.lno
+
 .DS_Store
 .idea/
index 613f231ea641a29394286dc877c57edadc99401e..3cdd43f30510917818e9a8ab0b4365574d83d84d 100644 (file)
@@ -1,33 +1,30 @@
 before_script:
-  - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces
-  - cd darkplaces && make sv-debug -j $(nproc)
-  - cd ..
-  - export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic"
+  - ln -s $PWD data/xonotic-data.pk3dir
 
   - git clone --depth=1 --branch=master https://gitlab.com/xonotic/gmqcc.git gmqcc
-  - cd gmqcc && make -j $(nproc)
+  - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"
   - cd ..
-  - export QCC="$PWD/gmqcc/gmqcc"
-
-  - ln -s $PWD data/xonotic-data.pk3dir
 
-test_sv_unit:
+test_compilation_units:
   stage: test
   script:
-    - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
-    - make
-    - while read line; do
-        echo $line;
-        if [[ $line == "All tests OK" ]]; then exit 0; fi;
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)
-    - exit 1
+    - ./qcsrc/tools/compilationunits.sh
 
 test_sv_game:
   stage: test
   script:
+    - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces
+    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
+    - cd ..
+
+    - mkdir -p data/maps
     - wget -O data/g-23.pk3 http://beta.xonotic.org/autobuild-bsp/latest/g-23.pk3
+    - wget -O data/maps/g-23.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.mapinfo
+    - wget -O data/maps/g-23.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints
+    - wget -O data/maps/g-23.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints.cache
+    - wget -O data/maps/g-23.waypoints.hardwired https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/g-23.waypoints.hardwired
     - make
-    - EXPECT=f75e1bf926a9d7bfe27765f5cf8cef20
+    - EXPECT=4bd5b0276cdd100c831c73f0400eca71
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
       | tee /dev/stderr
       | grep '^:'
@@ -39,6 +36,21 @@ test_sv_game:
     - test "$HASH" == "$EXPECT"
     - exit $?
 
+test_sv_unit:
+  stage: test
+  script:
+    - git clone --depth=1 --branch=master https://gitlab.com/xonotic/darkplaces.git darkplaces
+    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
+    - cd ..
+
+    - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
+    - make
+    - while read line; do
+        echo $line;
+        if [[ $line == "All tests OK" ]]; then exit 0; fi;
+      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)
+    - exit 1
+
 doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
   stage: deploy
   script:
@@ -53,7 +65,7 @@ doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
     - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_
     - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_
     - cp -r ../public/* ~/deploy
-    - cd ~/deploy && git add -A . && git commit -m "Update" && git push origin gh-pages
+    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages
   artifacts:
     paths:
       - public
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c2b8564
--- /dev/null
@@ -0,0 +1,78 @@
+cmake_minimum_required(VERSION 2.8.11)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+project(xonotic-data LANGUAGES ASM)
+
+include_directories(qcsrc)
+
+add_definitions(-DNDEBUG=1)
+
+find_package(Git REQUIRED)
+execute_process(
+        COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=~
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_DESC
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+add_definitions(-DWATERMARK=\"${GIT_DESC}\")
+
+set_source_files_properties(
+        qcsrc/client/progs.inc
+        qcsrc/server/progs.inc
+        qcsrc/menu/progs.inc
+        PROPERTIES
+        LANGUAGE ASM
+        HEADER_FILE_ONLY FALSE
+)
+
+add_executable(csprogs qcsrc/client/progs.inc)
+target_compile_definitions(csprogs PRIVATE -DCSQC)
+add_dependencies(csprogs gmqcc)
+
+add_executable(progs qcsrc/server/progs.inc)
+target_compile_definitions(progs PRIVATE -DSVQC)
+add_dependencies(progs gmqcc)
+
+add_executable(menu qcsrc/menu/progs.inc)
+target_compile_definitions(menu PRIVATE -DMENUQC)
+add_dependencies(menu gmqcc)
+
+function(set_prelude target prelude)
+    get_target_property(MY_PROJECT_SOURCES target SOURCES)
+    foreach (source IN LISTS MY_PROJECT_SOURCES)
+        set_property(
+                SOURCE ${source}
+                APPEND PROPERTY COMPILE_FLAGS
+                "-include ${PROJECT_SOURCE_DIR}/${prelude}"
+        )
+    endforeach ()
+endfunction()
+# set_prelude(csprogs qcsrc/lib/_all.inc)
+
+function(copy prog)
+    add_custom_command(TARGET ${prog} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:${prog}>/${prog}.dat" "${prog}.dat"
+            COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:${prog}>/${prog}.lno" "${prog}.lno"
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+            VERBATIM)
+endfunction()
+copy(csprogs)
+copy(progs)
+copy(menu)
+
+function(pack prog)
+    add_custom_target(${prog}.pk3
+            DEPENDS ${prog}-${GIT_DESC}.pk3
+            )
+    add_custom_command(OUTPUT ${prog}-${GIT_DESC}.pk3
+            DEPENDS ${prog}
+            COMMAND ${CMAKE_COMMAND} -E echo "http://xonotic.org" > "${prog}-${GIT_DESC}.txt"
+            COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:${prog}>/${prog}.dat" "${prog}-${GIT_DESC}.dat"
+            COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:${prog}>/${prog}.lno" "${prog}-${GIT_DESC}.lno"
+            COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${prog}-${GIT_DESC}.pk3" --format=zip
+            "${prog}-${GIT_DESC}.txt"
+            "${prog}-${GIT_DESC}.dat"
+            "${prog}-${GIT_DESC}.lno"
+            VERBATIM
+            )
+endfunction()
+pack(csprogs)
index 70900762f7a3cb1b5da162db9fcc2e34cf986461..0fbf103d5542771a10077518df1bf40f4c55d08f 100644 (file)
@@ -20,6 +20,31 @@ seta hud_colorset_kill_3 "4" "'good' or 'beneficial' text (you fragging someone,
 seta hud_colorset_background "7" "neutral/unimportant text"
 
 // general hud panel cvars (i.e. shouldn't be adjusted by a skin config)
+seta hud_panel_weapons          1 "enable this panel"
+seta hud_panel_ammo             1 "enable this panel"
+seta hud_panel_powerups         1 "enable this panel"
+seta hud_panel_healtharmor      1 "enable this panel"
+seta hud_panel_notify           1 "enable this panel"
+seta hud_panel_timer            1 "enable this panel"
+seta hud_panel_radar            1 "enable this panel, 2 = also enable in non-teambased gamemodes"
+seta hud_panel_score            1 "enable this panel"
+seta hud_panel_racetimer        1 "enable this panel"
+seta hud_panel_vote             1 "enable this panel"
+seta hud_panel_modicons         1 "enable this panel"
+seta hud_panel_pressedkeys      1 "enable this panel, 1 = show only when spectating other players, 2 = show always"
+seta hud_panel_chat             1 "enable this panel"
+seta hud_panel_engineinfo       0 "enable this panel"
+seta hud_panel_infomessages     1 "enable this panel"
+seta hud_panel_physics          3 "enable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing"
+seta hud_panel_centerprint      1 "enable this panel"
+seta hud_panel_minigameboard    1 "enable this panel"
+seta hud_panel_minigamestatus   1 "enable this panel"
+seta hud_panel_minigamehelp     1 "enable this panel"
+seta hud_panel_minigamemenu     0 "enable this panel"
+seta hud_panel_mapvote          1 "enable this panel"
+seta hud_panel_itemstime        2 "enable this panel, 1 = show when spectating, 2 = even playing in warmup stage"
+seta hud_panel_quickmenu        1 "enable this panel"
+
 seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_cells 180 "show 100% of the status bar at this ammo count"
index 970d6ff7f3ed1c24407957f2b5ee8dac491b6e94..de46317116aec1944872f71ccf56d7626aeeed61 100644 (file)
@@ -34,7 +34,6 @@ seta hud_configure_grid "" "snap to grid when moving/resizing panels"
 seta hud_configure_grid_xsize "" "snap to X * vid_conwidth"
 seta hud_configure_grid_ysize "" "snap to Y * vid_conheight"
 
-seta hud_panel_weapons "" "enable/disable this panel"
 seta hud_panel_weapons_pos "" "position of this panel"
 seta hud_panel_weapons_size "" "size of this panel"
 seta hud_panel_weapons_bg "" "if set to something else than \"\" = override default background"
@@ -67,7 +66,6 @@ seta hud_panel_weapons_onlyowned "" "show only owned weapons"
 seta hud_panel_weapons_noncurrent_alpha "" "alpha of noncurrent weapons"
 seta hud_panel_weapons_noncurrent_scale "" "scale of noncurrent weapons, relative to the current weapon"
 
-seta hud_panel_ammo "" "enable/disable this panel"
 seta hud_panel_ammo_pos "" "position of this panel"
 seta hud_panel_ammo_size "" "size of this panel"
 seta hud_panel_ammo_onlycurrent "" "1 = show only current ammo type"
@@ -85,7 +83,6 @@ seta hud_panel_ammo_progressbar_xoffset "" "percentage of mySize_x to offset pro
 seta hud_panel_ammo_progressbar_name "" "name of progressbar to use behind ammo icons"
 seta hud_panel_ammo_text "" "show text/icons in the ammo panel"
 
-seta hud_panel_powerups "" "enable/disable this panel"
 seta hud_panel_powerups_pos "" "position of this panel"
 seta hud_panel_powerups_size "" "size of this panel"
 seta hud_panel_powerups_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align only left bar to the right, 3 = align only right bar to the right"
@@ -99,9 +96,9 @@ seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = over
 seta hud_panel_powerups_progressbar "" "enable progressbar in panel"
 seta hud_panel_powerups_text "" "show text and icons in the powerups panel"
 
-seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
 seta hud_panel_healtharmor_pos "" "position of this panel"
 seta hud_panel_healtharmor_size "" "size of this panel"
+seta hud_panel_healtharmor_combined "" "combined health/armor display"
 seta hud_panel_healtharmor_flip "" "flip health/armor positions"
 seta hud_panel_healtharmor_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align only left bar to the right, 3 = align only right bar to the right"
 seta hud_panel_healtharmor_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align only left icon to the right, 3 = align only right icon to the right"
@@ -118,7 +115,6 @@ seta hud_panel_healtharmor_progressbar_armor "" "progressbar image for armor"
 seta hud_panel_healtharmor_progressbar_gfx "" "enable graphic effects on the progressbars"
 seta hud_panel_healtharmor_progressbar_gfx_smooth "" "smooth changes of the progressbar when health/armor change at least by this amount; 0 disables the effect"
 
-seta hud_panel_notify "" "enable/disable this panel"
 seta hud_panel_notify_pos "" "position of this base of the panel"
 seta hud_panel_notify_size "" "size of this panel with all notifications on"
 seta hud_panel_notify_bg "" "if set to something else than \"\" = override default background"
@@ -133,7 +129,6 @@ seta hud_panel_notify_fadetime "" "fade out time"
 seta hud_panel_notify_time "" "time that a new entry stays until it fades out"
 seta hud_panel_notify_icon_aspect "" "aspect ratio of total drawing area per icon"
 
-seta hud_panel_timer "" "enable/disable this panel"
 seta hud_panel_timer_pos "" "position of this base of the panel"
 seta hud_panel_timer_size "" "size of this panel"
 seta hud_panel_timer_bg "" "if set to something else than \"\" = override default background"
@@ -143,7 +138,6 @@ seta hud_panel_timer_bg_alpha "" "if set to something else than \"\" = override
 seta hud_panel_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
 seta hud_panel_radar_pos "" "position of this base of the panel"
 seta hud_panel_radar_size "" "size of this panel"
 seta hud_panel_radar_bg "" "if set to something else than \"\" = override default background"
@@ -161,7 +155,6 @@ seta hud_panel_radar_maximized_size "" "size of the radar when maximized"
 seta hud_panel_radar_maximized_rotation "" "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
 seta hud_panel_radar_maximized_zoommode "" "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
 
-seta hud_panel_score "" "enable/disable this panel"
 seta hud_panel_score_pos "" "position of this base of the panel"
 seta hud_panel_score_size "" "size of this panel"
 seta hud_panel_score_bg "" "if set to something else than \"\" = override default background"
@@ -172,7 +165,6 @@ seta hud_panel_score_bg_border "" "if set to something else than \"\" = override
 seta hud_panel_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_score_rankings "" "show rankings: 1 always show my own score; 2 pure rankings"
 
-seta hud_panel_racetimer "" "enable/disable this panel"
 seta hud_panel_racetimer_pos "" "position of this base of the panel"
 seta hud_panel_racetimer_size "" "size of this panel"
 seta hud_panel_racetimer_bg "" "if set to something else than \"\" = override default background"
@@ -182,7 +174,6 @@ seta hud_panel_racetimer_bg_alpha "" "if set to something else than \"\" = overr
 seta hud_panel_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_vote "" "enable/disable this panel"
 seta hud_panel_vote_pos "" "position of this base of the panel"
 seta hud_panel_vote_size "" "size of this panel"
 seta hud_panel_vote_alreadyvoted_alpha "" "alpha of the vote dialog after you have voted"
@@ -193,7 +184,6 @@ seta hud_panel_vote_bg_alpha "" "if set to something else than \"\" = override d
 seta hud_panel_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_modicons "" "enable/disable this panel"
 seta hud_panel_modicons_pos "" "position of this base of the panel"
 seta hud_panel_modicons_size "" "size of this panel"
 seta hud_panel_modicons_bg "" "if set to something else than \"\" = override default background"
@@ -206,7 +196,6 @@ seta hud_panel_modicons_ca_layout "" "2 possible layouts: 0) number of alive pla
 seta hud_panel_modicons_dom_layout "" "3 possible layouts: 0) only icons; 1) icons and percentage of average pps (points per second); 2) icons and average pps"
 seta hud_panel_modicons_freezetag_layout "" "2 possible layouts: 0) number of alive players; 1) icons and number of alive players"
 
-seta hud_panel_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
 seta hud_panel_pressedkeys_pos "" "position of this base of the panel"
 seta hud_panel_pressedkeys_size "" "size of this panel"
 seta hud_panel_pressedkeys_bg "" "if set to something else than \"\" = override default background"
@@ -218,7 +207,6 @@ seta hud_panel_pressedkeys_bg_padding "" "if set to something else than \"\" = o
 seta hud_panel_pressedkeys_aspect "" "forced aspect on panel"
 seta hud_panel_pressedkeys_attack "" "show attack buttons too"
 
-seta hud_panel_chat "" "enable/disable this panel"
 seta hud_panel_chat_pos "" "position of this base of the panel"
 seta hud_panel_chat_size "" "size of this panel"
 seta hud_panel_chat_bg "" "if set to something else than \"\" = override default background"
@@ -228,7 +216,6 @@ seta hud_panel_chat_bg_alpha "" "if set to something else than \"\" = override d
 seta hud_panel_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_engineinfo "" "enable/disable this panel"
 seta hud_panel_engineinfo_pos "" "position of this base of the panel"
 seta hud_panel_engineinfo_size "" "size of this panel"
 seta hud_panel_engineinfo_bg "" "if set to something else than \"\" = override default background"
@@ -240,7 +227,6 @@ seta hud_panel_engineinfo_bg_padding "" "if set to something else than \"\" = ov
 seta hud_panel_engineinfo_framecounter_decimals "" "amount of decimals to show"
 seta hud_panel_engineinfo_framecounter_time "" "time between framerate display updates"
 
-seta hud_panel_infomessages "" "enable/disable this panel"
 seta hud_panel_infomessages_pos "" "position of this base of the panel"
 seta hud_panel_infomessages_size "" "size of this panel"
 seta hud_panel_infomessages_bg "" "if set to something else than \"\" = override default background"
@@ -251,7 +237,6 @@ seta hud_panel_infomessages_bg_border "" "if set to something else than \"\" = o
 seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_infomessages_flip "" "1 = align the items to the right"
 
-seta hud_panel_physics "" "enable/disable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing"
 seta hud_panel_physics_pos "" "position of this base of the panel"
 seta hud_panel_physics_size "" "size of this panel"
 seta hud_panel_physics_bg "" "if set to something else than \"\" = override default background"
@@ -276,7 +261,6 @@ seta hud_panel_physics_speed_vertical "" "include the speed on the Z-axis"
 seta hud_panel_physics_topspeed "" "also show top speed"
 seta hud_panel_physics_topspeed_time "" "how many seconds the top speed takes to fade out"
 
-seta hud_panel_centerprint "" "enable/disable this panel"
 seta hud_panel_centerprint_pos "" "position of this base of the panel"
 seta hud_panel_centerprint_size "" "size of this panel"
 seta hud_panel_centerprint_bg "" "if set to something else than \"\" = override default background"
@@ -299,7 +283,6 @@ seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "" "minimum factor t
 seta hud_panel_centerprint_fade_subsequent_minfontsize "" "minimum factor for the font size from the subsequent fading effects"
 seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading in/out effects"
 
-seta hud_panel_minigameboard "" "enable/disable this panel"
 seta hud_panel_minigameboard_pos "" "position of this panel"
 seta hud_panel_minigameboard_size "" "size of this panel"
 seta hud_panel_minigameboard_bg "" "if set to something else than \"\" = override default background"
@@ -309,7 +292,6 @@ seta hud_panel_minigameboard_bg_alpha "" "if set to something else than \"\" = o
 seta hud_panel_minigameboard_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_minigameboard_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_minigamestatus "" "enable/disable this panel"
 seta hud_panel_minigamestatus_pos "" "position of this panel"
 seta hud_panel_minigamestatus_size "" "size of this panel"
 seta hud_panel_minigamestatus_bg "" "if set to something else than \"\" = override default background"
@@ -319,7 +301,6 @@ seta hud_panel_minigamestatus_bg_alpha "" "if set to something else than \"\" =
 seta hud_panel_minigamestatus_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_minigamestatus_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_minigamehelp "" "enable/disable this panel"
 seta hud_panel_minigamehelp_pos "" "position of this panel"
 seta hud_panel_minigamehelp_size "" "size of this panel"
 seta hud_panel_minigamehelp_bg "" "if set to something else than \"\" = override default background"
@@ -329,7 +310,6 @@ seta hud_panel_minigamehelp_bg_alpha "" "if set to something else than \"\" = ov
 seta hud_panel_minigamehelp_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_minigamehelp_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_minigamemenu "" "enable/disable this panel"
 seta hud_panel_minigamemenu_pos "" "position of this panel"
 seta hud_panel_minigamemenu_size "" "size of this panel"
 seta hud_panel_minigamemenu_bg "" "if set to something else than \"\" = override default background"
@@ -339,7 +319,6 @@ seta hud_panel_minigamemenu_bg_alpha "" "if set to something else than \"\" = ov
 seta hud_panel_minigamemenu_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_minigamemenu_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_mapvote "" "enable/disable this panel"
 seta hud_panel_mapvote_pos "" "position of this panel"
 seta hud_panel_mapvote_size "" "size of this panel"
 seta hud_panel_mapvote_bg "" "if set to something else than \"\" = override default background"
@@ -349,7 +328,6 @@ seta hud_panel_mapvote_bg_alpha "" "if set to something else than \"\" = overrid
 seta hud_panel_mapvote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_mapvote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 
-seta hud_panel_itemstime "" "enable/disable this panel, it shows left time until important items (mega health, large armor, powerups, superweapons, etc...) respawn in the map: 1 when spectating, 2 even playing in warmup stage"
 seta hud_panel_itemstime_pos "" "position of this base of the panel"
 seta hud_panel_itemstime_size "" "size of this panel"
 seta hud_panel_itemstime_bg "" "if set to something else than \"\" = override default background"
@@ -366,7 +344,6 @@ seta hud_panel_itemstime_text "" "show text"
 seta hud_panel_itemstime_ratio "" "ratio between space reserved for text and icon width of each item entry (min value is 2)"
 seta hud_panel_itemstime_dynamicsize "" "allow panel size reduction by removing spacing among items"
 
-seta hud_panel_quickmenu "" "enable/disable this panel"
 seta hud_panel_quickmenu_pos "" "position of this base of the panel"
 seta hud_panel_quickmenu_size "" "size of this panel"
 seta hud_panel_quickmenu_bg "" "if set to something else than \"\" = override default background"
index bb7ab5f6780738b28e140ba39d829e2725e84206..97707a7255789ab49f96602d9b5a5373a8f673d1 100644 (file)
@@ -43,7 +43,7 @@ set g_balance_shotgun_primary_spread 0.07
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 2
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 80
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
index 626ada04eab958e36e003f4ec0f0b8fbe04f2ff9..d0cfa361d269c1aae66c89cefc2e3e660f65dd24 100644 (file)
@@ -45,7 +45,7 @@ set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_alt_animtime 0.2
 set g_balance_shotgun_secondary_alt_refire 1.2
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 70
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
index 5545c6502cf6bdd38e11c80c7ea0cc852b87241c..af2234f0d6c898c02d110d98273a46019bdb7c9d 100644 (file)
@@ -751,7 +751,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 80
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
index cf7a05f6b5b0787fc13555bdc7ce2b8b601d1acf..931a63c6a2264d068110f90817f63be68fc5ac64 100644 (file)
@@ -43,7 +43,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 80
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
index c58b5989f3c3bfc9186ba6e8122b24acf443bfb5..2d7bd9e32f95f6a2cee84c11c6870e1256f2758e 100644 (file)
@@ -43,7 +43,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 70
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
index c58b5989f3c3bfc9186ba6e8122b24acf443bfb5..2d7bd9e32f95f6a2cee84c11c6870e1256f2758e 100644 (file)
@@ -43,7 +43,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 70
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
diff --git a/cmake/CMakeASMCompiler.cmake.in b/cmake/CMakeASMCompiler.cmake.in
new file mode 100644 (file)
index 0000000..e18e9ed
--- /dev/null
@@ -0,0 +1,8 @@
+set(CMAKE_ASM_COMPILER "@CMAKE_ASM_COMPILER@")
+set(CMAKE_ASM_COMPILER_LOADED 1)
+
+set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS qc;qh;inc)
+set(CMAKE_ASM_OUTPUT_EXTENSION .o)
+set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
+set(CMAKE_ASM_LINKER_PREFERENCE 42)
+set(CMAKE_ASM_COMPILER_ENV_VAR "QCC")
diff --git a/cmake/CMakeASMInformation.cmake b/cmake/CMakeASMInformation.cmake
new file mode 100644 (file)
index 0000000..e4e7bd9
--- /dev/null
@@ -0,0 +1,14 @@
+if (${CMAKE_VERSION} VERSION_LESS "3.4")
+    set(_CMAKE_ASM_INCLUDES "")
+else()
+    set(_CMAKE_ASM_INCLUDES "<INCLUDES>")
+endif()
+mark_as_advanced(_CMAKE_ASM_INCLUDES)
+
+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> compile <OBJECT> <DEFINES> -DGMQCC ${_CMAKE_ASM_INCLUDES} <FLAGS> <SOURCE>")
+set(CMAKE_ASM_LINK_EXECUTABLE "env CMAKE_EXECUTABLE_SUFFIX=${CMAKE_EXECUTABLE_SUFFIX} <CMAKE_ASM_COMPILER> link <OBJECTS> -o <TARGET>")
+
+set(CMAKE_INCLUDE_FLAG_ASM "-I")
+set(CMAKE_INCLUDE_FLAG_ASM_SEP "")
+set(CMAKE_EXECUTABLE_PREFIX_ASM "")
+set(CMAKE_EXECUTABLE_SUFFIX_ASM ".dat")
diff --git a/cmake/CMakeDetermineASMCompiler.cmake b/cmake/CMakeDetermineASMCompiler.cmake
new file mode 100644 (file)
index 0000000..e8e6976
--- /dev/null
@@ -0,0 +1,5 @@
+set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/cmake/qcc.sh)
+
+configure_file(cmake/CMakeASMCompiler.cmake.in
+        ${CMAKE_PLATFORM_INFO_DIR}/CMakeASMCompiler.cmake @ONLY)
+set(CMAKE_ASM_COMPILER_ENV_VAR "QCC")
diff --git a/cmake/CMakeTestASMCompiler.cmake b/cmake/CMakeTestASMCompiler.cmake
new file mode 100644 (file)
index 0000000..9d293a8
--- /dev/null
@@ -0,0 +1 @@
+set(CMAKE_ASM_COMPILER_WORKS 1 CACHE INTERNAL "")
diff --git a/cmake/qcc.sh b/cmake/qcc.sh
new file mode 100755 (executable)
index 0000000..2e8ea70
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/bash
+CPP=${CPP:-cpp}
+QCC=${QCC:-$PWD/../../gmqcc/gmqcc${CMAKE_EXECUTABLE_SUFFIX}}
+case $1 in
+    compile)
+        ${CPP} ${@:3} | sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' > $2
+    ;;
+    link)
+        ${QCC} \
+        -std=gmqcc \
+        -Ooverlap-locals \
+        -O3 \
+        -Werror -Wall \
+        -Wno-field-redeclared \
+        -flno -futf8 -fno-bail-on-werror \
+        -frelaxed-switch -freturn-assignments \
+        ${@:2}
+    ;;
+esac
index 8ef0f0da26771236f38ee1cbf93479d054d36d44..2056f15115d79f83f170c5128fc9a38ea0b4d040 100644 (file)
@@ -306,6 +306,7 @@ seta sv_precacheitems 0
 set sv_spectator_speed_multiplier 1.5
 seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no spectating)"
 seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables"
+seta sv_defaultcharacterskin 0 "if set to 1 the further configuration for replacing all skins is taken from the sv_defaultplayerskin variables"
 seta sv_defaultplayermodel "models/player/erebus.iqm" "default model selection, only works if sv_defaultcharacter is set to 1; you may append a :<skinnumber> suffix to model names; you can specify multiple, separated by space, and a random one will be chosen"
 seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1; can be overriden by :<skinnumber> suffix in sv_defaultplayermodel"
 seta sv_defaultplayermodel_red ""      "\"\" means see sv_defaultplayermodel"
@@ -489,6 +490,7 @@ set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM"
 seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the cvars g_mirrordamage*, g_friendlyfire* and g_teamdamage_threshold*"
 seta g_mirrordamage 0.700000   "for teamplay 4: mirror damage factor"
 seta g_mirrordamage_virtual 1  "for teamplay 4: do not actually apply mirror damage, just show graphics effect for it"
+seta g_mirrordamage_onlyweapons 0 "for teamplay 4: only apply mirror damage if the attack was from a weapon"
 seta g_friendlyfire 0.500000   "for teamplay 4: fiendly fire factor"
 seta g_friendlyfire_virtual 1  "for teamplay 4: do not actually apply friendly fire, just show graphics effect for it"
 seta g_friendlyfire_virtual_force 1    "for teamplay 4: apply force even though damage was made virtual only"
@@ -772,6 +774,17 @@ seta g_waypointsprite_turrets 1 "disable turret waypoints"
 seta g_waypointsprite_turrets_maxdist 5000 "max distace for turret sprites"
 seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle"
 
+seta cl_damagetext "0" "Draw damage dealt where you hit the enemy"
+seta cl_damagetext_format "-{total}" "How to format the damage text. {health}, {armor}, {total}"
+seta cl_damagetext_color "1 1 0" "Damage text color"
+seta cl_damagetext_color_per_weapon "0" "Damage text uses weapon color"
+seta cl_damagetext_size "8" "Damage text font size"
+seta cl_damagetext_alpha_start "1" "Damage text initial alpha"
+seta cl_damagetext_alpha_lifetime "3" "Damage text lifetime in seconds"
+seta cl_damagetext_velocity "0 0 20" "Damage text move direction"
+seta cl_damagetext_offset "0 -40 0" "Damage text offset"
+seta cl_damagetext_accumulate_range "30" "Damage text spawned within this range is accumulated"
+
 set sv_itemstime 1 "enable networking of left time until respawn for items such as mega health and large armor"
 
 // so it can be stuffcmd-ed still
@@ -795,6 +808,7 @@ seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also e
 seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"
 set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 set menu_showboxes 0 "show item bounding boxes (debug)"
+set menu_cvarlist_onlymodified 0 "show only modified cvars in the cvar list"
 
 r_textbrightness 0.2
 r_textcontrast 0.8
@@ -1340,7 +1354,7 @@ set g_frozen_damage_trigger 1 "if 1, frozen players falling into the void will d
 set g_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 
 // player statistics server URI
-set g_playerstats_uri "" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory."
+set g_playerstats_gamereport_uri "http://stats.xonotic.org/stats/submit" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory."
 
 // autoscreenshots
 set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allowed"
@@ -1389,7 +1403,6 @@ exec balance-xonotic.cfg
 exec effects-normal.cfg
 exec physicsX.cfg
 exec turrets.cfg
-exec vehicles.cfg
 exec crosshairs.cfg
 exec gamemodes.cfg
 exec mutators.cfg
index a4b33b7e21fbbfbb647c9d343cac067a324cc5dd..3f89d676e1f8ef5da239837a056259c60ec52915 100644 (file)
@@ -530,7 +530,7 @@ set g_onslaught_spawn_at_generator_random 0
 // ======
 set g_race 0 "Race: be faster than your opponents"
 set g_race_qualifying_timelimit 0
-set g_race_qualifying_timelimit_override -1
+set g_race_qualifying_timelimit_override -1 "qualifying session time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 set g_race_teams 0     "when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
 
 // ==========
index 8709b58ccac52e006f6989f6b0248ad0c5ae3585..ecbcf1fa58688c78a93ea2bdabf6b7196411ac97 100644 (file)
Binary files a/gfx/crosshair55.tga and b/gfx/crosshair55.tga differ
index 61adf9a6ee1324786efdd47978b4db03696ebbe2..9cceb82f54cf69d768008855153eef64b6dc0077 100644 (file)
Binary files a/gfx/crosshair56.tga and b/gfx/crosshair56.tga differ
index d0d922084fcc7cbd59aad641b5dc677126cdd009..80f54e31228fdc888412fcdebc6b34188b56d83a 100644 (file)
Binary files a/gfx/crosshair57.tga and b/gfx/crosshair57.tga differ
index 0bdb7f9963c00bc2cdf2ca7aba56bcfd25e9c4d2..e3e784b85e5c3ee77d0e7910e70a85ba23cfb6b8 100644 (file)
Binary files a/gfx/crosshair58.tga and b/gfx/crosshair58.tga differ
index 8e48aa2b1b33c0963385ecaab9b718784b8782ae..70fbf5e7d5391c51dcf2e99ba40768f61e0e4ff5 100644 (file)
Binary files a/gfx/crosshair59.tga and b/gfx/crosshair59.tga differ
index c03e19d2a45b86fed340c5c6401e6ef0b8e535a1..44839755e4af4b773275146527973c2065c2e0fd 100644 (file)
Binary files a/gfx/crosshair60.tga and b/gfx/crosshair60.tga differ
index 507853f77a3f4ae702f97d275cd50d2047a1b832..3ec893d8144980490b75241bf7f0a487f6218984 100644 (file)
Binary files a/gfx/crosshair61.tga and b/gfx/crosshair61.tga differ
index 54031b1dc12c809ab7e585be1a89a76f4b2f14e0..ea84ee5f177810020a77ddd164174143c8491572 100644 (file)
Binary files a/gfx/crosshair62.tga and b/gfx/crosshair62.tga differ
index 1aa5d55d2ffc0588203f31569ec2b555853eb69f..5818a22cb51a5a6601442452c50a4405a7532c71 100644 (file)
Binary files a/gfx/crosshair63.tga and b/gfx/crosshair63.tga differ
index 06893f80794aa479672f070ac902fd8556915c8b..1911f2d0d514c63f49264a366455a2f2e0f44745 100644 (file)
Binary files a/gfx/crosshair64.tga and b/gfx/crosshair64.tga differ
index ebf77c35b3888e750f2c227d864d7f4b2f8e6baa..7205c3af64ebaafab09d6f064bb32a10ab103541 100644 (file)
Binary files a/gfx/crosshair65.tga and b/gfx/crosshair65.tga differ
index ccba58dba0d39ad703d8c86e4578b0efbfa45438..4039e8435917d0301ba17b2b2e8bc48dc7a64619 100644 (file)
Binary files a/gfx/crosshair66.tga and b/gfx/crosshair66.tga differ
index 379aa24a221a667f98b5993b3bb9b9a376681b2f..de3a5fefe1410bb69fb0006fed530ed2f1b18a6f 100644 (file)
Binary files a/gfx/hud/default/buff_ammo.tga and b/gfx/hud/default/buff_ammo.tga differ
index 556a445bf12f31519cfaad3ef814c572d3aefa89..eaf416cf77bb6f633de1bdbd1d296eaffea2a1f9 100644 (file)
Binary files a/gfx/hud/default/buff_bash.tga and b/gfx/hud/default/buff_bash.tga differ
index e1fbace3723204bac11552aff8938973f6accfcc..a6e050de107ed6b32833a09042d9e4266d2fc81f 100644 (file)
Binary files a/gfx/hud/default/buff_blessed.tga and b/gfx/hud/default/buff_blessed.tga differ
index f2c49ba2285d969e68c62e1ebf038ba3c9a330a0..8abb6f65b6b8878883dbc6a80a23aa2554804e57 100644 (file)
Binary files a/gfx/hud/default/buff_disability.tga and b/gfx/hud/default/buff_disability.tga differ
index 7ed8aa07a6800ec9c09e0b4fad097f727e2abe27..b0a85cd49e253ed35641855129a3ec9671539bba 100644 (file)
Binary files a/gfx/hud/default/buff_flight.tga and b/gfx/hud/default/buff_flight.tga differ
index 08875a217af9399c8110c0d1a0af0d1d781c0cc1..11d432a6fd404081b3f570fdf01c49b836b502fe 100644 (file)
Binary files a/gfx/hud/default/buff_inferno.tga and b/gfx/hud/default/buff_inferno.tga differ
index e0e4fed0c9ec03d8bef0458861ee560f9ad77395..6bbe648a4e28c0a9b6e2973f39a1737ef6b02074 100644 (file)
Binary files a/gfx/hud/default/buff_invisible.tga and b/gfx/hud/default/buff_invisible.tga differ
index 126a07cdae80c1a038e187edc54f5ab50b101336..05b519fa0a531968278a9e13b35007d08b8af9cf 100644 (file)
Binary files a/gfx/hud/default/buff_jump.tga and b/gfx/hud/default/buff_jump.tga differ
index 74655cfb91780cc9bc554b38e69aa28f9a96a4db..288ae074f33c9d230f3f6486905ab47c1b56f452 100644 (file)
Binary files a/gfx/hud/default/buff_luck.tga and b/gfx/hud/default/buff_luck.tga differ
index 85b011d68e9894fbac37146d32ead5496cad369a..242fd8ea366c5c6f32bb9d9318d66b76c81a4477 100644 (file)
Binary files a/gfx/hud/default/buff_magnet.tga and b/gfx/hud/default/buff_magnet.tga differ
index 0792407ad20dbb0752d190bda849f54de83bc1c5..4d926d36f557de5fc5c3d4fbf77f6648055f4f92 100644 (file)
Binary files a/gfx/hud/default/buff_medic.tga and b/gfx/hud/default/buff_medic.tga differ
index f88ea2a9ba94f97247f42307e933a077342a79c4..d7e2524b1bb11ed0d111deb62f3ec22d17472958 100644 (file)
Binary files a/gfx/hud/default/buff_resistance.tga and b/gfx/hud/default/buff_resistance.tga differ
index 54a65af38c07a975d1b64e3a0e0b0d600350b5cb..b9651ce304dfe4f4998955de8ff8316ab0912b8a 100644 (file)
Binary files a/gfx/hud/default/buff_speed.tga and b/gfx/hud/default/buff_speed.tga differ
index c5b97ceb0ee9748d8eeb3db8a228ab1cb0cd25e8..ab9659c0b6f5d2166b3cb4a035d1b6ceb11aebeb 100644 (file)
Binary files a/gfx/hud/default/buff_swapper.tga and b/gfx/hud/default/buff_swapper.tga differ
index 1d60e6b8628fc5e0b59f8655a394a6a23e7bd545..2bae31b01b784001b8986515dc623cef52d1d106 100644 (file)
Binary files a/gfx/hud/default/buff_vampire.tga and b/gfx/hud/default/buff_vampire.tga differ
index 1da8e7fc32fb371b940a58d15f5253b18fe26039..5cf9127d4b115f5a88d72865f1974004034a2464 100644 (file)
Binary files a/gfx/hud/default/buff_vengeance.tga and b/gfx/hud/default/buff_vengeance.tga differ
index 4f085801eedaeaf5770b4aec58871b27bfbfc42e..6c789ef42bb732ecc42405155935950fc594ec80 100644 (file)
Binary files a/gfx/hud/luma/buff_ammo.tga and b/gfx/hud/luma/buff_ammo.tga differ
index 05ec43c62b7bd39be402fa8cfe590b8295e344db..c193a1565b7f0805202d2b7da4a402ab8c1fe652 100644 (file)
Binary files a/gfx/hud/luma/buff_bash.tga and b/gfx/hud/luma/buff_bash.tga differ
index 9ff048e4bf1f66f3813b45fa4ca7d83826623d0f..5e5d2b6960e681ba093a26724204847f3c4794be 100644 (file)
Binary files a/gfx/hud/luma/buff_blessed.tga and b/gfx/hud/luma/buff_blessed.tga differ
index 8d04da05cc2ae55b00fd8bb453285504835e160c..b03ea298167291eec849be2e482867eef98a7883 100644 (file)
Binary files a/gfx/hud/luma/buff_disability.tga and b/gfx/hud/luma/buff_disability.tga differ
index 1f1e59d24745bdd0e8ddee63a2666e6a46d0ab63..863c39ebdb02e864ab9bc6bfe84c7b3aec2836ed 100644 (file)
Binary files a/gfx/hud/luma/buff_flight.tga and b/gfx/hud/luma/buff_flight.tga differ
index 1661e3bbf9611e4055da82660108b50761631b71..e5977f985afad1edd45dbf1d1c91659845604eea 100644 (file)
Binary files a/gfx/hud/luma/buff_inferno.tga and b/gfx/hud/luma/buff_inferno.tga differ
index 34adf173c873ad90d4784961c47ea8ca98fbe086..8e65dc48101d0080af13acc4b506036bc27fcaf0 100644 (file)
Binary files a/gfx/hud/luma/buff_invisible.tga and b/gfx/hud/luma/buff_invisible.tga differ
index a6cd9e0271ff7b05fd3126d2fbea2369cf57bbb9..c8475ac0706764ddb2613c8fd7ad465828e2d0f6 100644 (file)
Binary files a/gfx/hud/luma/buff_jump.tga and b/gfx/hud/luma/buff_jump.tga differ
index e258e9f5141b5dcb2a1fea97b379e3031eb0112f..746e9e5bb10ebf624dd5f92a76cfa6e72a8a5a8b 100644 (file)
Binary files a/gfx/hud/luma/buff_luck.tga and b/gfx/hud/luma/buff_luck.tga differ
index e1b1587d753e69f367df47018276756ba8f61aa4..0788ee47f45cf5a192048f9a2b4294aa2bbada19 100644 (file)
Binary files a/gfx/hud/luma/buff_magnet.tga and b/gfx/hud/luma/buff_magnet.tga differ
index d2b039c02f9cd4dee4d50f7963724f1c857c5649..29513b80165b3f69dea2384fc36aa6bc1699649a 100644 (file)
Binary files a/gfx/hud/luma/buff_medic.tga and b/gfx/hud/luma/buff_medic.tga differ
index 066747287587aeb7a017aaa31f05d3a3ff9c21bf..046c22a9165a527277bed28139ef02312191ea93 100644 (file)
Binary files a/gfx/hud/luma/buff_resistance.tga and b/gfx/hud/luma/buff_resistance.tga differ
index 14ae3c37669f8fa58e11326aaf4f9632276e19f5..ab2506974c74696df535e48713c7fbdcc43a152a 100644 (file)
Binary files a/gfx/hud/luma/buff_speed.tga and b/gfx/hud/luma/buff_speed.tga differ
index 5cb620c8607df6281b8ea63df2b66d537bcbb6aa..02ca7b02f368f6fc1fb27676e8cadd99b2d5f561 100644 (file)
Binary files a/gfx/hud/luma/buff_swapper.tga and b/gfx/hud/luma/buff_swapper.tga differ
index 229c5adcc2bbcc6d71d24a6828ade2374b165f33..f214d733575da9409a8925df7176c336fce0649f 100644 (file)
Binary files a/gfx/hud/luma/buff_vampire.tga and b/gfx/hud/luma/buff_vampire.tga differ
index 64d7468a61b583b1a1d42522ec1b74b81c626be3..53842ea589ddeb10d895efe161546e4743f64080 100644 (file)
Binary files a/gfx/hud/luma/buff_vengeance.tga and b/gfx/hud/luma/buff_vengeance.tga differ
index 7497ddc52b928aa2da40ed85118a8953ed86257c..b5b7623b1c405017c7d1616a4a10679f852bfb11 100644 (file)
Binary files a/gfx/menu/luma/background.tga and b/gfx/menu/luma/background.tga differ
diff --git a/gfx/menu/luma/background.txt b/gfx/menu/luma/background.txt
new file mode 100644 (file)
index 0000000..09a6c8a
--- /dev/null
@@ -0,0 +1,5 @@
+Original photograph of the earth courtesy of the
+Earth Science and Remote Sensing Unit, NASA Johnson Space Center
+
+NASA Photo ID: ISS007-E-10807
+URL: http://eol.jsc.nasa.gov/SearchPhotos/photo.pl?mission=ISS007&roll=E&frame=10807
index 85eda570f90efc1ef44b0e3e3a9cf66dc5d48d80..9724f4049782003d45d38640f2db83d01447c717 100644 (file)
Binary files a/gfx/menu/luma/gametype_as.tga and b/gfx/menu/luma/gametype_as.tga differ
index 668b57e047cb480521ba6c97746b50f2bc96796c..196196e5ecd984d8c09e5f87a6036f0a157fc01b 100644 (file)
Binary files a/gfx/menu/luma/gametype_ca.tga and b/gfx/menu/luma/gametype_ca.tga differ
index 7eb0c8e171a76c6b913780672e81f2727a550a78..eefb2fe0b547d40627a159400a52ec55fbb69b86 100644 (file)
Binary files a/gfx/menu/luma/gametype_ctf.tga and b/gfx/menu/luma/gametype_ctf.tga differ
index 235da2f1665f25a8f50602d7f737671099de5372..da86fa4faf0e27bd33a85a84fc80098bfc534d0f 100644 (file)
Binary files a/gfx/menu/luma/gametype_cts.tga and b/gfx/menu/luma/gametype_cts.tga differ
index 0ce1d16fa52e9b57888acacd40b5f5f615ac3b84..3d0874ead11edefab9c321165bfa0c802d4a2c12 100644 (file)
Binary files a/gfx/menu/luma/gametype_dm.tga and b/gfx/menu/luma/gametype_dm.tga differ
index fcaa2f3ab239ec57f9607104c0bf3613630763f5..eb6605b5b3db89f84af354e07c7d88538a3986e4 100644 (file)
Binary files a/gfx/menu/luma/gametype_dom.tga and b/gfx/menu/luma/gametype_dom.tga differ
index 88163164c564a0658723cfcec0c262176865b839..3558725a542264919c9bf01d0b82b2bcab56b942 100644 (file)
Binary files a/gfx/menu/luma/gametype_duel.tga and b/gfx/menu/luma/gametype_duel.tga differ
index 515a3f870050417bf67baeb5dc9c0543b61ece69..f6228a5106a1fdfa9fe4013e63e63e7c2e629b0f 100644 (file)
Binary files a/gfx/menu/luma/gametype_ft.tga and b/gfx/menu/luma/gametype_ft.tga differ
index bcbbd6c3cf797a3779e9bfbc26719251011c1f37..90938379725a60b477a751d3ea770965673d2879 100644 (file)
Binary files a/gfx/menu/luma/gametype_inf.tga and b/gfx/menu/luma/gametype_inf.tga differ
index bc114f9b55078c41bae9380e57f5e600619b24a7..d954af1ebc99a0e6c6b94a665f79362f6ac08d02 100644 (file)
Binary files a/gfx/menu/luma/gametype_inv.tga and b/gfx/menu/luma/gametype_inv.tga differ
index 7971be376f9928cfd6d225ae7291c912d2e601d5..e6b35a4e1c40f2ef36b49876ac088901086388db 100644 (file)
Binary files a/gfx/menu/luma/gametype_jb.tga and b/gfx/menu/luma/gametype_jb.tga differ
index 3370b5e59b806c3c9d713daf2948e94a46e7c992..38acfc705e989236e7bbe6e259b985cd0017b289 100644 (file)
Binary files a/gfx/menu/luma/gametype_ka.tga and b/gfx/menu/luma/gametype_ka.tga differ
index bdca280501a6f26d0e3371fd1bd7be6edecdc2ca..df30ff0ea18f5630c3e1f1a3247bc11dcbc39555 100644 (file)
Binary files a/gfx/menu/luma/gametype_kh.tga and b/gfx/menu/luma/gametype_kh.tga differ
index 33e2be70d4fffaf88f80fc8ce9f2c88820010912..e14d2a2f9bb58407b2d328c12322cf8ae6e032f5 100644 (file)
Binary files a/gfx/menu/luma/gametype_lms.tga and b/gfx/menu/luma/gametype_lms.tga differ
index 15d273634fa1caa6a8471eeaae9370f422e456e3..93b021e4555aacef4889d76b5384addc99715edc 100644 (file)
Binary files a/gfx/menu/luma/gametype_nb.tga and b/gfx/menu/luma/gametype_nb.tga differ
index a9a0f175249d02aa1d8752032a01e60e9a989ff1..48a0c5a13a37e5ce40de8579fb2f3c0b8d302ecd 100644 (file)
Binary files a/gfx/menu/luma/gametype_ons.tga and b/gfx/menu/luma/gametype_ons.tga differ
index 10d7e41ed0e360f258c49cffdb050e1815e1b792..a03204238f00dfe439f0b62fc8bbf991a9a4d879 100644 (file)
Binary files a/gfx/menu/luma/gametype_rc.tga and b/gfx/menu/luma/gametype_rc.tga differ
index 289641e902e5f5787982fec84a8f267c50fba78d..3a6c0922f4b047a54f7137e430f499745032aedd 100644 (file)
Binary files a/gfx/menu/luma/gametype_tdm.tga and b/gfx/menu/luma/gametype_tdm.tga differ
index 2c9eccc26349f1aaae5b8d269d06330feb2ba3bc..8a8f7d984d9ca4e25cae4a32082aa0455557727c 100644 (file)
Binary files a/gfx/menu/luma/gametype_vip.tga and b/gfx/menu/luma/gametype_vip.tga differ
index 226af4c1bf237ff596b4128c9621d410d1e8df5f..2ec91efca551f9dfacc1b056768948b7f1dd02b0 100644 (file)
@@ -15,7 +15,7 @@ seta hud_dock_color "0 0 0"
 seta hud_dock_color_team "1"
 seta hud_dock_alpha "1"
 
-seta hud_progressbar_alpha "0.600000"
+seta hud_progressbar_alpha "0.6"
 seta hud_progressbar_strength_color "1 0.39 0"
 seta hud_progressbar_superweapons_color "0.77 0.67 0"
 seta hud_progressbar_shield_color "0.36 1 0.07"
@@ -35,7 +35,6 @@ seta hud_configure_grid "1"
 seta hud_configure_grid_xsize "0.005000"
 seta hud_configure_grid_ysize "0.005000"
 
-seta hud_panel_weapons "1"
 seta hud_panel_weapons_pos "0.965000 0.125000"
 seta hud_panel_weapons_size "0.035000 0.770000"
 seta hud_panel_weapons_bg "border_default_east"
@@ -46,7 +45,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding "0"
 seta hud_panel_weapons_accuracy "0"
 seta hud_panel_weapons_label "1"
-seta hud_panel_weapons_label_scale "0.300000"
+seta hud_panel_weapons_label_scale "0.3"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "0"
 seta hud_panel_weapons_complainbubble_time "0"
@@ -65,10 +64,9 @@ seta hud_panel_weapons_timeout_fadefgmin "0.4"
 seta hud_panel_weapons_timeout_speed_in "0.25"
 seta hud_panel_weapons_timeout_speed_out "0.75"
 seta hud_panel_weapons_onlyowned "1"
-seta hud_panel_weapons_noncurrent_alpha "0.800000"
-seta hud_panel_weapons_noncurrent_scale "0.900000"
+seta hud_panel_weapons_noncurrent_alpha "0.8"
+seta hud_panel_weapons_noncurrent_scale "0.9"
 
-seta hud_panel_ammo "1"
 seta hud_panel_ammo_pos "0.315000 0.865000"
 seta hud_panel_ammo_size "0.370000 0.060000"
 seta hud_panel_ammo_bg "border_tab_south"
@@ -78,15 +76,14 @@ seta hud_panel_ammo_bg_alpha ""
 seta hud_panel_ammo_bg_border ""
 seta hud_panel_ammo_bg_padding "4"
 seta hud_panel_ammo_onlycurrent "0"
-seta hud_panel_ammo_noncurrent_alpha "0.600000"
-seta hud_panel_ammo_noncurrent_scale "0.400000"
+seta hud_panel_ammo_noncurrent_alpha "0.6"
+seta hud_panel_ammo_noncurrent_scale "0.4"
 seta hud_panel_ammo_iconalign "0"
 seta hud_panel_ammo_progressbar "0"
 seta hud_panel_ammo_progressbar_name "progressbar"
 seta hud_panel_ammo_progressbar_xoffset "0"
 seta hud_panel_ammo_text "1"
 
-seta hud_panel_powerups "1"
 seta hud_panel_powerups_pos "0.325000 0.815000"
 seta hud_panel_powerups_size "0.350000 0.055000"
 seta hud_panel_powerups_bg "border_shadow_south"
@@ -100,7 +97,6 @@ seta hud_panel_powerups_baralign "3"
 seta hud_panel_powerups_progressbar "1"
 seta hud_panel_powerups_text "1"
 
-seta hud_panel_healtharmor "1"
 seta hud_panel_healtharmor_pos "0.300000 0.925000"
 seta hud_panel_healtharmor_size "0.400000 0.070000"
 seta hud_panel_healtharmor_bg "border_default_south"
@@ -109,6 +105,7 @@ seta hud_panel_healtharmor_bg_color_team ""
 seta hud_panel_healtharmor_bg_alpha ""
 seta hud_panel_healtharmor_bg_border "4"
 seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_combined "0"
 seta hud_panel_healtharmor_flip "0"
 seta hud_panel_healtharmor_iconalign "3"
 seta hud_panel_healtharmor_baralign "3"
@@ -119,7 +116,6 @@ seta hud_panel_healtharmor_progressbar_gfx "1"
 seta hud_panel_healtharmor_progressbar_gfx_smooth "2"
 seta hud_panel_healtharmor_text "1"
 
-seta hud_panel_notify "1"
 seta hud_panel_notify_pos "0.730000 0.800000"
 seta hud_panel_notify_size "0.265000 0.200000"
 seta hud_panel_notify_bg "0"
@@