xonotic/xonotic-data.pk3dir.git
2 years agoMerge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Tue, 29 Aug 2017 00:46:57 +0000 (03:46 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

2 years agoSuppress error output of "which"
terencehill [Mon, 28 Aug 2017 12:36:29 +0000 (14:36 +0200)]
Suppress error output of "which"

2 years agoMerge branch 'martin-t/okmodelsfix' into 'master'
Mario [Mon, 28 Aug 2017 02:42:04 +0000 (02:42 +0000)]
Merge branch 'martin-t/okmodelsfix' into 'master'

Overkill: set sv_defaultplayermodel_* for pink and yellow teams

See merge request !473

2 years agooverkill: set sv_defaultplayermodel_* for pink and yellow teams 473/head
Martin Taibr [Mon, 28 Aug 2017 02:04:55 +0000 (04:04 +0200)]
overkill: set sv_defaultplayermodel_* for pink and yellow teams

2 years agoAdd a spawnflag to start func_rotating off, and add a basic reset function to func_ro...
Mario [Mon, 28 Aug 2017 00:13:47 +0000 (10:13 +1000)]
Add a spawnflag to start func_rotating off, and add a basic reset function to func_rotating

2 years agoFix bots appearing on the scoreboard as spectators when switching map with the gotoma...
terencehill [Sun, 27 Aug 2017 22:33:02 +0000 (00:33 +0200)]
Fix bots appearing on the scoreboard as spectators when switching map with the gotomap command (it doesn't remove bots of the previous match) and with minplayers > 1

2 years agoFix button not resetting, and allow wait time < 0 to mean never return
Mario [Sun, 27 Aug 2017 22:21:29 +0000 (08:21 +1000)]
Fix button not resetting, and allow wait time < 0 to mean never return

2 years agoMove _cl_playermodel back into defaultXonotic.cfg (currently used on both server...
Mario [Sun, 27 Aug 2017 19:43:51 +0000 (05:43 +1000)]
Move _cl_playermodel back into defaultXonotic.cfg (currently used on both server and client as an emergency fallback)

2 years agoMerge branch 'martin-t/okc' into 'master'
Mario [Sun, 27 Aug 2017 19:20:22 +0000 (19:20 +0000)]
Merge branch 'martin-t/okc' into 'master'

Overkill casual step 1

See merge request !464

2 years agooptimize player based respawn time 464/head
Martin Taibr [Sun, 27 Aug 2017 15:31:17 +0000 (17:31 +0200)]
optimize player based respawn time

2 years agoMerge branch 'master' into martin-t/okc
Martin Taibr [Sun, 27 Aug 2017 15:04:58 +0000 (17:04 +0200)]
Merge branch 'master' into martin-t/okc

2 years agoSet the health/armor limit to 200 and fuel limit 100 in all balance configurations...
Mario [Sun, 27 Aug 2017 13:23:12 +0000 (23:23 +1000)]
Set the health/armor limit to 200 and fuel limit 100 in all balance configurations (the 999 limit is now hardcoded)

2 years agoMerge branch 'Lyberta/GivePlayerAmmo' into 'master'
Mario [Sun, 27 Aug 2017 13:18:13 +0000 (13:18 +0000)]
Merge branch 'Lyberta/GivePlayerAmmo' into 'master'

Added GivePlayerStuff functions.

See merge request !433

2 years agoFix a typo 433/head
Mario [Sun, 27 Aug 2017 12:46:31 +0000 (22:46 +1000)]
Fix a typo

2 years agoMerge branch 'master' into Lyberta/GivePlayerAmmo
Mario [Sun, 27 Aug 2017 12:41:08 +0000 (22:41 +1000)]
Merge branch 'master' into Lyberta/GivePlayerAmmo

2 years agoDon's set allowed_timeouts for bots
terencehill [Sun, 27 Aug 2017 12:41:05 +0000 (14:41 +0200)]
Don's set allowed_timeouts for bots

2 years agoMerge branch 'TimePath/gamerules' into 'master'
TimePath [Sun, 27 Aug 2017 12:00:52 +0000 (12:00 +0000)]
Merge branch 'TimePath/gamerules' into 'master'

Lightly refactor gamemodes

See merge request !472

2 years agoGameRules: initialize as early as possible 472/head
TimePath [Sun, 27 Aug 2017 10:11:26 +0000 (20:11 +1000)]
GameRules: initialize as early as possible

2 years agoNexball: move weapon code to weapon file
TimePath [Sun, 27 Aug 2017 09:25:26 +0000 (19:25 +1000)]
Nexball: move weapon code to weapon file

2 years agogamemodes: prevent addition and removal at runtime with a single macro
TimePath [Sun, 27 Aug 2017 09:07:38 +0000 (19:07 +1000)]
gamemodes: prevent addition and removal at runtime with a single macro

2 years agoGameRules: simplify assigning teams bitmask
TimePath [Sun, 27 Aug 2017 08:34:53 +0000 (18:34 +1000)]
GameRules: simplify assigning teams bitmask

2 years agoGameRules: encapsulate scoring
TimePath [Sun, 27 Aug 2017 08:01:07 +0000 (18:01 +1000)]
GameRules: encapsulate scoring

2 years agoGameRules: encapsulate player 'VIP' status
TimePath [Sun, 27 Aug 2017 06:59:25 +0000 (16:59 +1000)]
GameRules: encapsulate player 'VIP' status

2 years agoRenamed ITEM_COUNT_HARD_LIMIT to RESOURCE_AMOUNT_HARD_LIMIT.
Lyberta [Sun, 27 Aug 2017 06:33:25 +0000 (09:33 +0300)]
Renamed ITEM_COUNT_HARD_LIMIT to RESOURCE_AMOUNT_HARD_LIMIT.

2 years agoGameRules: make `GameRules_teams(true)` imply `have_team_spawns = -1`
TimePath [Sun, 27 Aug 2017 05:53:28 +0000 (15:53 +1000)]
GameRules: make `GameRules_teams(true)` imply `have_team_spawns = -1`

2 years agoRefactor game rules
TimePath [Sun, 27 Aug 2017 05:26:41 +0000 (15:26 +1000)]
Refactor game rules

2 years agoLOG_INFO: remove 'extra' newlines
TimePath [Sun, 27 Aug 2017 03:24:58 +0000 (13:24 +1000)]
LOG_INFO: remove 'extra' newlines

2 years agoLOG_INFOF: remove 'extra' newlines
TimePath [Sun, 27 Aug 2017 02:58:18 +0000 (12:58 +1000)]
LOG_INFOF: remove 'extra' newlines

2 years agoLogging: tidy
TimePath [Sun, 27 Aug 2017 02:37:32 +0000 (12:37 +1000)]
Logging: tidy

2 years agoCMake: add qc-all target
TimePath [Sun, 27 Aug 2017 00:44:42 +0000 (10:44 +1000)]
CMake: add qc-all target

2 years agoAdded GivePlayerResource.
Lyberta [Sat, 26 Aug 2017 23:01:13 +0000 (02:01 +0300)]
Added GivePlayerResource.

2 years agoMerged master into Lyberta/GivePlayerAmmo.
Lyberta [Sat, 26 Aug 2017 18:24:14 +0000 (21:24 +0300)]
Merged master into Lyberta/GivePlayerAmmo.

2 years agoBetter hard limit check.
Lyberta [Sat, 26 Aug 2017 18:10:16 +0000 (21:10 +0300)]
Better hard limit check.

2 years agoChanged test hash.
Lyberta [Sat, 26 Aug 2017 17:52:17 +0000 (20:52 +0300)]
Changed test hash.

2 years agoReturn early in GivePlayerAmmo.
Lyberta [Sat, 26 Aug 2017 16:40:59 +0000 (19:40 +0300)]
Return early in GivePlayerAmmo.

2 years agoMoved HARD_LIMIT check a bit.
Lyberta [Sat, 26 Aug 2017 16:37:14 +0000 (19:37 +0300)]
Moved HARD_LIMIT check a bit.

2 years agoMoved HARD_LIMIT check into player_regen.
Lyberta [Sat, 26 Aug 2017 16:33:07 +0000 (19:33 +0300)]
Moved HARD_LIMIT check into player_regen.

2 years agoAdded GivePlayerFuel.
Lyberta [Sat, 26 Aug 2017 16:08:04 +0000 (19:08 +0300)]
Added GivePlayerFuel.

2 years agoMerge branch 'Mario/invasion_types' into 'master'
Mario [Sat, 26 Aug 2017 16:04:07 +0000 (16:04 +0000)]
Merge branch 'Mario/invasion_types' into 'master'

Merge branch Mario/invasion_types (M merge request)

See merge request !471

2 years agoAdded ITEM_COUNT_HARD_LIMIT.
Lyberta [Sat, 26 Aug 2017 16:00:57 +0000 (19:00 +0300)]
Added ITEM_COUNT_HARD_LIMIT.

2 years agoUse g_balance_health/armor_limit in GivePlayerStuff.
Lyberta [Sat, 26 Aug 2017 15:53:45 +0000 (18:53 +0300)]
Use g_balance_health/armor_limit in GivePlayerStuff.

2 years agoUse GivePlayerHealth in Vampire.
Lyberta [Sat, 26 Aug 2017 15:42:29 +0000 (18:42 +0300)]
Use GivePlayerHealth in Vampire.

2 years agoFix compilation unit test 471/head
Mario [Sat, 26 Aug 2017 15:34:59 +0000 (01:34 +1000)]
Fix compilation unit test

2 years agoMerge branch 'master' into Mario/invasion_types
Mario [Sat, 26 Aug 2017 15:19:52 +0000 (01:19 +1000)]
Merge branch 'master' into Mario/invasion_types

# Conflicts:
# qcsrc/server/mutators/mutator/gamemode_invasion.qc

2 years agoMerge branch 'martin-t/flag' into 'master'
Mario [Sat, 26 Aug 2017 14:05:57 +0000 (14:05 +0000)]
Merge branch 'martin-t/flag' into 'master'

Allow 3 flag throws in ctf

See merge request !470

2 years agoFix mobbutcher command
Mario [Fri, 25 Aug 2017 18:22:46 +0000 (04:22 +1000)]
Fix mobbutcher command

2 years agoupdfate hash after enabling solidpenetration trueaim for MG
Martin Taibr [Fri, 25 Aug 2017 17:54:01 +0000 (19:54 +0200)]
updfate hash after enabling solidpenetration trueaim for MG

2 years agogive MG WEP_FLAG_PENETRATEWALLS
Martin Taibr [Fri, 25 Aug 2017 15:11:56 +0000 (17:11 +0200)]
give MG WEP_FLAG_PENETRATEWALLS

2 years agoMerge branch 'master' into martin-t/okc
Martin Taibr [Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)]
Merge branch 'master' into martin-t/okc

2 years agoMerge branch 'master' into martin-t/okc
Martin Taibr [Fri, 25 Aug 2017 14:49:37 +0000 (16:49 +0200)]
Merge branch 'master' into martin-t/okc

2 years agouse set consistently in defaultOverkill
Martin Taibr [Fri, 25 Aug 2017 14:46:24 +0000 (16:46 +0200)]
use set consistently in defaultOverkill

2 years agoremove stray todo
Martin Taibr [Fri, 25 Aug 2017 14:42:32 +0000 (16:42 +0200)]
remove stray todo

2 years agodocument item respawntime scaling
Martin Taibr [Fri, 25 Aug 2017 14:42:11 +0000 (16:42 +0200)]
document item respawntime scaling

2 years agoMerge branch 'martin-t/gunalign' into 'master'
Mario [Fri, 25 Aug 2017 11:33:33 +0000 (11:33 +0000)]
Merge branch 'martin-t/gunalign' into 'master'

Gunalign

See merge request !460

2 years agoMerge branch 'martin-t/insta' into 'master'
Mario [Fri, 25 Aug 2017 11:32:38 +0000 (11:32 +0000)]
Merge branch 'martin-t/insta' into 'master'

Disable damagetext in instagib

See merge request !463

2 years agoMerge branch 'marin-t/nadectr' into 'master'
Mario [Fri, 25 Aug 2017 10:28:37 +0000 (10:28 +0000)]
Merge branch 'marin-t/nadectr' into 'master'

Remove `dppolygonoffset -6000` from nade countdown shader

See merge request !466

2 years agoDon't show Nades in the mutator list (a more in-depth message is already shown in...
Mario [Thu, 24 Aug 2017 19:19:47 +0000 (05:19 +1000)]
Don't show Nades in the mutator list (a more in-depth message is already shown in the MOTD)

2 years agopunish time 10 470/head
Martin Taibr [Thu, 24 Aug 2017 18:46:45 +0000 (20:46 +0200)]
punish time 10

2 years agoallow 3 flag throws
Martin Taibr [Thu, 24 Aug 2017 18:34:00 +0000 (20:34 +0200)]
allow 3 flag throws

2 years agoMore BITs
terencehill [Thu, 24 Aug 2017 17:34:48 +0000 (19:34 +0200)]
More BITs

2 years agoInitialize weapon_accuracy array to the default value on client start
terencehill [Thu, 24 Aug 2017 17:30:44 +0000 (19:30 +0200)]
Initialize weapon_accuracy array to the default value on client start

2 years agomake it easier to imagine
Martin Taibr [Thu, 24 Aug 2017 17:03:50 +0000 (19:03 +0200)]
make it easier to imagine

2 years agobetter document map_ranges, optimize map_bound_ranges
Martin Taibr [Thu, 24 Aug 2017 15:22:50 +0000 (17:22 +0200)]
better document map_ranges, optimize map_bound_ranges

2 years agoUpdate hash
terencehill [Wed, 23 Aug 2017 14:14:55 +0000 (16:14 +0200)]
Update hash

2 years agoReally add one bot per frame, just like the comment says. It should make server a...
terencehill [Tue, 22 Aug 2017 14:39:51 +0000 (16:39 +0200)]
Really add one bot per frame, just like the comment says. It should make server a bit more responsive on map start and maybe fixes bots appearing in the scoreboard as spectators with minplayers > 0

2 years agoMake sure local Team is an int (potential but unlikely fix for an assertion failure)
Mario [Wed, 23 Aug 2017 12:37:18 +0000 (22:37 +1000)]
Make sure local Team is an int (potential but unlikely fix for an assertion failure)

2 years agoOverkill weapons: removed old hack.
Lyberta [Tue, 22 Aug 2017 19:55:05 +0000 (22:55 +0300)]
Overkill weapons: removed old hack.

2 years agoOverkill weapons: fixed m_model.
Lyberta [Tue, 22 Aug 2017 19:53:36 +0000 (22:53 +0300)]
Overkill weapons: fixed m_model.

2 years agoAdd a temporary flag for weapons that penetrate walls (rifle), to avoid a direct...
Mario [Sun, 20 Aug 2017 11:49:54 +0000 (21:49 +1000)]
Add a temporary flag for weapons that penetrate walls (rifle), to avoid a direct weapon reference

2 years agoCall the explosion mutator hook before setting new owner, so the old owner may be...
Mario [Sun, 20 Aug 2017 07:31:56 +0000 (17:31 +1000)]
Call the explosion mutator hook before setting new owner, so the old owner may be referenced (new one is already known here)

2 years agoRemove a wasted normalize call (v is already normalized)
terencehill [Sat, 19 Aug 2017 15:24:27 +0000 (17:24 +0200)]
Remove a wasted normalize call (v is already normalized)

2 years agoAdd an anyrandom string to spawnmonster, which allows passive and hidden monsters...
Mario [Fri, 18 Aug 2017 14:57:24 +0000 (00:57 +1000)]
Add an anyrandom string to spawnmonster, which allows passive and hidden monsters to be spawned

2 years agoRevert "Hide these from game code" as it broke hud_shownames and who knows what else
terencehill [Wed, 16 Aug 2017 16:44:40 +0000 (18:44 +0200)]
Revert "Hide these from game code" as it broke hud_shownames and who knows what else

This reverts commit e1fa3eabc8786dd09a95f3bf4ccae3a9c0400d6e.

2 years agoFix a few checkpvs calls
terencehill [Wed, 16 Aug 2017 13:46:08 +0000 (15:46 +0200)]
Fix a few checkpvs calls

2 years agoRestored Overkill weapon priorities.
Lyberta [Wed, 16 Aug 2017 03:19:38 +0000 (06:19 +0300)]
Restored Overkill weapon priorities.

2 years agoMerged master into Lyberta/StandaloneOverkillWeapons.
Lyberta [Wed, 16 Aug 2017 03:10:50 +0000 (06:10 +0300)]
Merged master into Lyberta/StandaloneOverkillWeapons.

2 years agoMerge branch 'master' into Lyberta/GivePlayerAmmo
Lyberta [Wed, 16 Aug 2017 00:16:25 +0000 (03:16 +0300)]
Merge branch 'master' into Lyberta/GivePlayerAmmo

2 years agoSimplify target_give_init a bit
Mario [Tue, 15 Aug 2017 05:43:16 +0000 (15:43 +1000)]
Simplify target_give_init a bit

2 years agoPort the weapon priority cvars to ClientState
Mario [Tue, 15 Aug 2017 05:30:28 +0000 (15:30 +1000)]
Port the weapon priority cvars to ClientState

2 years agoMerge branch 'martin-t/angles' into 'master'
Mario [Sun, 13 Aug 2017 14:48:39 +0000 (14:48 +0000)]
Merge branch 'martin-t/angles' into 'master'

Document .angles and .v_angle

See merge request !447

2 years agoHide these from game code
TimePath [Sun, 13 Aug 2017 11:55:35 +0000 (21:55 +1000)]
Hide these from game code

2 years agoweapons: remove IMPLEMENTATION
TimePath [Sun, 13 Aug 2017 10:14:44 +0000 (20:14 +1000)]
weapons: remove IMPLEMENTATION

2 years agoeffects: remove IMPLEMENTATION
TimePath [Sun, 13 Aug 2017 09:45:41 +0000 (19:45 +1000)]
effects: remove IMPLEMENTATION

2 years agovehicles: remove _all
TimePath [Sun, 13 Aug 2017 09:32:54 +0000 (19:32 +1000)]
vehicles: remove _all

2 years agoturrets: remove _all
TimePath [Sun, 13 Aug 2017 09:22:53 +0000 (19:22 +1000)]
turrets: remove _all

2 years agoremove `dppolygonoffset -6000` from nade countdown shader 466/head
Martin Taibr [Sat, 12 Aug 2017 16:39:10 +0000 (18:39 +0200)]
remove `dppolygonoffset -6000` from nade countdown shader

2 years agorename variables in map_ranges()
Martin Taibr [Fri, 11 Aug 2017 15:56:41 +0000 (17:56 +0200)]
rename variables in map_ranges()

2 years agoMerge branch 'master' into martin-t/okc
Martin Taibr [Thu, 10 Aug 2017 22:43:53 +0000 (00:43 +0200)]
Merge branch 'master' into martin-t/okc

2 years agodo the lazy thing 447/head
Martin Taibr [Thu, 10 Aug 2017 22:33:04 +0000 (00:33 +0200)]
do the lazy thing

2 years agos/his/their
Martin Taibr [Thu, 10 Aug 2017 22:31:31 +0000 (00:31 +0200)]
s/his/their

2 years agodamagetext: put insta inside macro, update description 463/head
Martin Taibr [Thu, 10 Aug 2017 22:14:24 +0000 (00:14 +0200)]
damagetext: put insta inside macro, update description

2 years agomap_ranges()
Martin Taibr [Thu, 10 Aug 2017 22:02:21 +0000 (00:02 +0200)]
map_ranges()

2 years agoupdate hash after trueaim workaround
Martin Taibr [Thu, 10 Aug 2017 22:00:30 +0000 (00:00 +0200)]
update hash after trueaim workaround

2 years agoMerge branch 'Mario/cs_clientcvars' into 'master'
Mario [Wed, 9 Aug 2017 13:10:10 +0000 (13:10 +0000)]
Merge branch 'Mario/cs_clientcvars' into 'master'

Merge branch Mario/cs_clientcvars (M merge request)

See merge request !458

2 years agosimplify check_close_to_wall
Martin Taibr [Wed, 9 Aug 2017 03:44:33 +0000 (05:44 +0200)]
simplify check_close_to_wall

2 years agodisable damagetext in instagib
Martin Taibr [Tue, 8 Aug 2017 17:39:22 +0000 (19:39 +0200)]
disable damagetext in instagib

2 years agoquick and dirty fix for MG trueaim
Martin Taibr [Mon, 7 Aug 2017 20:57:25 +0000 (22:57 +0200)]
quick and dirty fix for MG trueaim

2 years agoMerge branch 'master' into martin-t/okc
Martin Taibr [Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)]
Merge branch 'master' into martin-t/okc

2 years agoSlight optimization: check client before real client
Mario [Mon, 7 Aug 2017 08:43:13 +0000 (18:43 +1000)]
Slight optimization: check client before real client

2 years agoHack the vote command parser to return an error code to avoid the incorrect 'invalid...
Mario [Mon, 7 Aug 2017 05:58:43 +0000 (15:58 +1000)]
Hack the vote command parser to return an error code to avoid the incorrect 'invalid vote' message when voting for an invalid map, also fix some warnings when a client is connecting