]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Lyberta [Sun, 21 Jan 2018 03:07:43 +0000 (06:07 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sun, 21 Jan 2018 03:06:42 +0000 (06:06 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Sun, 21 Jan 2018 03:06:17 +0000 (06:06 +0300)]
Merge branch 'master' into Lyberta/PlayerTemplates
Mario [Sun, 21 Jan 2018 00:42:31 +0000 (00:42 +0000)]
Merge branch 'Lyberta/OKRPCSpawnFix' into 'master'
Fixed RPC not spawning in Overkill.
Closes #1972
See merge request xonotic/xonotic-data.pk3dir!518
Mario [Sun, 21 Jan 2018 00:37:25 +0000 (00:37 +0000)]
Merge branch 'Lyberta/InstagibNoalignFix' into 'master'
Fixed noalign handling in Instagib.
See merge request xonotic/xonotic-data.pk3dir!520
Lyberta [Sat, 20 Jan 2018 17:24:27 +0000 (20:24 +0300)]
Merge branch 'Lyberta/InstagibNoalignFix' into Lyberta/master
Lyberta [Sat, 20 Jan 2018 16:11:26 +0000 (19:11 +0300)]
Fixed noalign handling in Instagib.
Mario [Sat, 20 Jan 2018 05:57:30 +0000 (15:57 +1000)]
Make side-scrolling aiming much more accurate and use regular crosshairs instead of a cursor
Mario [Thu, 18 Jan 2018 13:12:30 +0000 (23:12 +1000)]
Double check g_physics_clientselect_default
Mario [Thu, 18 Jan 2018 13:10:23 +0000 (23:10 +1000)]
Undo last attempt
Mario [Thu, 18 Jan 2018 12:50:10 +0000 (22:50 +1000)]
Attempt to optimise physics valid checking by using a custom word checker
Mario [Thu, 18 Jan 2018 12:13:03 +0000 (22:13 +1000)]
Optimise nade code slightly
Mario [Mon, 15 Jan 2018 09:03:19 +0000 (19:03 +1000)]
Allow dual wielding crylink (not as broken as it seemed)
Mario [Sun, 14 Jan 2018 23:31:00 +0000 (09:31 +1000)]
Make simple items bob
Lyberta [Sat, 13 Jan 2018 13:32:44 +0000 (16:32 +0300)]
Merge branch 'Lyberta/RSWFix' into Lyberta/master
Lyberta [Sat, 13 Jan 2018 06:15:53 +0000 (09:15 +0300)]
Disabled giving random start weapons in Instagib and Overkill.
Lyberta [Sat, 13 Jan 2018 03:44:33 +0000 (06:44 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Sat, 13 Jan 2018 03:44:05 +0000 (06:44 +0300)]
Merge branch 'Lyberta/OKRPCSpawnFix' into Lyberta/StandaloneOverkillWeapons
Lyberta [Sat, 13 Jan 2018 03:38:37 +0000 (06:38 +0300)]
Fixed RPC not spawning in Overkill.
Lyberta [Mon, 8 Jan 2018 16:09:16 +0000 (19:09 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 8 Jan 2018 16:08:44 +0000 (19:08 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Mon, 8 Jan 2018 16:07:28 +0000 (19:07 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Mon, 8 Jan 2018 16:06:59 +0000 (19:06 +0300)]
Merge branch 'master' into Lyberta/PlayerTemplates
Mirio [Thu, 4 Jan 2018 16:14:14 +0000 (17:14 +0100)]
Improve default scoreboard columns
Mario [Thu, 4 Jan 2018 02:17:27 +0000 (12:17 +1000)]
Properly support team field on trigger_multiple
Mario [Mon, 1 Jan 2018 14:17:00 +0000 (00:17 +1000)]
Don't draw viewlocation cursor or force angles as a spectator
Mario [Mon, 1 Jan 2018 09:17:08 +0000 (19:17 +1000)]
Hopefully fix compilation unit
Mario [Mon, 1 Jan 2018 05:58:56 +0000 (05:58 +0000)]
Merge branch 'Player_2/ScrollingCamera' into 'master'
Cleaned up viewloc.qc and added free-aiming cursor support.
See merge request xonotic/xonotic-data.pk3dir!516
Micah Talkiewicz [Mon, 1 Jan 2018 05:42:22 +0000 (00:42 -0500)]
Cleaned up viewloc.qc and added free-aiming cursor support.
Mirio [Sun, 31 Dec 2017 14:54:53 +0000 (14:54 +0000)]
Merge branch 'Lyberta/BlockInstagibPowerups' into 'master'
Made Invisibility and Speed to be instagib only for now.
Closes #1970
See merge request xonotic/xonotic-data.pk3dir!514
Mirio [Sun, 31 Dec 2017 12:37:10 +0000 (12:37 +0000)]
Merge branch 'typo' into 'master'
Fix typo
See merge request xonotic/xonotic-data.pk3dir!515
Mario [Sun, 31 Dec 2017 01:41:26 +0000 (11:41 +1000)]
Fix powerups abusing the count field for respawn counters (breaks compatibility with Quake 3 entities)
packer- [Sat, 30 Dec 2017 18:11:43 +0000 (18:11 +0000)]
Fix typo
Lyberta [Sat, 30 Dec 2017 18:06:59 +0000 (21:06 +0300)]
Made Invisibility and Speed to be instagib only for now.
Mario [Sat, 30 Dec 2017 06:27:06 +0000 (16:27 +1000)]
Offset 3rd person grappling hook by player's view offset
Mario [Sat, 30 Dec 2017 06:24:20 +0000 (16:24 +1000)]
Fix stuck reticle in side-scrolling mode, and partially fix aiming in free-aim side-scrolling mode
Mario [Sat, 30 Dec 2017 01:59:03 +0000 (11:59 +1000)]
Exclude mortar from dual wielding (bouncing grenades don't collide well)
Mario [Wed, 27 Dec 2017 14:41:56 +0000 (00:41 +1000)]
Since viewlocation only applies to players, use a much cheaper loop through clients
Mario [Wed, 27 Dec 2017 08:13:00 +0000 (18:13 +1000)]
Hopefully fix compilation unit
Mario [Wed, 27 Dec 2017 06:25:39 +0000 (16:25 +1000)]
Add a spawnflag to allow free aiming in side-scrolling mode
Mario [Wed, 27 Dec 2017 00:28:59 +0000 (10:28 +1000)]
When chase_active is enabled either way, force player position for hook origin
Mario [Tue, 26 Dec 2017 14:09:06 +0000 (00:09 +1000)]
Reload all weapon slots regardless of g_weaponswitch_debug setting
Mario [Tue, 26 Dec 2017 13:40:12 +0000 (23:40 +1000)]
Reduce potential lag by only looping through a limited number of items (may increase the number of tries later if needed)
Mario [Tue, 26 Dec 2017 11:34:39 +0000 (21:34 +1000)]
Fix compile
Mario [Tue, 26 Dec 2017 11:17:33 +0000 (21:17 +1000)]
Muffle weapon sounds slightly while dual wielding (ugly hax)
Mario [Tue, 26 Dec 2017 10:18:18 +0000 (20:18 +1000)]
To be extra safe, also make sure it isn't an electro orb from another player
Mario [Tue, 26 Dec 2017 10:16:10 +0000 (20:16 +1000)]
Fix electro orbs sticking to eachother in some cases
Mario [Tue, 26 Dec 2017 00:18:29 +0000 (10:18 +1000)]
Exclude rifle from dual wielding
Mario [Sat, 23 Dec 2017 13:47:12 +0000 (23:47 +1000)]
Fix selected maps in the menu not being saved
terencehill [Fri, 22 Dec 2017 23:16:47 +0000 (00:16 +0100)]
Fix wrong jumppad push when entity that is to be pushed has a gravity factor different from 1
Lyberta [Mon, 4 Dec 2017 18:29:04 +0000 (21:29 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Mon, 4 Dec 2017 18:28:50 +0000 (21:28 +0300)]
OK weapons: Updated CI hash.
Lyberta [Mon, 4 Dec 2017 17:58:10 +0000 (20:58 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Mon, 4 Dec 2017 17:55:51 +0000 (20:55 +0300)]
OK weapons: Added secondary blaster during countdown.
Mario [Sun, 3 Dec 2017 06:43:42 +0000 (06:43 +0000)]
Merge branch 'DefaultUser/HUD_teamkill_position' into 'master'
Scoreboard: Fix position of "teamkills" field
See merge request xonotic/xonotic-data.pk3dir!510
Mario [Sun, 3 Dec 2017 06:43:17 +0000 (16:43 +1000)]
Remove some unused cvar from config
Lyberta [Sat, 2 Dec 2017 17:59:45 +0000 (20:59 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 2 Dec 2017 17:59:21 +0000 (20:59 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Sat, 2 Dec 2017 17:58:54 +0000 (20:58 +0300)]
Player templates: Reset weapons before giving them during spawn.
Mario [Sat, 2 Dec 2017 16:22:13 +0000 (16:22 +0000)]
Merge branch 'Lyberta/TeamplayFixes2' into 'master'
Hardening of several teamplay functions.
See merge request xonotic/xonotic-data.pk3dir!507
Freddy [Sat, 2 Dec 2017 16:12:04 +0000 (17:12 +0100)]
Scoreboard: Fix position of "teamkills" field
Lyberta [Sat, 2 Dec 2017 15:58:30 +0000 (18:58 +0300)]
Merge branch 'Lyberta/TeamplayFixes2' into Lyberta/master
Lyberta [Sat, 2 Dec 2017 15:57:35 +0000 (18:57 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 2 Dec 2017 15:56:25 +0000 (18:56 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Sat, 2 Dec 2017 15:56:01 +0000 (18:56 +0300)]
Merge branch 'master' into Lyberta/PlayerTemplates
Lyberta [Sat, 2 Dec 2017 15:55:11 +0000 (18:55 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Sat, 2 Dec 2017 15:51:57 +0000 (18:51 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes2
Mario [Sat, 2 Dec 2017 02:01:45 +0000 (02:01 +0000)]
Merge branch 'Lyberta/NoalignFix' into 'master'
Fixed noalign handling in random items and overkill.
See merge request xonotic/xonotic-data.pk3dir!509
Lyberta [Fri, 1 Dec 2017 20:11:48 +0000 (23:11 +0300)]
Fixed AutoBalanceBots fully this time.
Lyberta [Fri, 1 Dec 2017 18:40:33 +0000 (21:40 +0300)]
Fixed noalign handling in random items and overkill.
Mario [Fri, 1 Dec 2017 14:09:17 +0000 (00:09 +1000)]
Always link edict for clients (matches engine physics)
Mario [Fri, 1 Dec 2017 06:43:36 +0000 (06:43 +0000)]
Merge branch 'Lyberta/target_giveFix' into 'master'
target_give now uses new classnames.
See merge request xonotic/xonotic-data.pk3dir!508
Lyberta [Fri, 1 Dec 2017 06:23:45 +0000 (09:23 +0300)]
target_give now uses new classnames.
Mario [Fri, 1 Dec 2017 01:50:49 +0000 (11:50 +1000)]
Don't update the weapon's classname on spawn (we still need the old name for compatibility)
Mario [Wed, 29 Nov 2017 07:18:39 +0000 (17:18 +1000)]
Antilag nades so they can be shot at high ping
Lyberta [Tue, 28 Nov 2017 10:10:13 +0000 (13:10 +0300)]
Grammar fix.
Lyberta [Tue, 28 Nov 2017 09:45:24 +0000 (12:45 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes2
Lyberta [Tue, 28 Nov 2017 09:20:05 +0000 (12:20 +0300)]
Hardening of several teamplay functions.
Mario [Mon, 27 Nov 2017 01:29:57 +0000 (01:29 +0000)]
Merge branch 'Mario/target_teleporter_v2' into 'master'
Merge branch Mario/target_teleporter_v2 (S merge request)
See merge request xonotic/xonotic-data.pk3dir!455
Mario [Sun, 26 Nov 2017 13:34:19 +0000 (23:34 +1000)]
Fix compilation unit test (hopefully)
Mario [Sun, 26 Nov 2017 12:45:13 +0000 (22:45 +1000)]
Fix the field 0 warning spam at the start of every match
Mario [Sat, 25 Nov 2017 10:26:31 +0000 (20:26 +1000)]
Take armor into consideration for the crosshair color by health
Mario [Sat, 25 Nov 2017 06:51:10 +0000 (06:51 +0000)]
Merge branch 'DefaultUser/kick_teamkiller' into 'master'
Add a mutator to automatically kick teamkilling trolls after a certain amount of teamkills
See merge request xonotic/xonotic-data.pk3dir!493
Lyberta [Sat, 25 Nov 2017 06:50:00 +0000 (09:50 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Nov 2017 06:49:27 +0000 (09:49 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Sat, 25 Nov 2017 06:48:33 +0000 (09:48 +0300)]
Merge branch 'master' into Lyberta/PlayerTemplates
Lyberta [Sat, 25 Nov 2017 06:47:42 +0000 (09:47 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Mario [Sat, 25 Nov 2017 06:37:25 +0000 (16:37 +1000)]
Merge branch 'master' into DefaultUser/kick_teamkiller
# Conflicts:
# mutators.cfg
Lyberta [Sat, 25 Nov 2017 06:09:30 +0000 (09:09 +0300)]
OK weapons: Synced with master.
Lyberta [Sat, 25 Nov 2017 04:34:02 +0000 (07:34 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
Mario [Sat, 25 Nov 2017 03:35:58 +0000 (03:35 +0000)]
Merge branch 'Lyberta/RandomItems' into 'master'
Random items mutator and item system revamp
See merge request xonotic/xonotic-data.pk3dir!499
Mario [Sat, 25 Nov 2017 03:24:47 +0000 (13:24 +1000)]
Merge branch 'master' into Lyberta/RandomItems
# Conflicts:
# mutators.cfg
Lyberta [Sat, 25 Nov 2017 03:17:26 +0000 (06:17 +0300)]
Random items: Split most cvars into separate file.
Mario [Sat, 25 Nov 2017 02:51:49 +0000 (12:51 +1000)]
Update hash
Lyberta [Sat, 25 Nov 2017 02:49:54 +0000 (05:49 +0300)]
Random items: Use noalign value set by mapper.
Lyberta [Sat, 25 Nov 2017 02:44:09 +0000 (05:44 +0300)]
Random items: Added checks for cvar existence.
Mario [Sat, 25 Nov 2017 02:36:33 +0000 (02:36 +0000)]
Merge branch 'martin-t/aesinfo' into 'master'
Show tooltip mentioning crypto_aeslevel on the join dialog (tiny MR)
See merge request xonotic/xonotic-data.pk3dir!478
Lyberta [Sat, 25 Nov 2017 02:06:45 +0000 (05:06 +0300)]
Added no_align option to Item_Create.
Mario [Sat, 25 Nov 2017 01:29:58 +0000 (11:29 +1000)]
Merge branch 'master' into DefaultUser/kick_teamkiller
# Conflicts:
# mutators.cfg
projects / xonotic / xonotic-data.pk3dir.git / log