]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Lyberta [Sat, 26 Aug 2017 23:18:06 +0000 (02:18 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 26 Aug 2017 23:17:41 +0000 (02:17 +0300)]
Merged Lyberta/PlayerTemplates into Lyberta/Survival.
Lyberta [Sat, 26 Aug 2017 23:15:03 +0000 (02:15 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Sat, 26 Aug 2017 23:09:41 +0000 (02:09 +0300)]
Merged Lyberta/GivePlayerAmmo into Lyberta/RandomStartWeapons.
Lyberta [Sat, 26 Aug 2017 23:01:13 +0000 (02:01 +0300)]
Added GivePlayerResource.
Lyberta [Sat, 26 Aug 2017 18:24:14 +0000 (21:24 +0300)]
Merged master into Lyberta/GivePlayerAmmo.
Lyberta [Sat, 26 Aug 2017 18:10:16 +0000 (21:10 +0300)]
Better hard limit check.
Lyberta [Sat, 26 Aug 2017 17:52:17 +0000 (20:52 +0300)]
Changed test hash.
Lyberta [Sat, 26 Aug 2017 16:40:59 +0000 (19:40 +0300)]
Return early in GivePlayerAmmo.
Lyberta [Sat, 26 Aug 2017 16:37:14 +0000 (19:37 +0300)]
Moved HARD_LIMIT check a bit.
Lyberta [Sat, 26 Aug 2017 16:33:07 +0000 (19:33 +0300)]
Moved HARD_LIMIT check into player_regen.
Lyberta [Sat, 26 Aug 2017 16:08:04 +0000 (19:08 +0300)]
Added GivePlayerFuel.
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
Lyberta [Sat, 26 Aug 2017 16:00:57 +0000 (19:00 +0300)]
Added ITEM_COUNT_HARD_LIMIT.
Lyberta [Sat, 26 Aug 2017 15:53:45 +0000 (18:53 +0300)]
Use g_balance_health/armor_limit in GivePlayerStuff.
Lyberta [Sat, 26 Aug 2017 15:42:29 +0000 (18:42 +0300)]
Use GivePlayerHealth in Vampire.
Mario [Sat, 26 Aug 2017 15:34:59 +0000 (01:34 +1000)]
Fix compilation unit test
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
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
Mario [Fri, 25 Aug 2017 18:22:46 +0000 (04:22 +1000)]
Fix mobbutcher command
Mario [Fri, 25 Aug 2017 11:33:33 +0000 (11:33 +0000)]
Merge branch 'martin-t/gunalign' into 'master'
Gunalign
See merge request !460
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
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
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)
Martin Taibr [Thu, 24 Aug 2017 18:46:45 +0000 (20:46 +0200)]
punish time 10
Martin Taibr [Thu, 24 Aug 2017 18:34:00 +0000 (20:34 +0200)]
allow 3 flag throws
terencehill [Thu, 24 Aug 2017 17:34:48 +0000 (19:34 +0200)]
More BITs
terencehill [Thu, 24 Aug 2017 17:30:44 +0000 (19:30 +0200)]
Initialize weapon_accuracy array to the default value on client start
terencehill [Wed, 23 Aug 2017 14:14:55 +0000 (16:14 +0200)]
Update hash
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
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)
Lyberta [Tue, 22 Aug 2017 22:21:44 +0000 (01:21 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Tue, 22 Aug 2017 22:21:12 +0000 (01:21 +0300)]
Survival: Updated to new player template function names.
Lyberta [Tue, 22 Aug 2017 22:16:47 +0000 (01:16 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Tue, 22 Aug 2017 22:07:50 +0000 (01:07 +0300)]
Player templates: Use distinct names for hook handlers.
Lyberta [Tue, 22 Aug 2017 22:05:39 +0000 (01:05 +0300)]
Player templates: Added weapon dropping.
Lyberta [Tue, 22 Aug 2017 21:56:09 +0000 (00:56 +0300)]
Survival: Use player templates for weapon dropping.
Lyberta [Tue, 22 Aug 2017 20:03:53 +0000 (23:03 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Tue, 22 Aug 2017 20:03:26 +0000 (23:03 +0300)]
Survival: removed old header reference.
Lyberta [Tue, 22 Aug 2017 20:01:26 +0000 (23:01 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Tue, 22 Aug 2017 20:00:35 +0000 (23:00 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Tue, 22 Aug 2017 19:55:05 +0000 (22:55 +0300)]
Overkill weapons: removed old hack.
Lyberta [Tue, 22 Aug 2017 19:53:36 +0000 (22:53 +0300)]
Overkill weapons: fixed m_model.
Lyberta [Mon, 21 Aug 2017 00:54:10 +0000 (03:54 +0300)]
Moved player templates code in server directory.
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
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)
terencehill [Sat, 19 Aug 2017 15:24:27 +0000 (17:24 +0200)]
Remove a wasted normalize call (v is already normalized)
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
Lyberta [Fri, 18 Aug 2017 09:08:08 +0000 (12:08 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 18 Aug 2017 09:06:41 +0000 (12:06 +0300)]
Survival: Renamed num_random_start_weapons to random_start_weapons_count.
Lyberta [Fri, 18 Aug 2017 09:04:18 +0000 (12:04 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Fri, 18 Aug 2017 09:02:56 +0000 (12:02 +0300)]
Player templates: Renamed num_random_start_weapons to random_start_weapons_count.
Lyberta [Fri, 18 Aug 2017 08:55:23 +0000 (11:55 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Fri, 18 Aug 2017 08:53:01 +0000 (11:53 +0300)]
Renamed num_random_start_weapons to random_start_weapons_count.
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 .
terencehill [Wed, 16 Aug 2017 13:46:08 +0000 (15:46 +0200)]
Fix a few checkpvs calls
Lyberta [Wed, 16 Aug 2017 05:04:33 +0000 (08:04 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Wed, 16 Aug 2017 03:19:38 +0000 (06:19 +0300)]
Restored Overkill weapon priorities.
Lyberta [Wed, 16 Aug 2017 03:10:50 +0000 (06:10 +0300)]
Merged master into Lyberta/StandaloneOverkillWeapons.
Lyberta [Wed, 16 Aug 2017 03:07:36 +0000 (06:07 +0300)]
Merged Lyberta/Survival into Lyberta/master.
Lyberta [Wed, 16 Aug 2017 02:47:36 +0000 (05:47 +0300)]
Merged Lyberta/PlayerTemplates into Lyberta/Survival.
Lyberta [Wed, 16 Aug 2017 02:44:01 +0000 (05:44 +0300)]
Player templates: Use new random weapon cvars.
Lyberta [Wed, 16 Aug 2017 02:36:00 +0000 (05:36 +0300)]
Player templates: Use GivePlayerRandomWeapons.
Lyberta [Wed, 16 Aug 2017 02:33:45 +0000 (05:33 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Wed, 16 Aug 2017 01:40:27 +0000 (04:40 +0300)]
Documentation fix.
Lyberta [Wed, 16 Aug 2017 01:12:53 +0000 (04:12 +0300)]
Added random start weapons.
Lyberta [Wed, 16 Aug 2017 00:17:03 +0000 (03:17 +0300)]
Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/PlayerTemplates
Lyberta [Wed, 16 Aug 2017 00:16:25 +0000 (03:16 +0300)]
Merge branch 'master' into Lyberta/GivePlayerAmmo
Lyberta [Wed, 16 Aug 2017 00:13:38 +0000 (03:13 +0300)]
Player templates: Added random ammo.
Lyberta [Tue, 15 Aug 2017 23:18:47 +0000 (02:18 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Tue, 15 Aug 2017 23:11:44 +0000 (02:11 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Tue, 15 Aug 2017 23:11:05 +0000 (02:11 +0300)]
Player templates: split random weapons into separate function.
Mario [Tue, 15 Aug 2017 05:43:16 +0000 (15:43 +1000)]
Simplify target_give_init a bit
Mario [Tue, 15 Aug 2017 05:30:28 +0000 (15:30 +1000)]
Port the weapon priority cvars to ClientState
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
TimePath [Sun, 13 Aug 2017 11:55:35 +0000 (21:55 +1000)]
Hide these from game code
TimePath [Sun, 13 Aug 2017 10:14:44 +0000 (20:14 +1000)]
weapons: remove IMPLEMENTATION
TimePath [Sun, 13 Aug 2017 09:45:41 +0000 (19:45 +1000)]
effects: remove IMPLEMENTATION
TimePath [Sun, 13 Aug 2017 09:32:54 +0000 (19:32 +1000)]
vehicles: remove _all
TimePath [Sun, 13 Aug 2017 09:22:53 +0000 (19:22 +1000)]
turrets: remove _all
Martin Taibr [Sat, 12 Aug 2017 16:39:10 +0000 (18:39 +0200)]
remove `dppolygonoffset -6000` from nade countdown shader
Martin Taibr [Thu, 10 Aug 2017 22:33:04 +0000 (00:33 +0200)]
do the lazy thing
Martin Taibr [Thu, 10 Aug 2017 22:31:31 +0000 (00:31 +0200)]
s/his/their
Martin Taibr [Thu, 10 Aug 2017 22:14:24 +0000 (00:14 +0200)]
damagetext: put insta inside macro, update description
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
Martin Taibr [Tue, 8 Aug 2017 17:39:22 +0000 (19:39 +0200)]
disable damagetext in instagib
Lyberta [Mon, 7 Aug 2017 08:54:33 +0000 (11:54 +0300)]
Player templates: better random weapon code.
Mario [Mon, 7 Aug 2017 08:43:13 +0000 (18:43 +1000)]
Slight optimization: check client before real client
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
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
Lyberta [Sun, 6 Aug 2017 07:47:28 +0000 (10:47 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sun, 6 Aug 2017 07:47:11 +0000 (10:47 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Sun, 6 Aug 2017 07:46:50 +0000 (10:46 +0300)]
Merged Lyberta/TeamplayFixes_
Mario [Sun, 6 Aug 2017 04:05:56 +0000 (14:05 +1000)]
Screw up overkill
Lyberta [Sun, 6 Aug 2017 02:25:22 +0000 (05:25 +0300)]
ClientCommand_selectteam improvement.
Lyberta [Sun, 6 Aug 2017 02:18:06 +0000 (05:18 +0300)]
JoinBestTeam improvement.
Martin Taibr [Sun, 6 Aug 2017 00:57:23 +0000 (02:57 +0200)]
Merge branch 'master' into martin-t/defaults
TimePath [Sat, 5 Aug 2017 14:07:45 +0000 (00:07 +1000)]
server: remove _all
Added REGISTRY_DEPENDS
TimePath [Sat, 5 Aug 2017 11:10:39 +0000 (21:10 +1000)]
menu: remove _all
TimePath [Sat, 5 Aug 2017 10:58:46 +0000 (20:58 +1000)]
client: remove _all