]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Thu, 16 Apr 2020 12:11:26 +0000 (12:11 +0000)]
Merge branch 'jwinnie/bold-frag-message' into 'master'
Bolder frag messages
See merge request xonotic/xonotic-data.pk3dir!791
Jeremy Potter [Thu, 16 Apr 2020 12:11:26 +0000 (12:11 +0000)]
* Makes frag messages ("you fragged XXX") bigger (1.8x the size of normal centerprint messages) and makes them bold.
* Does this by implementing a new operator in `HUD_CenterPrint` - "`^BOLD`." Put `^BOLD` at the beginning of a centerprint notification to make it bold.
terencehill [Wed, 15 Apr 2020 13:33:26 +0000 (13:33 +0000)]
Merge branch 'martin-t/keybinder' into 'master'
Keybinder cleanup
See merge request xonotic/xonotic-data.pk3dir!754
Martin Taibr [Wed, 15 Apr 2020 13:33:26 +0000 (13:33 +0000)]
Keybinder cleanup
- remove duplicate say_team
- new category for dev binds
- add spec bind
- hide JOY* binds when joystick is not detected
- some code cleanup
terencehill [Tue, 14 Apr 2020 12:33:49 +0000 (14:33 +0200)]
Compact (and optimize) spawnfunc(target_items) code, part 2
terencehill [Tue, 14 Apr 2020 12:15:17 +0000 (14:15 +0200)]
Compact (and optimize) spawnfunc(target_items) code
Mario [Mon, 13 Apr 2020 13:44:46 +0000 (23:44 +1000)]
Remove unlisted buffs before applying enabled buffs in GiveItems, fixes buffs being retained through item triggers
Mario [Mon, 13 Apr 2020 12:30:51 +0000 (22:30 +1000)]
Fix some missing parenthesis in autospec code
Martin Taibr [Sun, 12 Apr 2020 18:58:18 +0000 (20:58 +0200)]
cleanup
Martin Taibr [Sun, 12 Apr 2020 18:52:43 +0000 (20:52 +0200)]
these categories never even existed
Martin Taibr [Sun, 12 Apr 2020 18:44:43 +0000 (20:44 +0200)]
rename
Martin Taibr [Sun, 12 Apr 2020 18:40:35 +0000 (20:40 +0200)]
improve btn text/tooltip
Martin Taibr [Sun, 12 Apr 2020 18:37:14 +0000 (20:37 +0200)]
more cleanup
Martin Taibr [Sun, 12 Apr 2020 18:30:58 +0000 (20:30 +0200)]
more cleanup
Martin Taibr [Sun, 12 Apr 2020 17:56:44 +0000 (19:56 +0200)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
Martin Taibr [Sun, 12 Apr 2020 17:56:02 +0000 (19:56 +0200)]
cleanup slist
terencehill [Sun, 12 Apr 2020 16:06:49 +0000 (18:06 +0200)]
Save a GetResource call in GiveResourceValue
terencehill [Sun, 12 Apr 2020 15:57:59 +0000 (17:57 +0200)]
Don't define g_stat_ACTIVEWEAPON and stat_ACTIVEWEAPON since we don't use STAT_ACTIVEWEAPON; g_stat_<AMMO> aren't directly referenced, in case they will define them with getstati as it's the way ammo stats are currently obtained ( getstati(GetAmmoStat(ammoType)) )
terencehill [Sun, 12 Apr 2020 15:44:25 +0000 (17:44 +0200)]
Get all the bits from STAT_ARMOR otherwise negative values are read as very high values
terencehill [Fri, 10 Apr 2020 16:07:14 +0000 (18:07 +0200)]
Use correct variable names in moveplayer
terencehill [Fri, 10 Apr 2020 15:58:07 +0000 (17:58 +0200)]
Compact moveplayer code
terencehill [Fri, 10 Apr 2020 15:55:19 +0000 (17:55 +0200)]
Fix moveplayer command examples
terencehill [Thu, 9 Apr 2020 15:49:47 +0000 (17:49 +0200)]
Set air_finished to 0 while player is out of water instead of updating it to time + autocvar_g_balance_contents_drowndelay every frame.
Remove the redundant field air_finished, rename the field pointer air_finished_stat to air_finished
Rudolf Polzer [Wed, 8 Apr 2020 05:24:41 +0000 (07:24 +0200)]
Transifex autosync
Mario [Tue, 7 Apr 2020 19:29:06 +0000 (19:29 +0000)]
Merge branch 'marin-t/bot-badcvar' into 'master'
Allow changing bot_ai_*
See merge request xonotic/xonotic-data.pk3dir!768
Rudolf Polzer [Tue, 7 Apr 2020 05:24:37 +0000 (07:24 +0200)]
Transifex autosync
terencehill [Mon, 6 Apr 2020 21:46:15 +0000 (23:46 +0200)]
Improve a comment
terencehill [Mon, 6 Apr 2020 21:44:57 +0000 (23:44 +0200)]
Revert the addition of the message "Press SPACE to enter the game" to the MOTD
Mario [Sun, 5 Apr 2020 17:38:26 +0000 (17:38 +0000)]
Merge branch 'martin-t/testing-balance' into 'master'
Granular testing balance using votes
See merge request xonotic/xonotic-data.pk3dir!766
terencehill [Sun, 5 Apr 2020 12:28:53 +0000 (14:28 +0200)]
Merge branch 'martin-t/limit'
terencehill [Sun, 5 Apr 2020 12:21:33 +0000 (14:21 +0200)]
Fix wrong delimiter when leadlimit_and_fraglimit is 1 and fraglimit is 0
Mario [Thu, 2 Apr 2020 03:32:39 +0000 (13:32 +1000)]
Clear player waypoint sprites when resetting the flag while speedrunning
Mario [Wed, 1 Apr 2020 17:04:17 +0000 (03:04 +1000)]
Add a placeholder effect for keyhunt captures until engine issue #123 can be resolved
Mario [Wed, 1 Apr 2020 16:32:24 +0000 (02:32 +1000)]
Fix legacy vaporizer beam effect appearing invisible in free for all gamemodes
terencehill [Wed, 1 Apr 2020 13:39:50 +0000 (15:39 +0200)]
RotRegen now takes care to get resource limit too
terencehill [Wed, 1 Apr 2020 13:31:38 +0000 (15:31 +0200)]
Make so that CalcRotRegen (renamed to RotRegen) applies the new amount of a certain resource but only if different
Mario [Mon, 30 Mar 2020 15:24:47 +0000 (01:24 +1000)]
Add an option to use a server default for clients as a fallback and make use of it to allow optional multijump (multijump is enabled by default but configurable on the server)
Mario [Mon, 30 Mar 2020 15:13:31 +0000 (01:13 +1000)]
Add an option for servers to enable opt-in mode for dodging using the cl_dodging setting (off by default), allows servers to provide dodging optionally without forcing it on everyone
Mario [Mon, 30 Mar 2020 13:43:59 +0000 (23:43 +1000)]
Disable client prediction when in follow mode (impossible to predict)
Rudolf Polzer [Mon, 30 Mar 2020 05:25:19 +0000 (07:25 +0200)]
Transifex autosync
terencehill [Sun, 29 Mar 2020 18:38:42 +0000 (20:38 +0200)]
Update hash
terencehill [Sun, 29 Mar 2020 15:13:36 +0000 (17:13 +0200)]
Merge branch 'master' into terencehill/bot_ai
Martin Taibr [Sun, 29 Mar 2020 06:16:11 +0000 (06:16 +0000)]
Merge branch 'terencehill/cl_eventchase_death_2' into 'master'
cl_eventchase_death 2 by default
* cl_eventchase_death 2 by default
* make the cl_eventchase_death checkbox toggle between 0 and 2
For a quick reference: seta cl_eventchase_death 2 "camera goes into 3rd person mode when the player is dead; set to 2 to active the effect only when the corpse doesn't move anymore"
See merge request xonotic/xonotic-data.pk3dir!787
Rudolf Polzer [Sun, 29 Mar 2020 05:25:01 +0000 (07:25 +0200)]
Transifex autosync
terencehill [Fri, 27 Mar 2020 00:48:48 +0000 (01:48 +0100)]
cl_eventchase_death 2 by default; make the cl_eventchase_death checkbox toggle between 0 and 2
Martin Taibr [Sat, 28 Mar 2020 11:38:37 +0000 (11:38 +0000)]
Merge branch 'terencehill/ft_rounds' into 'master'
Freeze Tag rounds
* Announce remaining rounds (like CA)
* Base team score on rounds rather than points (like CA).
Basically it changes how scoreboard shows scoring limit (`X rounds` instead of `X points`)
See merge request xonotic/xonotic-data.pk3dir!781
Martin Taibr [Fri, 27 Mar 2020 09:12:51 +0000 (10:12 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
Martin Taibr [Fri, 27 Mar 2020 09:12:00 +0000 (10:12 +0100)]
update information about NaN bug (fixed in DP by
f96918f0280 )
Martin Taibr [Fri, 27 Mar 2020 05:45:17 +0000 (06:45 +0100)]
scoreboard: try "&" instead of "and"
Martin Taibr [Fri, 27 Mar 2020 05:44:23 +0000 (06:44 +0100)]
oops, deleted the wrong delimiter
Martin Taibr [Thu, 26 Mar 2020 15:51:22 +0000 (16:51 +0100)]
consistency
Martin Taibr [Thu, 26 Mar 2020 15:48:33 +0000 (16:48 +0100)]
remove leftover comment
Martin Taibr [Thu, 26 Mar 2020 15:46:07 +0000 (16:46 +0100)]
show "and" in scoreboard for leadlimit_and_fraglimit 1
Martin Taibr [Thu, 26 Mar 2020 15:29:15 +0000 (16:29 +0100)]
simplify frags remaining announcer
Martin Taibr [Thu, 26 Mar 2020 15:11:35 +0000 (16:11 +0100)]
make leadlimit_and_fraglimit require both limits to be set
Martin Taibr [Thu, 26 Mar 2020 14:19:14 +0000 (15:19 +0100)]
Merge branch 'master' into martin-t/limit
Martin Taibr [Thu, 26 Mar 2020 14:19:06 +0000 (15:19 +0100)]
make sure leadlimit is >= 0
Mario [Thu, 26 Mar 2020 13:48:57 +0000 (23:48 +1000)]
If the weapon's animation was invalid, reset it to idle, also default to the idle animation, fixes weapon playing reload animation for a second when re-spawning
terencehill [Thu, 26 Mar 2020 00:44:06 +0000 (01:44 +0100)]
Update hash
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 11:03:44 +0000 (12:03 +0100)]
simplify leadlimit_and_fraglimit
Martin Taibr [Sun, 22 Mar 2020 11:01:11 +0000 (12:01 +0100)]
remove unused global: game_completion_ratio
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 [Tue, 17 Mar 2020 15:26:01 +0000 (16:26 +0100)]
Freeze Tag: announce remaining frags (rounds)
terencehill [Tue, 17 Mar 2020 15:25:00 +0000 (16:25 +0100)]
Freeze Tag: base team score on rounds rather than points
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
terencehill [Sat, 14 Mar 2020 22:41:28 +0000 (23:41 +0100)]
Merge branch 'master' into terencehill/bot_ai
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
terencehill [Thu, 12 Mar 2020 20:59:56 +0000 (21:59 +0100)]
Bot AI: clear aim target upon death. It fixes #2012
terencehill [Mon, 9 Mar 2020 15:30:05 +0000 (16:30 +0100)]
Bot AI: evade dangers like trigger_hurt and lava by aligning to the ideal route if off-road (also pits are now counted as dangers). It improves movement control on dangerous paths, e.g. on mentalspace bots don't fall anymore after jumping from the central platform to the base.
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