xonotic/xonotic-data.pk3dir.git
3 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

3 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

3 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

3 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

3 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

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

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

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

3 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.

3 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`

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

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

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

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

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

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

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

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

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

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

3 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.

3 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.

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

3 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

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

3 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.

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

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

3 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

3 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

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

3 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

3 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

3 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

3 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)

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

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

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

3 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

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

3 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

3 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)

3 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

3 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)

3 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)

3 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

3 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.

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

3 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

3 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

3 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

3 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

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

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

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

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

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

3 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

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

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

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

3 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

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

3 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

3 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

3 years agoMerge branch 'martin-t/defaults' into 'master'
Mario [Mon, 7 Aug 2017 05:23:18 +0000 (05:23 +0000)]
Merge branch 'martin-t/defaults' into 'master'

Split defaultXonotic to server and client

See merge request !459

3 years agoScrew up overkill
Mario [Sun, 6 Aug 2017 04:05:56 +0000 (14:05 +1000)]
Screw up overkill

3 years agoMerge branch 'master' into martin-t/defaults
Martin Taibr [Sun, 6 Aug 2017 00:57:23 +0000 (02:57 +0200)]
Merge branch 'master' into martin-t/defaults

3 years agoserver: remove _all
TimePath [Sat, 5 Aug 2017 14:07:45 +0000 (00:07 +1000)]
server: remove _all

Added REGISTRY_DEPENDS

3 years agomenu: remove _all
TimePath [Sat, 5 Aug 2017 11:10:39 +0000 (21:10 +1000)]
menu: remove _all

3 years agoclient: remove _all
TimePath [Sat, 5 Aug 2017 10:58:46 +0000 (20:58 +1000)]
client: remove _all

3 years agoMerge branch 'master' into Mario/cs_clientcvars
Mario [Sat, 5 Aug 2017 10:03:59 +0000 (20:03 +1000)]
Merge branch 'master' into Mario/cs_clientcvars

# Conflicts:
# qcsrc/server/client.qh

3 years agoStyle: expand LAMBDA()
TimePath [Sat, 5 Aug 2017 08:37:08 +0000 (18:37 +1000)]
Style: expand LAMBDA()

3 years agoLint
TimePath [Sat, 5 Aug 2017 07:14:46 +0000 (17:14 +1000)]
Lint

3 years agoUpdate CMakeLists.txt
TimePath [Wed, 2 Aug 2017 12:38:07 +0000 (22:38 +1000)]
Update CMakeLists.txt

3 years agoMerge branch 'Lyberta/RPCImpulseFix' into 'master'
Mario [Sat, 5 Aug 2017 01:16:37 +0000 (01:16 +0000)]
Merge branch 'Lyberta/RPCImpulseFix' into 'master'

RPC has now the same impulse as Devastator.

See merge request !462

3 years agoRPC has now the same impulse as Devastator. 462/head
Lyberta [Sat, 5 Aug 2017 00:58:32 +0000 (03:58 +0300)]
RPC has now the same impulse as Devastator.

3 years agoGive the DamageInfo hook a couple of useful parameters
Mario [Sat, 5 Aug 2017 00:29:20 +0000 (10:29 +1000)]
Give the DamageInfo hook a couple of useful parameters

3 years agoAdd a hook to DamageInfo, to allow mutators and mods to add their own explosion effec...
Mario [Sat, 5 Aug 2017 00:24:09 +0000 (10:24 +1000)]
Add a hook to DamageInfo, to allow mutators and mods to add their own explosion effects for new deathtypes

3 years agoSome optimizations to client side items and spawn points
Mario [Fri, 4 Aug 2017 06:48:33 +0000 (16:48 +1000)]
Some optimizations to client side items and spawn points

3 years agoColorTranslateRGB is meant to be used only by the client (server doesn't initialize...
terencehill [Wed, 2 Aug 2017 11:06:16 +0000 (13:06 +0200)]
ColorTranslateRGB is meant to be used only by the client (server doesn't initialize ColorTranslateMode)

3 years agoClean up HUD_Mod_Race a little bit
terencehill [Wed, 2 Aug 2017 11:03:22 +0000 (13:03 +0200)]
Clean up HUD_Mod_Race a little bit

3 years agoFix spiderbot referencing clientstate buttons
Mario [Tue, 1 Aug 2017 08:02:37 +0000 (18:02 +1000)]
Fix spiderbot referencing clientstate buttons

3 years agoBlacklist a couple of cvars
Mario [Mon, 31 Jul 2017 04:56:04 +0000 (14:56 +1000)]
Blacklist a couple of cvars

3 years agoMerge branch 'terencehill/rounded_times' into 'master'
terencehill [Sun, 30 Jul 2017 16:30:13 +0000 (16:30 +0000)]
Merge branch 'terencehill/rounded_times' into 'master'

Rounded times

See merge request !408

3 years agoHopefully fix a disconnect caused by mismatching reads/writes in the next qualifying...
Mario [Sun, 30 Jul 2017 06:46:07 +0000 (16:46 +1000)]
Hopefully fix a disconnect caused by mismatching reads/writes in the next qualifying checkpoint and spectators

3 years agoAdd a mutator hook to disable model/color forcing
Mario [Sun, 30 Jul 2017 04:03:26 +0000 (14:03 +1000)]
Add a mutator hook to disable model/color forcing

3 years agoremove mentions of removed cvar
Martin Taibr [Sat, 29 Jul 2017 19:45:28 +0000 (21:45 +0200)]
remove mentions of removed cvar

3 years agoRound ctf times displayed in the console so they represent more closely the original...
terencehill [Mon, 30 Jan 2017 08:40:22 +0000 (09:40 +0100)]
Round ctf times displayed in the console so they represent more closely the original times

3 years agoProperly round race times since they seem to always match timer display (that 0.4...
terencehill [Mon, 30 Jan 2017 08:37:28 +0000 (09:37 +0100)]
Properly round race times since they seem to always match timer display (that 0.4 was introduced when race times were to 1 decimal place)

3 years agoIndent sys_phys_monitor call
terencehill [Sat, 29 Jul 2017 09:15:29 +0000 (11:15 +0200)]
Indent sys_phys_monitor call

3 years agoClean up 2 WarpZoneLib functions
terencehill [Sat, 29 Jul 2017 09:14:45 +0000 (11:14 +0200)]
Clean up 2 WarpZoneLib functions

3 years agoMerge branch 'Mario/addtolist_cleanup' into 'master'
Mario [Fri, 28 Jul 2017 21:26:22 +0000 (21:26 +0000)]
Merge branch 'Mario/addtolist_cleanup' into 'master'

Merge branch Mario/addtolist_cleanup (XS merge request)

See merge request !452

3 years agoUpdate hash
Mario [Fri, 28 Jul 2017 21:16:50 +0000 (07:16 +1000)]
Update hash

3 years agoOnly run PM_UpdateButtons on real clients (bots don't receive client input)
Mario [Fri, 28 Jul 2017 20:21:18 +0000 (06:21 +1000)]
Only run PM_UpdateButtons on real clients (bots don't receive client input)

3 years agoMerge branch 'master' into martin-t/defaults
Martin Taibr [Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)]
Merge branch 'master' into martin-t/defaults

3 years agoPotential fix for crazy amount of race checkpoint waypoints on some maps
Mario [Thu, 20 Jul 2017 19:21:25 +0000 (05:21 +1000)]
Potential fix for crazy amount of race checkpoint waypoints on some maps

3 years agoAdd a mutator hook to override hud_contents
Mario [Wed, 19 Jul 2017 20:43:15 +0000 (06:43 +1000)]
Add a mutator hook to override hud_contents

3 years agoMerge branch 'master' into martin-t/defaults
Martin Taibr [Wed, 19 Jul 2017 13:55:20 +0000 (15:55 +0200)]
Merge branch 'master' into martin-t/defaults

3 years agoMerge branch 'martin-t/units' into 'master'
TimePath [Wed, 19 Jul 2017 09:53:11 +0000 (09:53 +0000)]
Merge branch 'martin-t/units' into 'master'

Make qcsrc/tools/compilationunits.sh clean up after itself

See merge request !450