]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Wed, 25 Mar 2020 17:47:52 +0000 (18:47 +0100)]
Merge branch 'terencehill/frags_remaining_announcer'
terencehill [Wed, 25 Mar 2020 17:46:07 +0000 (18:46 +0100)]
Restore setting of air_finished CreatureFrame_Liquids in CreatureFrame_Liquids. This commit reverts
7f79df2d74
Mario [Tue, 24 Mar 2020 13:52:05 +0000 (13:52 +0000)]
Merge branch 'terencehill/oxygen_bar' into 'master'
Oxygen bar
Closes #2393
See merge request xonotic/xonotic-data.pk3dir!784
Mario [Tue, 24 Mar 2020 12:47:46 +0000 (22:47 +1000)]
Minor cleanup to campcheck code
Mario [Tue, 24 Mar 2020 12:39:04 +0000 (22:39 +1000)]
Add an option to apply campcheck rules to players who are typing (off by default)
terencehill [Sat, 21 Mar 2020 14:57:03 +0000 (15:57 +0100)]
Fix oxygen bar when player is in water and switches to spectate someone
terencehill [Sun, 22 Mar 2020 12:03:04 +0000 (13:03 +0100)]
Don't announce frags remaining if leadlimit_and_fraglimit 1 and fraglimit 0 and leadlimit > 0 since scoring rules ignore leadlimit in this case.
Basically I've just added 'if (limit)' before 'fragsleft = max(leadingfragsleft, fragsleft);', other changes are just code rearrangement.
Also removed 'if (fragsleft > 3) fragsleft = 0;' as it was just an negligible optimization
Martin Taibr [Sun, 22 Mar 2020 10:56:30 +0000 (11:56 +0100)]
leadlimit_and_fraglimit desc
terencehill [Sun, 22 Mar 2020 09:25:54 +0000 (10:25 +0100)]
Refactor frags remaining announcer code and make it work with leadlimit_and_fraglimit 1
terencehill [Sat, 21 Mar 2020 22:16:30 +0000 (23:16 +0100)]
Fix previous commit breaking leadlimit_and_fraglimit 1
terencehill [Sat, 21 Mar 2020 18:52:18 +0000 (19:52 +0100)]
Ignore lead limit if greater than score limit
terencehill [Sat, 21 Mar 2020 14:12:05 +0000 (15:12 +0100)]
Sync oxygen bar blinking with start drowning time
terencehill [Sat, 21 Mar 2020 13:25:40 +0000 (14:25 +0100)]
Put blink code in its own function
terencehill [Sat, 21 Mar 2020 11:25:49 +0000 (12:25 +0100)]
Blink oxygen bar when player starts drowning
terencehill [Fri, 20 Mar 2020 19:16:24 +0000 (20:16 +0100)]
Implement #2393 "Oxygen bar"
terencehill [Thu, 19 Mar 2020 23:21:16 +0000 (00:21 +0100)]
Remove redundant setting of air_finished that gets overriden in DrownPlayer with the proper value (g_balance_contents_drowndelay)
Martin Taibr [Thu, 19 Mar 2020 22:48:39 +0000 (22:48 +0000)]
Merge branch 'bones_was_here/glslgamma' into 'master'
Remove v_glslgamma from menu, as it was removed from div0-stable
The option no longer has any effect, and contrast and gamma can't be adjusted via menu sliders until the dependency is removed.
See merge request xonotic/xonotic-data.pk3dir!782
bones_was_here [Thu, 19 Mar 2020 22:48:39 +0000 (22:48 +0000)]
Remove v_glslgamma from menu, as it was removed from div0-stable
terencehill [Wed, 18 Mar 2020 18:36:38 +0000 (18:36 +0000)]
Merge branch 'packer/announce-leadlimit' into 'master'
Announce remaining frags for leadlimit, too.
See merge request xonotic/xonotic-data.pk3dir!780
packer [Wed, 18 Mar 2020 09:24:59 +0000 (10:24 +0100)]
Update comment.
packer [Wed, 18 Mar 2020 08:15:06 +0000 (09:15 +0100)]
Rename fragsleftlast to fragsleft_last.
Mario [Tue, 17 Mar 2020 23:12:55 +0000 (09:12 +1000)]
If the player state doesn't belong to the player, attach a new one when spawning, likely fixes some strange issues
Martin Taibr [Tue, 17 Mar 2020 18:58:23 +0000 (18:58 +0000)]
Merge branch 'packer/banlog' into 'master'
Bans: Do not print IP of banned clients. Add crypto_idfp to log format.
Respect the privacy of banned clients :)
See merge request xonotic/xonotic-data.pk3dir!778
packer [Tue, 17 Mar 2020 17:55:31 +0000 (18:55 +0100)]
Bans: Do not print IP of banned clients. Add crypto_idfp to log format.
packer [Tue, 17 Mar 2020 17:47:13 +0000 (18:47 +0100)]
Announce remaining frags for leadlimit, too.
terencehill [Mon, 16 Mar 2020 21:15:01 +0000 (22:15 +0100)]
Fix #2327 "Giant mg ammo ring when "smooth effects of crosshairs" (crosshair_effect_scalefade) is disabled"
terencehill [Mon, 16 Mar 2020 12:05:38 +0000 (13:05 +0100)]
Misc cleanups (comment in CCR is no longer valid, autocvar declarations are right above CCR)
terencehill [Mon, 16 Mar 2020 11:58:39 +0000 (12:58 +0100)]
Clean up / compact bot_setnameandstuff code
Mario [Sun, 15 Mar 2020 07:34:59 +0000 (17:34 +1000)]
Add an option (disabled by default) to drop off-hand weapons while dual wielding in the pinata mutator
Mario [Sat, 14 Mar 2020 01:28:57 +0000 (11:28 +1000)]
Allow chmap and map shorthands for gotomap to be votable (if available) without needing to explicitly list all of them in sv_vote_commands
Mario [Fri, 13 Mar 2020 12:14:39 +0000 (12:14 +0000)]
Merge branch 'terencehill/campaign_message_tweak' into 'master'
Campaign message tweaks
See merge request xonotic/xonotic-data.pk3dir!763
Mario [Fri, 13 Mar 2020 12:02:43 +0000 (22:02 +1000)]
Show crosshair pickup animation when picking up a buff, solves #2413
Mario [Sat, 7 Mar 2020 19:55:17 +0000 (05:55 +1000)]
Change unsticking to match the engine even more closely, fixes some cases where entities can be stuck with QC physics
Mario [Sat, 7 Mar 2020 19:27:54 +0000 (05:27 +1000)]
Disable prediction when bugrigs is enabled, fixes glitchy movement
Mario [Fri, 6 Mar 2020 21:19:25 +0000 (07:19 +1000)]
If the player has enough ammo already, don't pick up the weapon when g_weapon_stay is set to 2, fixes unnecessary weapon pickup spam
Mario [Fri, 6 Mar 2020 21:12:59 +0000 (07:12 +1000)]
Apply air movement physics on slick surfaces when sv_slick_applygravity is enabled
Mario [Fri, 6 Mar 2020 21:10:13 +0000 (07:10 +1000)]
Fix being able to double jump after sliding on a slick surface
Rudolf Polzer [Fri, 6 Mar 2020 06:24:49 +0000 (07:24 +0100)]
Transifex autosync
Mario [Sat, 29 Feb 2020 09:01:51 +0000 (09:01 +0000)]
Merge branch 'martin-t/version' into 'master'
Print which QC version it is
See merge request xonotic/xonotic-data.pk3dir!770
Mario [Sat, 29 Feb 2020 08:46:00 +0000 (08:46 +0000)]
Merge branch 'terencehill/pressed_keys_fix' into 'master'
Pressed keys fix
See merge request xonotic/xonotic-data.pk3dir!773
Rudolf Polzer [Thu, 20 Feb 2020 06:24:42 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Wed, 19 Feb 2020 06:25:00 +0000 (07:25 +0100)]
Transifex autosync
Mario [Tue, 18 Feb 2020 13:06:24 +0000 (13:06 +0000)]
Merge branch 'martin-t/vote' into 'master'
Fix sv_vote_gametype_default_current to match description
See merge request xonotic/xonotic-data.pk3dir!774
Rudolf Polzer [Mon, 17 Feb 2020 06:24:42 +0000 (07:24 +0100)]
Transifex autosync
Rudolf Polzer [Sun, 16 Feb 2020 06:24:44 +0000 (07:24 +0100)]
Transifex autosync
Martin Taibr [Sat, 15 Feb 2020 18:07:50 +0000 (19:07 +0100)]
fix sv_vote_gametype_default_current to match description
it used to always pick current mode if there was a tie
terencehill [Thu, 13 Feb 2020 19:33:46 +0000 (20:33 +0100)]
Reset pressed keys when switching spectated player
Martin Taibr [Thu, 13 Feb 2020 18:08:00 +0000 (19:08 +0100)]
simplify version cmd using PROGNAME
Mario [Thu, 13 Feb 2020 17:06:06 +0000 (17:06 +0000)]
Merge branch 'martin-t/check-cvars' into 'master'
Check bal-wep files for consistency
Closes #2258
See merge request xonotic/xonotic-data.pk3dir!769
terencehill [Thu, 13 Feb 2020 15:47:10 +0000 (16:47 +0100)]
Always hide Pressed Keys panel when observing, it doesn't show any pressed key anyway
terencehill [Thu, 13 Feb 2020 15:43:20 +0000 (16:43 +0100)]
Reset pressed keys when going observer
Martin Taibr [Wed, 12 Feb 2020 15:24:30 +0000 (16:24 +0100)]
print which QC version it is
Martin Taibr [Wed, 12 Feb 2020 15:09:09 +0000 (16:09 +0100)]
cleanup
Martin Taibr [Wed, 12 Feb 2020 14:21:40 +0000 (15:21 +0100)]
remove bal-wep-overkill-nerfed.cfg
Martin Taibr [Wed, 12 Feb 2020 14:16:28 +0000 (15:16 +0100)]
also check bal-wep files for consistency
Rudolf Polzer [Sun, 9 Feb 2020 06:24:45 +0000 (07:24 +0100)]
Transifex autosync
Mario [Sat, 8 Feb 2020 09:15:58 +0000 (09:15 +0000)]
Merge branch 'Mario/stepdown_maxspeed' into 'master'
Merge branch Mario/stepdown_maxspeed (XS merge request)
Closes #2404
See merge request xonotic/xonotic-data.pk3dir!767
Mario [Sat, 8 Feb 2020 09:04:59 +0000 (19:04 +1000)]
Update sv_gameplayfix_stepdown_maxspeed description to mention that it requires QC physics
Rudolf Polzer [Sat, 8 Feb 2020 06:24:38 +0000 (07:24 +0100)]
Transifex autosync
Mario [Thu, 6 Feb 2020 12:29:03 +0000 (22:29 +1000)]
Add an option to control the maximum speed you can be traveling for stepping down to apply (ignored by slick surfaces)
Rudolf Polzer [Tue, 28 Jan 2020 06:24:41 +0000 (07:24 +0100)]
Transifex autosync
Mario [Sat, 25 Jan 2020 17:55:55 +0000 (03:55 +1000)]
Add some missing parenthesis
terencehill [Sat, 25 Jan 2020 12:42:12 +0000 (13:42 +0100)]
Merge branch 'terencehill/lms_fix'
Mario [Sat, 25 Jan 2020 06:45:34 +0000 (16:45 +1000)]
Remove the precache function, mostly unused (playermodels now precache themselves using the standard PRECACHE methods)
Mario [Sat, 25 Jan 2020 05:12:34 +0000 (15:12 +1000)]
Clean up racer code a little bit, allow customising racer hover type without restarting the match
Mario [Thu, 23 Jan 2020 22:39:45 +0000 (08:39 +1000)]
Fix a missed use of .health
Mario [Thu, 23 Jan 2020 20:54:13 +0000 (06:54 +1000)]
Reset player's alpha to default_player_alpha instead of 1 when exiting a vehicle, fixes support with mutators that customise the player's alpha
Mario [Thu, 23 Jan 2020 20:19:56 +0000 (06:19 +1000)]
Bumblebee: limit the amount of armor provided by the bumblebee in instagib to the value of g_instagib_extralives
terencehill [Wed, 22 Jan 2020 20:01:02 +0000 (21:01 +0100)]
Make sure number of lives is an integer and <= 999
terencehill [Wed, 22 Jan 2020 19:23:27 +0000 (20:23 +0100)]
Count active players only when needed
terencehill [Wed, 22 Jan 2020 19:18:38 +0000 (20:18 +0100)]
LMS: fix newcomers not being able to join the game if a player forfeited
Mario [Tue, 21 Jan 2020 20:09:47 +0000 (20:09 +0000)]
Merge branch 'Mario/qcphysics' into 'master'
Enable QC physics by default again, as the known issues with it have been resolved
See merge request xonotic/xonotic-data.pk3dir!696
Mario [Tue, 21 Jan 2020 19:57:17 +0000 (05:57 +1000)]
Update hash
Mario [Tue, 21 Jan 2020 19:24:22 +0000 (05:24 +1000)]
Merge branch 'master' into Mario/qcphysics
Mario [Tue, 21 Jan 2020 15:29:02 +0000 (15:29 +0000)]
Merge branch 'Mario/ipv6_gamelog' into 'master'
Merge branch Mario/ipv6_gamelog (S merge request)
See merge request xonotic/xonotic-data.pk3dir!765
Mario [Mon, 20 Jan 2020 23:07:06 +0000 (09:07 +1000)]
Make the delimiter a hardcoded toggle rather than a customisable setting
Mario [Mon, 20 Jan 2020 22:42:55 +0000 (22:42 +0000)]
Merge branch 'bones_was_here/flaglights' into 'master'
Add description for g_ctf_dynamiclights and whitelist
See merge request xonotic/xonotic-data.pk3dir!764
bones_was_here [Mon, 20 Jan 2020 22:32:56 +0000 (08:32 +1000)]
Add description for g_ctf_dynamiclights and whitelist
Mario [Mon, 20 Jan 2020 22:17:20 +0000 (08:17 +1000)]
Temporarily whitelist CTF stalemate timer so that different values can be tested on servers without affecting purity
Mario [Mon, 20 Jan 2020 19:09:39 +0000 (19:09 +0000)]
Merge branch 'Mario/rain_fix' into 'master'
Merge branch Mario/rain_fix (M merge request)
See merge request xonotic/xonotic-data.pk3dir!762
Mario [Mon, 20 Jan 2020 19:08:34 +0000 (19:08 +0000)]
Merge branch 'Mario/csqc_refdef' into 'master'
Merge branch Mario/csqc_refdef (XXS merge request)
See merge request xonotic/xonotic-data.pk3dir!758
Mario [Mon, 20 Jan 2020 07:06:39 +0000 (07:06 +0000)]
Merge branch 'Mario/intrusivelist_objects' into 'master'
Merge branch Mario/intrusivelist_objects (S merge request)
See merge request xonotic/xonotic-data.pk3dir!761
Mario [Mon, 20 Jan 2020 02:32:16 +0000 (12:32 +1000)]
Allow customising the delimiter of IPV6 IPs in the game log's join message, so scripts can process it easier
Mario [Sun, 19 Jan 2020 18:05:44 +0000 (04:05 +1000)]
Add a compiler flag to debug shotgun melee range
Mario [Sun, 19 Jan 2020 16:41:46 +0000 (02:41 +1000)]
Update item sizes in other locations, to match the new default
Mario [Sun, 19 Jan 2020 16:32:49 +0000 (16:32 +0000)]
Merge branch 'bones_was_here/weaponbbox' into 'master'
Increase height of weapon item bbox from 32 to 48
See merge request xonotic/xonotic-data.pk3dir!760
Mario [Sun, 19 Jan 2020 00:18:59 +0000 (10:18 +1000)]
Allow mappers to define the draw distance of the rain brush, useful for extra large maps where the default distance may be too much
Mario [Sun, 19 Jan 2020 00:12:26 +0000 (10:12 +1000)]
Increase rain draw distance to 1000 (also for drain)
Mario [Sun, 19 Jan 2020 00:10:54 +0000 (10:10 +1000)]
Increase rain draw distance to 700, so drain functions
Mario [Sun, 19 Jan 2020 00:07:53 +0000 (10:07 +1000)]
Fix rainsnow logic, thanks to Player_2
Mario [Sat, 18 Jan 2020 22:36:44 +0000 (08:36 +1000)]
Merge branch 'master' into Mario/rain_fix
Mario [Sat, 18 Jan 2020 21:33:46 +0000 (07:33 +1000)]
Replace some per-frame physics loops with intrusive lists
Mario [Sat, 18 Jan 2020 21:00:38 +0000 (07:00 +1000)]
Disable third person spectator change camera until its effect can be improved, as per #2157
bones_was_here [Sat, 18 Jan 2020 20:10:10 +0000 (06:10 +1000)]
Increase height of weapon item bbox from 32 to 48
Martin Taibr [Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)]
Merge branch 'martin-t/electro-denoobing' into 'master'
Electro: midair combos
See merge request xonotic/xonotic-data.pk3dir!757
Martin Taibr [Sat, 18 Jan 2020 14:25:04 +0000 (15:25 +0100)]
electro midaircombo_speed to preserve balance bug :P
Mario [Sat, 18 Jan 2020 00:11:17 +0000 (10:11 +1000)]
Move weapon frame handling to the client side
Mario [Fri, 17 Jan 2020 23:19:45 +0000 (09:19 +1000)]
Remove a macro only used once, clean up miscfunctions a tiny bit
Mario [Fri, 17 Jan 2020 16:33:20 +0000 (02:33 +1000)]
Remove/disable a couple of unused misc functions
Mario [Fri, 17 Jan 2020 16:07:37 +0000 (02:07 +1000)]
Rename AmmoNameFromWeaponentity to GetAmmoName and move it out of miscfunctions