]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Wed, 12 Oct 2016 22:53:23 +0000 (08:53 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Mario [Wed, 12 Oct 2016 22:51:33 +0000 (08:51 +1000)]
Accept balance hash change
Mario [Wed, 12 Oct 2016 21:53:51 +0000 (07:53 +1000)]
Merge remote-tracking branch 'origin/DefaultUser/overkill_filteritem_fix'
Freddy [Wed, 12 Oct 2016 21:49:43 +0000 (23:49 +0200)]
Fix the g_overkill_filter_* cvars
Mario [Wed, 12 Oct 2016 17:05:52 +0000 (03:05 +1000)]
Add an option to apply gravity on slick surfaces (so one slides down slopes)
Mario [Wed, 12 Oct 2016 14:48:10 +0000 (14:48 +0000)]
Merge branch 'DefaultUser/overkill_cvars' into 'master'
Minor cleanup for overkill
Reuse g_pickup_respawntime_superweapon for overkill superweapons instead of g_overkill_superguns_respawn_time.
Replace poorly named cvars g_overkill_100h_anyway and g_overkill_100a_anyway.
Add cvars to filter out 25 and 50 armor for overkill
See merge request !375
Freddy [Wed, 12 Oct 2016 14:39:46 +0000 (16:39 +0200)]
Improve overkill item filter cvars
Mario [Wed, 12 Oct 2016 14:17:56 +0000 (00:17 +1000)]
Split XPM servers into their own "Competitive Mode" category
Mario [Wed, 12 Oct 2016 05:20:02 +0000 (15:20 +1000)]
Add a placeholder icon for Jeff's mod
Mario [Wed, 12 Oct 2016 04:54:57 +0000 (04:54 +0000)]
Merge branch 'DefaultUser/insta_ammo' into 'master'
InstaGib: add cvars to convert ammo packs into insta cells
Some maps have few insta cells, on others they're unevenly distributed. This helps server admins to easily change that fact
See merge request !374
Mario [Wed, 12 Oct 2016 04:53:15 +0000 (14:53 +1000)]
Fix mutators not setting modname
Mario [Tue, 11 Oct 2016 17:00:41 +0000 (03:00 +1000)]
Reset viewloc when respawning, and link it with spectatee (should fix spectating sidescrollers)
Mario [Tue, 11 Oct 2016 07:50:30 +0000 (17:50 +1000)]
Update physics stats on connect (fixes sometimes spawning inside the floor)
Freddy [Mon, 10 Oct 2016 20:59:20 +0000 (22:59 +0200)]
Remove 2 unused fields from sv_overkill.qc
Freddy [Mon, 10 Oct 2016 19:16:13 +0000 (21:16 +0200)]
Don't remove 25a and 50a in overkill in the default config
Freddy [Mon, 10 Oct 2016 18:22:48 +0000 (20:22 +0200)]
Replace g_overkill_100a_anyways and g_overkill_100h_anyways
New cvars g_overkill_healthmega_remove, g_overkill_armormedium_remove
g_overkill_armorbig_remove and g_overkill_armorlarge_remove determine
what items are removed, unlike how the old cvars did
Freddy [Mon, 10 Oct 2016 15:35:32 +0000 (17:35 +0200)]
Remove g_overkill_superguns_respawn_time
Instead use g_pickup_respawntime_superweapon like other superweapons
Freddy [Mon, 10 Oct 2016 14:24:27 +0000 (16:24 +0200)]
InstaGib: add cvars to convert ammo packs into insta cells
Mario [Sun, 9 Oct 2016 05:04:27 +0000 (15:04 +1000)]
Restore behaviour after respawning if func_breakable is set to destroy when triggered
Mario [Sun, 9 Oct 2016 02:59:33 +0000 (12:59 +1000)]
Move networked wepent to a separate entity (fixes server side stuff like nades and flashes)
Mario [Sun, 9 Oct 2016 01:52:39 +0000 (11:52 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Sat, 8 Oct 2016 20:36:33 +0000 (06:36 +1000)]
Update oldmovement on server too
Mario [Sat, 8 Oct 2016 18:34:13 +0000 (04:34 +1000)]
Keep player size and view offset stats up to date
Mario [Sat, 8 Oct 2016 18:23:36 +0000 (04:23 +1000)]
Improve bandwidth of client walls
Mario [Sat, 8 Oct 2016 18:07:17 +0000 (04:07 +1000)]
Fix trigger_delay
Mario [Sat, 8 Oct 2016 17:41:26 +0000 (03:41 +1000)]
Copy antiwall flag (fixes delayed antiwall triggers)
Mario [Sat, 8 Oct 2016 17:03:25 +0000 (03:03 +1000)]
Don't overwrite the .pressedkeys field (abused by other things)
Mario [Sat, 8 Oct 2016 14:41:21 +0000 (00:41 +1000)]
Merge branch 'master' into Mario/wepent_experimental
Mario [Sat, 8 Oct 2016 14:25:08 +0000 (00:25 +1000)]
Disable unpressing attack on weapon switching by default
Mario [Sat, 8 Oct 2016 13:17:47 +0000 (23:17 +1000)]
Disable midair combos (generally not well received test feature)
Mario [Sat, 8 Oct 2016 13:10:05 +0000 (23:10 +1000)]
Remove spread from electro and hagar attacks (merge request for these changes was approved)
Mario [Sat, 8 Oct 2016 12:24:36 +0000 (22:24 +1000)]
Accept sv_stepheight changes (partially gameplay-relevant, mostly used to make old Nexuiz maps functional, as the default prevents walking up most steps and ledges on older maps)
Mario [Sat, 8 Oct 2016 12:06:41 +0000 (22:06 +1000)]
Consider g_physics_clientselect a server friendly option
Mario [Sat, 8 Oct 2016 11:59:33 +0000 (21:59 +1000)]
Count another mutator as gameplay-irrelevant
Mario [Sat, 8 Oct 2016 11:53:06 +0000 (21:53 +1000)]
Consider g_norecoil an acceptable change
Mario [Sat, 8 Oct 2016 11:51:55 +0000 (21:51 +1000)]
Undefine BADPRESUFFIX too
Mario [Sat, 8 Oct 2016 11:48:30 +0000 (21:48 +1000)]
g_buffs is an acceptable change, like g_powerups
Mario [Sat, 8 Oct 2016 11:47:22 +0000 (21:47 +1000)]
Don't spawn buffs on maps that lack spawnpoints by default
Mario [Sat, 8 Oct 2016 11:22:26 +0000 (21:22 +1000)]
Restore default crylink and don't use weaponreplace on machinegun in experimental balance
Mario [Sat, 8 Oct 2016 11:13:51 +0000 (21:13 +1000)]
Tweak arc as well (bolt attack remains disabled by default), also whitelist another gameplay-irrelevant cvar
Mario [Sat, 8 Oct 2016 11:04:13 +0000 (21:04 +1000)]
Tweak default shockwave balance
Mario [Sat, 8 Oct 2016 10:47:55 +0000 (20:47 +1000)]
Accept balance change hash
Mario [Sat, 8 Oct 2016 10:26:49 +0000 (20:26 +1000)]
Ignore a few gameplay-irrelevant cvars
Mario [Fri, 7 Oct 2016 19:33:19 +0000 (19:33 +0000)]
Merge branch 'martin-t/random' into 'master'
refactor RandomSelection, add a field for vector
See merge request !373
Martin Taibr [Fri, 7 Oct 2016 19:19:37 +0000 (21:19 +0200)]
refactor RandomSelection, add a field for vector
Mario [Fri, 7 Oct 2016 09:25:18 +0000 (19:25 +1000)]
Add an entity parameter to entcs net props
Mario [Fri, 7 Oct 2016 08:17:12 +0000 (18:17 +1000)]
Temporary fix for warning spam on map start
Mario [Fri, 7 Oct 2016 08:14:19 +0000 (18:14 +1000)]
Silence a weapon entity warning when first connecting
Mario [Thu, 6 Oct 2016 12:54:47 +0000 (22:54 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Mario [Thu, 6 Oct 2016 12:49:45 +0000 (12:49 +0000)]
Merge branch 'terencehill/overkill_stuff' into 'master'
Overkill stuff
It addresses issues reported in #1815. It closes #1815
See merge request !371
Mario [Thu, 6 Oct 2016 10:10:28 +0000 (20:10 +1000)]
Move tuba instrument networking to the weapon entity
Mario [Wed, 5 Oct 2016 22:14:16 +0000 (08:14 +1000)]
Overkill balance: use regen pause of 2 seconds
terencehill [Wed, 5 Oct 2016 14:24:13 +0000 (16:24 +0200)]
Overkill's default g_balance_pause_health_regen value should be 2 (previously overkill used 2 as hardcoded value)
terencehill [Wed, 5 Oct 2016 14:03:37 +0000 (16:03 +0200)]
Merge branch 'master' into terencehill/overkill_stuff
Mario [Wed, 5 Oct 2016 13:36:15 +0000 (23:36 +1000)]
Fix compilation unit test
Mario [Wed, 5 Oct 2016 13:13:41 +0000 (13:13 +0000)]
Merge branch 'terencehill/timeout_countdown_fix' into 'master'
Timeout countdown fix
Make timeout countdown message immediately fully visible otherwise it stays almost invisible as it starts fading in VERY slowly (due to slowmo being set to 0.0001 during a timeout)
See merge request !370
Mario [Wed, 5 Oct 2016 12:32:41 +0000 (22:32 +1000)]
Support independent held porto angles
Mario [Wed, 5 Oct 2016 12:16:06 +0000 (22:16 +1000)]
Make port-o-launch show its lines for both weapon entities
Mario [Wed, 5 Oct 2016 11:52:41 +0000 (21:52 +1000)]
Find arc if held, to support hit sounds
Mario [Wed, 5 Oct 2016 11:48:09 +0000 (21:48 +1000)]
Clean up some slot 0 cases on client (fixes reticles)
Mario [Wed, 5 Oct 2016 10:59:45 +0000 (20:59 +1000)]
Fix another hardcoded slot 0 case
Mario [Wed, 5 Oct 2016 10:53:00 +0000 (20:53 +1000)]
Remove the old weapon stats
Mario [Wed, 5 Oct 2016 09:16:34 +0000 (19:16 +1000)]
Merge branch 'master' into Mario/wepent_experimental
# Conflicts:
# qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Mario [Wed, 5 Oct 2016 09:13:30 +0000 (19:13 +1000)]
Port nexball ball held too long by team message to the notifications system, also fix ball not properly resetting in this case
Mario [Wed, 5 Oct 2016 08:58:04 +0000 (18:58 +1000)]
Purge some more 0 slot cases
Mario [Wed, 5 Oct 2016 07:24:29 +0000 (17:24 +1000)]
Unhardcode a few more 0 slot cases
Mario [Wed, 5 Oct 2016 06:38:35 +0000 (16:38 +1000)]
Purge hardcoded slot 0 weapon entity use from most of the bot AI
Mario [Wed, 5 Oct 2016 04:20:45 +0000 (14:20 +1000)]
Fix excessive rocket jump force
Mario [Tue, 4 Oct 2016 17:59:55 +0000 (03:59 +1000)]
Clean up old remote jump feature, no longer consumes extra CPU time whenever a rocket is detonated
Mario [Tue, 4 Oct 2016 09:53:59 +0000 (19:53 +1000)]
Make vortex switch delay match other weapons
Mario [Tue, 4 Oct 2016 03:02:16 +0000 (13:02 +1000)]
Adopt some overkill balance changes from the LX server configs
Mario [Mon, 3 Oct 2016 15:13:43 +0000 (01:13 +1000)]
Add an option to disable the extra weapon on switch
Mario [Mon, 3 Oct 2016 14:58:09 +0000 (00:58 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:57:33 +0000 (00:57 +1000)]
Fix mines getting stuck at world origin
Mario [Mon, 3 Oct 2016 14:54:12 +0000 (00:54 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:53:57 +0000 (00:53 +1000)]
Possible fix for minelayer mines
Mario [Mon, 3 Oct 2016 14:48:36 +0000 (00:48 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:48:22 +0000 (00:48 +1000)]
Hopefully fix mine layer and seeker to be weapon entity independent
Mario [Mon, 3 Oct 2016 14:36:34 +0000 (00:36 +1000)]
Revert owner check (breaks projectile prediction)
Mario [Mon, 3 Oct 2016 14:15:09 +0000 (00:15 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:14:50 +0000 (00:14 +1000)]
Give wr_setup a weaponentity parameter so it isn't resetting the other weapon entities on switch
Mario [Mon, 3 Oct 2016 13:43:20 +0000 (23:43 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 13:43:02 +0000 (23:43 +1000)]
Don't explode projectiles if they have the same owner
Mario [Mon, 3 Oct 2016 13:06:11 +0000 (23:06 +1000)]
Fix start items in some special arena mutators
Mario [Mon, 3 Oct 2016 13:00:52 +0000 (23:00 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 13:00:27 +0000 (23:00 +1000)]
Fix shot alignment
Mario [Mon, 3 Oct 2016 12:42:15 +0000 (22:42 +1000)]
Fix hook alignment
Mario [Mon, 3 Oct 2016 10:34:11 +0000 (20:34 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 10:33:32 +0000 (20:33 +1000)]
Rewrite gun alignment setting to be more reliable
Mario [Mon, 3 Oct 2016 10:19:09 +0000 (20:19 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 10:19:05 +0000 (20:19 +1000)]
Set gun alignment on the server (hopefully more reliable)
Mario [Mon, 3 Oct 2016 08:43:06 +0000 (18:43 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 08:42:33 +0000 (18:42 +1000)]
Clean up the use of slots on some things that could be weapon
Mario [Mon, 3 Oct 2016 08:29:33 +0000 (18:29 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 08:29:14 +0000 (18:29 +1000)]
Fix sometimes starting with 2 weapons
Mario [Mon, 3 Oct 2016 07:32:14 +0000 (17:32 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 07:31:23 +0000 (17:31 +1000)]
Clean up ammo_field handling
Mario [Mon, 3 Oct 2016 07:05:04 +0000 (17:05 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 07:04:41 +0000 (17:04 +1000)]
Move weapon load to the weapon entity
Mario [Mon, 3 Oct 2016 06:54:30 +0000 (16:54 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2