git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

author	Mario <mario.mario@y7mail.com>
	Tue, 29 Sep 2020 13:19:21 +0000 (23:19 +1000)
committer	Mario <mario.mario@y7mail.com>
	Tue, 29 Sep 2020 13:19:21 +0000 (23:19 +1000)
commit	bceba9da6a88c88def2a347f5d77d085dfc9a379
tree	a5c28866bdd0be8917543441c49e066d7ea6ffaa	tree \| snapshot
parent	f88ee076d39288767f68a2eba1b147283f2576f4	commit \| diff

Merge branch 'master' into Mario/survival

295 files changed:

.tx/merge-base		diff \| blob \| history
common.ast.po		diff \| blob \| history
common.be.po		diff \| blob \| history
common.bg.po		diff \| blob \| history
common.ca.po		diff \| blob \| history
common.cs.po		diff \| blob \| history
common.da.po		diff \| blob \| history
common.de.po		diff \| blob \| history
common.de_CH.po		diff \| blob \| history
common.el.po		diff \| blob \| history
common.en_AU.po		diff \| blob \| history
common.eo.po		diff \| blob \| history
common.es.po		diff \| blob \| history
common.es_MX.po		diff \| blob \| history
common.fi.po		diff \| blob \| history
common.fr.po		diff \| blob \| history
common.ga.po		diff \| blob \| history
common.gd.po		diff \| blob \| history
common.gl.po		diff \| blob \| history
common.he.po		diff \| blob \| history
common.hu.po		diff \| blob \| history
common.it.po		diff \| blob \| history
common.ja_JP.po		diff \| blob \| history
common.jbo.po		diff \| blob \| history
common.kk@Cyrl.po		diff \| blob \| history
common.ko.po		diff \| blob \| history
common.kw.po		diff \| blob \| history
common.mk.po		diff \| blob \| history
common.ms.po		diff \| blob \| history
common.nl.po		diff \| blob \| history
common.no.po		diff \| blob \| history
common.pl.po		diff \| blob \| history
common.pot		diff \| blob \| history
common.pt.po		diff \| blob \| history
common.pt_BR.po		diff \| blob \| history
common.ro.po		diff \| blob \| history
common.ru.po		diff \| blob \| history
common.sq.po		diff \| blob \| history
common.sr.po		diff \| blob \| history
common.sv.po		diff \| blob \| history
common.tr.po		diff \| blob \| history
common.uk.po		diff \| blob \| history
common.uz@Latn.po		diff \| blob \| history
common.zh_CN.po		diff \| blob \| history
common.zh_TW.po		diff \| blob \| history
hud_luma.cfg		diff \| blob \| history
hud_luminos.cfg		diff \| blob \| history
hud_luminos_minimal.cfg		diff \| blob \| history
hud_luminos_minimal_xhair.cfg		diff \| blob \| history
hud_luminos_old.cfg		diff \| blob \| history
hud_nexuiz.cfg		diff \| blob \| history
languages.txt		diff \| blob \| history
notifications.cfg		diff \| blob \| history
qcsrc/client/_mod.inc		diff \| blob \| history
qcsrc/client/_mod.qh		diff \| blob \| history
qcsrc/client/autocvars.qh		diff \| blob \| history
qcsrc/client/command/_mod.inc	[new file with mode: 0644]	blob
qcsrc/client/command/_mod.qh	[new file with mode: 0644]	blob
qcsrc/client/command/cl_cmd.qc	[new file with mode: 0644]	blob
qcsrc/client/command/cl_cmd.qh	[new file with mode: 0644]	blob
qcsrc/client/commands/_mod.inc	[deleted file]	blob \| history
qcsrc/client/commands/_mod.qh	[deleted file]	blob \| history
qcsrc/client/commands/cl_cmd.qc	[deleted file]	blob \| history
qcsrc/client/commands/cl_cmd.qh	[deleted file]	blob \| history
qcsrc/client/csqc_constants.qh	[deleted file]	blob \| history
qcsrc/client/csqcmodel_hooks.qc		diff \| blob \| history
qcsrc/client/draw.qc	[new file with mode: 0644]	blob
qcsrc/client/draw.qh	[new file with mode: 0644]	blob
qcsrc/client/hud/crosshair.qc		diff \| blob \| history
qcsrc/client/hud/hud.qc		diff \| blob \| history
qcsrc/client/hud/hud.qh		diff \| blob \| history
qcsrc/client/hud/hud_config.qc		diff \| blob \| history
qcsrc/client/hud/panel/ammo.qc		diff \| blob \| history
qcsrc/client/hud/panel/centerprint.qc		diff \| blob \| history
qcsrc/client/hud/panel/chat.qc		diff \| blob \| history
qcsrc/client/hud/panel/engineinfo.qc		diff \| blob \| history
qcsrc/client/hud/panel/healtharmor.qc		diff \| blob \| history
qcsrc/client/hud/panel/infomessages.qc		diff \| blob \| history
qcsrc/client/hud/panel/modicons.qc		diff \| blob \| history
qcsrc/client/hud/panel/notify.qc		diff \| blob \| history
qcsrc/client/hud/panel/physics.qc		diff \| blob \| history
qcsrc/client/hud/panel/powerups.qc		diff \| blob \| history
qcsrc/client/hud/panel/pressedkeys.qc		diff \| blob \| history
qcsrc/client/hud/panel/quickmenu.qc		diff \| blob \| history
qcsrc/client/hud/panel/racetimer.qc		diff \| blob \| history
qcsrc/client/hud/panel/radar.qc		diff \| blob \| history
qcsrc/client/hud/panel/score.qc		diff \| blob \| history
qcsrc/client/hud/panel/scoreboard.qc		diff \| blob \| history
qcsrc/client/hud/panel/timer.qc		diff \| blob \| history
qcsrc/client/hud/panel/vote.qc		diff \| blob \| history
qcsrc/client/hud/panel/weapons.qc		diff \| blob \| history
qcsrc/client/hud/panel/weapons.qh		diff \| blob \| history
qcsrc/client/main.qc		diff \| blob \| history
qcsrc/client/main.qh		diff \| blob \| history
qcsrc/client/mapvoting.qc		diff \| blob \| history
qcsrc/client/mapvoting.qh		diff \| blob \| history
qcsrc/client/miscfunctions.qc	[deleted file]	blob \| history
qcsrc/client/miscfunctions.qh	[deleted file]	blob \| history
qcsrc/client/shownames.qc		diff \| blob \| history
qcsrc/client/view.qc		diff \| blob \| history
qcsrc/client/view.qh		diff \| blob \| history
qcsrc/common/command/generic.qc		diff \| blob \| history
qcsrc/common/constants.qh		diff \| blob \| history
qcsrc/common/csqcmodel_settings.qh		diff \| blob \| history
qcsrc/common/debug.qh		diff \| blob \| history
qcsrc/common/effects/qc/globalsound.qc		diff \| blob \| history
qcsrc/common/effects/qc/globalsound.qh		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/domination/cl_domination.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/keepaway/cl_keepaway.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/nexball/cl_nexball.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/nexball/sv_nexball.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/race/cl_race.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/race/sv_race.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/tdm/sv_tdm.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/tdm/sv_tdm.qh		diff \| blob \| history
qcsrc/common/items/item/powerup.qh		diff \| blob \| history
qcsrc/common/mapobjects/func/breakable.qc		diff \| blob \| history
qcsrc/common/mapobjects/misc/dynlight.qc		diff \| blob \| history
qcsrc/common/mapobjects/models.qc		diff \| blob \| history
qcsrc/common/mapobjects/target/music.qc		diff \| blob \| history
qcsrc/common/mapobjects/target/spawn.qc		diff \| blob \| history
qcsrc/common/mapobjects/teleporters.qc		diff \| blob \| history
qcsrc/common/mapobjects/trigger/jumppads.qc		diff \| blob \| history
qcsrc/common/mapobjects/trigger/relay.qc		diff \| blob \| history
qcsrc/common/mapobjects/triggers.qc		diff \| blob \| history
qcsrc/common/minigames/cl_minigames_hud.qc		diff \| blob \| history
qcsrc/common/minigames/minigame/nmm.qc		diff \| blob \| history
qcsrc/common/monsters/monster.qh		diff \| blob \| history
qcsrc/common/monsters/monster/spider.qc		diff \| blob \| history
qcsrc/common/monsters/sv_monsters.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/nix/sv_nix.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/overkill/okhmg.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/overkill/oknex.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/overkill/okrpc.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/overkill/okshotgun.qc		diff \| blob \| history
qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc		diff \| blob \| history
qcsrc/common/notifications/all.inc		diff \| blob \| history
qcsrc/common/notifications/all.qc		diff \| blob \| history
qcsrc/common/physics/movetypes/movetypes.qc		diff \| blob \| history
qcsrc/common/physics/movetypes/movetypes.qh		diff \| blob \| history
qcsrc/common/physics/player.qc		diff \| blob \| history
qcsrc/common/physics/player.qh		diff \| blob \| history
qcsrc/common/playerstats.qc		diff \| blob \| history
qcsrc/common/sounds/all.qh		diff \| blob \| history
qcsrc/common/state.qc		diff \| blob \| history
qcsrc/common/stats.qh		diff \| blob \| history
qcsrc/common/turrets/sv_turrets.qc		diff \| blob \| history
qcsrc/common/turrets/sv_turrets.qh		diff \| blob \| history
qcsrc/common/util.qc		diff \| blob \| history
qcsrc/common/util.qh		diff \| blob \| history
qcsrc/common/vehicles/sv_vehicles.qc		diff \| blob \| history
qcsrc/common/weapons/all.qc		diff \| blob \| history
qcsrc/common/weapons/all.qh		diff \| blob \| history
qcsrc/common/weapons/calculations.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/arc.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/crylink.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/fireball.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/hagar.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/hlac.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/rifle.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/shockwave.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/shotgun.qc		diff \| blob \| history
qcsrc/common/weapons/weapon/vortex.qc		diff \| blob \| history
qcsrc/dpdefs/upstream/dpextensions.qc		diff \| blob \| history
qcsrc/dpdefs/upstream/menudefs.qc		diff \| blob \| history
qcsrc/ecs/README.md		diff \| blob \| history
qcsrc/ecs/systems/sv_physics.qc		diff \| blob \| history
qcsrc/lib/csqcmodel/cl_player.qc		diff \| blob \| history
qcsrc/lib/cvar.qh		diff \| blob \| history
qcsrc/lib/log.qh		diff \| blob \| history
qcsrc/lib/spawnfunc.qh		diff \| blob \| history
qcsrc/lib/warpzone/server.qc		diff \| blob \| history
qcsrc/menu/menu.qc		diff \| blob \| history
qcsrc/menu/xonotic/dialog_settings_game_model.qc		diff \| blob \| history
qcsrc/server/_mod.inc		diff \| blob \| history
qcsrc/server/_mod.qh		diff \| blob \| history
qcsrc/server/anticheat.qc		diff \| blob \| history
qcsrc/server/autocvars.qh		diff \| blob \| history
qcsrc/server/bot/default/bot.qc		diff \| blob \| history
qcsrc/server/bot/default/havocbot/havocbot.qc		diff \| blob \| history
qcsrc/server/bot/default/havocbot/roles.qc		diff \| blob \| history
qcsrc/server/bot/default/navigation.qc		diff \| blob \| history
qcsrc/server/bot/default/scripting.qc		diff \| blob \| history
qcsrc/server/bot/default/waypoints.qc		diff \| blob \| history
qcsrc/server/campaign.qc		diff \| blob \| history
qcsrc/server/chat.qc	[new file with mode: 0644]	blob
qcsrc/server/chat.qh	[new file with mode: 0644]	blob
qcsrc/server/cheats.qc		diff \| blob \| history
qcsrc/server/client.qc		diff \| blob \| history
qcsrc/server/client.qh		diff \| blob \| history
qcsrc/server/clientkill.qc		diff \| blob \| history
qcsrc/server/command/banning.qc		diff \| blob \| history
qcsrc/server/command/cmd.qc		diff \| blob \| history
qcsrc/server/command/common.qc		diff \| blob \| history
qcsrc/server/command/common.qh		diff \| blob \| history
qcsrc/server/command/getreplies.qc		diff \| blob \| history
qcsrc/server/command/getreplies.qh		diff \| blob \| history
qcsrc/server/command/radarmap.qc		diff \| blob \| history
qcsrc/server/command/sv_cmd.qc		diff \| blob \| history
qcsrc/server/command/sv_cmd.qh		diff \| blob \| history
qcsrc/server/command/vote.qc		diff \| blob \| history
qcsrc/server/command/vote.qh		diff \| blob \| history
qcsrc/server/compat/quake.qc		diff \| blob \| history
qcsrc/server/compat/quake3.qc		diff \| blob \| history
qcsrc/server/compat/wop.qc		diff \| blob \| history
qcsrc/server/constants.qh	[deleted file]	blob \| history
qcsrc/server/damage.qc	[new file with mode: 0644]	blob
qcsrc/server/damage.qh	[new file with mode: 0644]	blob
qcsrc/server/elimination.qc	[new file with mode: 0644]	blob
qcsrc/server/elimination.qh	[new file with mode: 0644]	blob
qcsrc/server/g_damage.qc	[deleted file]	blob \| history
qcsrc/server/g_damage.qh	[deleted file]	blob \| history
qcsrc/server/g_hook.qc	[deleted file]	blob \| history
qcsrc/server/g_hook.qh	[deleted file]	blob \| history
qcsrc/server/g_world.qc	[deleted file]	blob \| history
qcsrc/server/g_world.qh	[deleted file]	blob \| history
qcsrc/server/gamelog.qc		diff \| blob \| history
qcsrc/server/hook.qc	[new file with mode: 0644]	blob
qcsrc/server/hook.qh	[new file with mode: 0644]	blob
qcsrc/server/impulse.qc		diff \| blob \| history
qcsrc/server/intermission.qc	[new file with mode: 0644]	blob
qcsrc/server/intermission.qh	[new file with mode: 0644]	blob
qcsrc/server/ipban.qc		diff \| blob \| history
qcsrc/server/items/items.qc		diff \| blob \| history
qcsrc/server/items/items.qh		diff \| blob \| history
qcsrc/server/main.qc	[new file with mode: 0644]	blob
qcsrc/server/main.qh	[new file with mode: 0644]	blob
qcsrc/server/mapvoting.qc		diff \| blob \| history
qcsrc/server/matrix.qc		diff \| blob \| history
qcsrc/server/miscfunctions.qc	[deleted file]	blob \| history
qcsrc/server/miscfunctions.qh	[deleted file]	blob \| history
qcsrc/server/mutators/loader.qc		diff \| blob \| history
qcsrc/server/pathlib/main.qc		diff \| blob \| history
qcsrc/server/pathlib/movenode.qc		diff \| blob \| history
qcsrc/server/pathlib/utility.qc		diff \| blob \| history
qcsrc/server/player.qc		diff \| blob \| history
qcsrc/server/player.qh		diff \| blob \| history
qcsrc/server/portals.qc		diff \| blob \| history
qcsrc/server/race.qc		diff \| blob \| history
qcsrc/server/race.qh		diff \| blob \| history
qcsrc/server/resources.qc		diff \| blob \| history
qcsrc/server/round_handler.qc		diff \| blob \| history
qcsrc/server/scores.qc		diff \| blob \| history
qcsrc/server/scores_rules.qc		diff \| blob \| history
qcsrc/server/spawnpoints.qc		diff \| blob \| history
qcsrc/server/sv_main.qc	[deleted file]	blob \| history
qcsrc/server/sv_main.qh	[deleted file]	blob \| history
qcsrc/server/teamplay.qc		diff \| blob \| history
qcsrc/server/tests.qh		diff \| blob \| history
qcsrc/server/utils.qh		diff \| blob \| history
qcsrc/server/weapons/accuracy.qc		diff \| blob \| history
qcsrc/server/weapons/accuracy.qh		diff \| blob \| history
qcsrc/server/weapons/common.qc		diff \| blob \| history
qcsrc/server/weapons/common.qh		diff \| blob \| history
qcsrc/server/weapons/csqcprojectile.qc		diff \| blob \| history
qcsrc/server/weapons/hitplot.qc		diff \| blob \| history
qcsrc/server/weapons/selection.qh		diff \| blob \| history
qcsrc/server/weapons/spawning.qc		diff \| blob \| history
qcsrc/server/weapons/spawning.qh		diff \| blob \| history
qcsrc/server/weapons/throwing.qc		diff \| blob \| history
qcsrc/server/weapons/throwing.qh		diff \| blob \| history
qcsrc/server/weapons/tracing.qc		diff \| blob \| history
qcsrc/server/weapons/tracing.qh		diff \| blob \| history
qcsrc/server/weapons/weaponstats.qc		diff \| blob \| history
qcsrc/server/weapons/weaponsystem.qc		diff \| blob \| history
qcsrc/server/weapons/weaponsystem.qh		diff \| blob \| history
qcsrc/server/world.qc	[new file with mode: 0644]	blob
qcsrc/server/world.qh	[new file with mode: 0644]	blob
xonotic-client.cfg		diff \| blob \| history
xonotic-server.cfg		diff \| blob \| history

RSS Atom