]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into 'LegendaryGuard/cyber' and cleanup resources
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 10 Mar 2022 22:16:52 +0000 (23:16 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 10 Mar 2022 22:16:52 +0000 (23:16 +0100)
commit437292b7330b2467d4b955a2674ca4200884c81f
tree619acd2a3c29c56ba353d70a192474e4ff1398e1
parentc6911d44557d1905dfeecbb47bd3914c9c96a233
Merge branch 'master' into 'LegendaryGuard/cyber' and cleanup resources
297 files changed:
.gitlab-ci.yml
_hud_common.cfg
_hud_descriptions.cfg
balance-mario.cfg
balance-nexuiz25.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.cfg
commands.cfg
common.ast.po
common.be.po
common.bg.po
common.ca.po
common.cs.po
common.da.po
common.de.po
common.de_CH.po
common.el.po
common.en_AU.po
common.eo.po
common.es.po
common.es_MX.po
common.fi.po
common.fr.po
common.ga.po
common.gd.po
common.gl.po
common.he.po
common.hu.po
common.it.po
common.ja_JP.po
common.jbo.po
common.kk@Cyrl.po
common.ko.po
common.kw.po
common.mk.po
common.ms.po
common.nl.po
common.no.po
common.pl.po
common.pot
common.pt.po
common.pt_BR.po
common.ro.po
common.ru.po
common.sq.po
common.sr.po
common.sv.po
common.tr.po
common.uk.po
common.uz@Latn.po
common.zh_CN.po
common.zh_TW.po
effectinfo.txt
gamemodes-server.cfg
gfx/hud/default/nade_ammo.tga [deleted file]
gfx/hud/default/nade_dark.tga [deleted file]
gfx/hud/default/nade_emerald.tga [deleted file]
gfx/hud/luma/nade_ammo.tga [deleted file]
gfx/hud/luma/nade_dark.tga [deleted file]
gfx/hud/luma/nade_emerald.tga [deleted file]
gfx/menu/luma/gametype_mmm.tga [deleted file]
gfx/menu/luminos/gametype_mmm.tga [deleted file]
gfx/menu/wickedx/gametype_mmm.tga [deleted file]
gfx/menu/xaw/gametype_mmm.tga [deleted file]
hud_luma.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
languages.txt
models/sprites/make-sprites.sh
models/weapons/make-sprites.sh
mutators.cfg
notifications.cfg
qcsrc/client/_mod.inc
qcsrc/client/_mod.qh
qcsrc/client/announcer.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/ammo.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/centerprint.qh
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/chat.qh
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/client/hud/panel/radar.qc
qcsrc/client/hud/panel/score.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/spect.qc
qcsrc/client/hud/panel/strafehud.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/client/hud/panel/timer.qh
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/resources.qc [deleted file]
qcsrc/client/resources.qh [deleted file]
qcsrc/client/shownames.qc
qcsrc/client/view.qc
qcsrc/client/view.qh
qcsrc/common/_all.inc
qcsrc/common/_mod.inc
qcsrc/common/announcer.qc [new file with mode: 0644]
qcsrc/common/colors.qc [new file with mode: 0644]
qcsrc/common/constants.qh
qcsrc/common/deathtypes/all.inc
qcsrc/common/debug.qh
qcsrc/common/effects/all.inc
qcsrc/common/effects/effectinfo_nades.inc
qcsrc/common/effects/qc/casings.qc
qcsrc/common/effects/qc/casings.qh
qcsrc/common/effects/qc/globalsound.qc
qcsrc/common/effects/qc/globalsound.qh
qcsrc/common/ent_cs.qc
qcsrc/common/ent_cs.qh
qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qh
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
qcsrc/common/gamemodes/sv_rules.qc
qcsrc/common/gamemodes/sv_rules.qh
qcsrc/common/items/inventory.qh
qcsrc/common/items/item/ammo.qh
qcsrc/common/minigames/sv_minigames.qc
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/common/mutators/mutator/attackertext/_mod.inc [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/_mod.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/attackertext.qc [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/attackertext.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qc [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/cl_attackertext.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qc [new file with mode: 0644]
qcsrc/common/mutators/mutator/attackertext/sv_attackertext.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/buffs/buffs.qc
qcsrc/common/mutators/mutator/buffs/buffs.qh
qcsrc/common/mutators/mutator/buffs/cl_buffs.qh
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
qcsrc/common/mutators/mutator/dodging/cl_dodging.qc
qcsrc/common/mutators/mutator/dodging/cl_dodging.qh
qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
qcsrc/common/mutators/mutator/dodging/sv_dodging.qh
qcsrc/common/mutators/mutator/itemstime/itemstime.qc
qcsrc/common/mutators/mutator/itemstime/itemstime.qh
qcsrc/common/mutators/mutator/multijump/multijump.qc
qcsrc/common/mutators/mutator/multijump/multijump.qh
qcsrc/common/mutators/mutator/nades/effects.inc
qcsrc/common/mutators/mutator/nades/nades.inc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/nades/nades.qh
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/mutators/mutator/overkill/okhmg.qh
qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
qcsrc/common/mutators/mutator/overkill/oknex.qh
qcsrc/common/mutators/mutator/overkill/okrpc.qh
qcsrc/common/mutators/mutator/overkill/okshotgun.qh
qcsrc/common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qh
qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc
qcsrc/common/net_linked.qh
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qh
qcsrc/common/physics/player.qc
qcsrc/common/physics/player.qh
qcsrc/common/playerstats.qc
qcsrc/common/playerstats.qh
qcsrc/common/replicate.qh
qcsrc/common/resources.qh [deleted file]
qcsrc/common/resources/_mod.inc [new file with mode: 0644]
qcsrc/common/resources/_mod.qh [new file with mode: 0644]
qcsrc/common/resources/all.inc [new file with mode: 0644]
qcsrc/common/resources/cl_resources.qc [new file with mode: 0644]
qcsrc/common/resources/cl_resources.qh [new file with mode: 0644]
qcsrc/common/resources/resources.qc [new file with mode: 0644]
qcsrc/common/resources/resources.qh [new file with mode: 0644]
qcsrc/common/resources/sv_resources.qc [new file with mode: 0644]
qcsrc/common/resources/sv_resources.qh [new file with mode: 0644]
qcsrc/common/scores.qh
qcsrc/common/sounds/all.inc
qcsrc/common/state.qc
qcsrc/common/stats.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/vehicles/vehicle/_mod.inc
qcsrc/common/vehicles/vehicle/_mod.qh
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon.qh
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/arc.qh
qcsrc/common/weapons/weapon/blaster.qh
qcsrc/common/weapons/weapon/crylink.qh
qcsrc/common/weapons/weapon/devastator.qh
qcsrc/common/weapons/weapon/electro.qh
qcsrc/common/weapons/weapon/fireball.qh
qcsrc/common/weapons/weapon/hagar.qh
qcsrc/common/weapons/weapon/hlac.qh
qcsrc/common/weapons/weapon/hook.qh
qcsrc/common/weapons/weapon/machinegun.qh
qcsrc/common/weapons/weapon/minelayer.qh
qcsrc/common/weapons/weapon/mortar.qh
qcsrc/common/weapons/weapon/porto.qh
qcsrc/common/weapons/weapon/rifle.qh
qcsrc/common/weapons/weapon/seeker.qc
qcsrc/common/weapons/weapon/seeker.qh
qcsrc/common/weapons/weapon/shockwave.qh
qcsrc/common/weapons/weapon/shotgun.qh
qcsrc/common/weapons/weapon/tuba.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vaporizer.qh
qcsrc/common/weapons/weapon/vortex.qc
qcsrc/common/weapons/weapon/vortex.qh
qcsrc/lib/counting.qh
qcsrc/lib/replicate.qh
qcsrc/lib/string.qh
qcsrc/lib/urllib.qh
qcsrc/menu/xonotic/_mod.inc
qcsrc/menu/xonotic/_mod.qh
qcsrc/menu/xonotic/credits.qc
qcsrc/menu/xonotic/dialog_firstrun.qc
qcsrc/menu/xonotic/dialog_firstrun.qh
qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_termsofservice.qc [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_termsofservice.qh [new file with mode: 0644]
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/menu/xonotic/mainwindow.qh
qcsrc/menu/xonotic/playerlist.qc
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/textbox.qc [new file with mode: 0644]
qcsrc/menu/xonotic/textbox.qh [new file with mode: 0644]
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
qcsrc/server/_mod.inc
qcsrc/server/_mod.qh
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/bot.qh
qcsrc/server/bot/default/havocbot/roles.qc
qcsrc/server/bot/null/bot_null.qc
qcsrc/server/cheats.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/clientkill.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/getreplies.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/command/vote.qh
qcsrc/server/compat/quake3.qc
qcsrc/server/damage.qc
qcsrc/server/impulse.qc
qcsrc/server/intermission.qc
qcsrc/server/ipban.qc
qcsrc/server/ipban.qh
qcsrc/server/items/items.qc
qcsrc/server/items/items.qh
qcsrc/server/main.qh
qcsrc/server/mutators/_mod.inc
qcsrc/server/mutators/events.qh
qcsrc/server/race.qc
qcsrc/server/resources.qc [deleted file]
qcsrc/server/resources.qh [deleted file]
qcsrc/server/round_handler.qc
qcsrc/server/scores.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/accuracy.qh
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/server/weapons/weaponsystem.qh
qcsrc/server/world.qc
qcsrc/server/world.qh
sound/misc/blind.ogg [deleted file]
sound/misc/goomba.ogg [deleted file]
xonotic-client.cfg
xonotic-server.cfg