]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Tue, 2 Oct 2018 18:58:40 +0000 (20:58 +0200)]
Merge branch 'terencehill/eventchase_tweaks'
terencehill [Tue, 2 Oct 2018 18:56:45 +0000 (20:56 +0200)]
Clan Arena: display the "You are now alone!" message only when needed
Mario [Tue, 2 Oct 2018 17:24:22 +0000 (03:24 +1000)]
Only play 'vote now' announcement if the vote hasn't already passed
Mario [Mon, 1 Oct 2018 14:25:40 +0000 (00:25 +1000)]
Update hash
Mario [Mon, 1 Oct 2018 12:20:28 +0000 (22:20 +1000)]
Fix electro combos
Mario [Mon, 1 Oct 2018 11:47:06 +0000 (11:47 +0000)]
Merge branch 'sev/luma-menu-update' into 'master'
Minor Luma menu theme update
See merge request xonotic/xonotic-data.pk3dir!604
Mario [Mon, 1 Oct 2018 09:37:04 +0000 (19:37 +1000)]
Trace to the shot origin properly, fixes projectiles getting stuck inside walls
Mario [Mon, 1 Oct 2018 06:03:02 +0000 (16:03 +1000)]
Mark the overkill weapons as hidden so they don't appear in the create menu
Mario [Mon, 1 Oct 2018 05:34:58 +0000 (15:34 +1000)]
Add an option (enabled by default) to configure whether the duel gamemode has a warmup
Mario [Mon, 1 Oct 2018 05:30:21 +0000 (15:30 +1000)]
Use the weapon instead of its ID in accuracy_add
Mario [Mon, 1 Oct 2018 05:29:56 +0000 (15:29 +1000)]
Add an option (disabled by default) to spawn powerups in duel
Mario [Sun, 30 Sep 2018 19:07:43 +0000 (05:07 +1000)]
Limit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset)
Mario [Sun, 30 Sep 2018 18:58:36 +0000 (04:58 +1000)]
Add vehicles.cfg so the vehicle settings are pre-defined
Mario [Sun, 30 Sep 2018 17:58:53 +0000 (03:58 +1000)]
Port kill command to QC so that we can use the health resource
Mario [Sun, 30 Sep 2018 17:33:22 +0000 (03:33 +1000)]
Bind K to kill by default
Martin Taibr [Sun, 30 Sep 2018 16:13:18 +0000 (18:13 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Martin Taibr [Sun, 30 Sep 2018 16:11:46 +0000 (18:11 +0200)]
change xdf icon to lowercase
Mario [Sun, 30 Sep 2018 16:02:58 +0000 (02:02 +1000)]
Restore active state of buttons on reset
Mario [Sun, 30 Sep 2018 16:01:12 +0000 (02:01 +1000)]
Make arc bolts mimic the Q3 lightning gun force in XDF
Mario [Sun, 30 Sep 2018 15:30:22 +0000 (15:30 +0000)]
Merge branch 'DefaultUser/func_button_relay' into 'master'
Allow func_button to be deactivated by relay_deactivate
See merge request xonotic/xonotic-data.pk3dir!486
Severin Meyer [Sun, 30 Sep 2018 15:24:22 +0000 (17:24 +0200)]
Update luma menu theme
Mario [Sun, 30 Sep 2018 15:04:47 +0000 (01:04 +1000)]
Merge branch 'master' into DefaultUser/func_button_relay
# Conflicts:
# qcsrc/common/mapobjects/func/button.qc
Mario [Sun, 30 Sep 2018 14:36:44 +0000 (14:36 +0000)]
Merge branch 'martin-t/bullet-trails' into 'master'
Pass effect entity to fireBullet(), give weak trail to hitscan weaps
See merge request xonotic/xonotic-data.pk3dir!521
Mario [Sun, 30 Sep 2018 14:28:24 +0000 (00:28 +1000)]
Fix hash and hopefully compilation units
terencehill [Sun, 30 Sep 2018 14:11:34 +0000 (16:11 +0200)]
Make cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing this value with the new cvar cl_eventchase_spectated_change_time
Mario [Sun, 30 Sep 2018 14:08:09 +0000 (00:08 +1000)]
Don't perform various LOD/skeleton checks and handling when the player is invisible, saves a bit of performance while inside vehicles
terencehill [Sun, 30 Sep 2018 13:53:16 +0000 (15:53 +0200)]
cl_eventchase_spectated_change: disable chase_active while eventchase is still enabled so to avoid a glicth
Mario [Sun, 30 Sep 2018 12:30:31 +0000 (12:30 +0000)]
Merge branch 'Mario/duel' into 'master'
Merge branch Mario/duel (S merge request)
See merge request xonotic/xonotic-data.pk3dir!590
Mario [Sun, 30 Sep 2018 12:29:06 +0000 (22:29 +1000)]
Use the new player limit function for limiting bot count
Mario [Sun, 30 Sep 2018 12:26:19 +0000 (22:26 +1000)]
Merge branch 'master' into Mario/duel
Martin Taibr [Sun, 30 Sep 2018 12:24:21 +0000 (14:24 +0200)]
Merge branch 'master' into martin-t/bullet-trails
Mario [Sun, 30 Sep 2018 12:22:11 +0000 (22:22 +1000)]
Don't do extra unnecessary antilag checks for the arc's smoke effect
Mario [Sun, 30 Sep 2018 12:01:46 +0000 (22:01 +1000)]
Remove an old TODO that's since been resolved
Mario [Sun, 30 Sep 2018 11:41:40 +0000 (21:41 +1000)]
Fix arc preventing switching weapons when you change weapons with the button held
Mario [Sun, 30 Sep 2018 11:06:52 +0000 (21:06 +1000)]
If arc's beam direction is the same as shot direction, snap it, reduces bandwidth usage when standing still
Mario [Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)]
Merge branch 'martin-t/help' into 'master'
Help system
See merge request xonotic/xonotic-data.pk3dir!603
Rudolf Polzer [Sun, 30 Sep 2018 05:24:18 +0000 (07:24 +0200)]
Transifex autosync
Mario [Sun, 30 Sep 2018 04:00:41 +0000 (14:00 +1000)]
Change the example gametype vote to be 1v1 CTF instead of duel (which is an actual gametype here)
Martin Taibr [Sat, 29 Sep 2018 17:39:04 +0000 (17:39 +0000)]
Merge branch 'Mario/bot_maxplayers' into 'master'
Merge branch Mario/bot_maxplayers (XXS merge request)
See merge request xonotic/xonotic-data.pk3dir!601
Mario [Sat, 29 Sep 2018 15:00:26 +0000 (01:00 +1000)]
Move some TDM settings to the gamemodes config
Martin Taibr [Sat, 29 Sep 2018 14:59:21 +0000 (16:59 +0200)]
off by 1 in help system
Martin Taibr [Sat, 29 Sep 2018 14:57:13 +0000 (16:57 +0200)]
adjust the comments, add a tip
Mario [Sat, 29 Sep 2018 14:57:05 +0000 (00:57 +1000)]
Remove some unused cvars from config
Mario [Sat, 29 Sep 2018 14:30:25 +0000 (00:30 +1000)]
Temporarily disable QC physics until the player sticking issue can be resolved
Martin Taibr [Sat, 29 Sep 2018 14:28:54 +0000 (16:28 +0200)]
only exec help.cfg once
Martin Taibr [Sat, 29 Sep 2018 14:09:42 +0000 (16:09 +0200)]
include tips for overkill
Mario [Sat, 29 Sep 2018 13:59:52 +0000 (23:59 +1000)]
Merge branch 'master' into Mario/duel
Martin Taibr [Sat, 29 Sep 2018 13:35:52 +0000 (15:35 +0200)]
copy help.cfg from server/
Mario [Sat, 29 Sep 2018 07:03:30 +0000 (17:03 +1000)]
Make use of the thiswep parameter in weapon functions, fixes some potential issues with reusing attacks and greatly reduces the number of references to the specific weapons
Mario [Sat, 29 Sep 2018 06:33:29 +0000 (16:33 +1000)]
Add a property to tell when gamemodes are supposed to be forced supported (TDM on DM maps)
Mario [Fri, 28 Sep 2018 10:25:57 +0000 (20:25 +1000)]
Fix client model fade distance fields being limited to 255
terencehill [Thu, 27 Sep 2018 13:28:19 +0000 (15:28 +0200)]
Make use of a temporary intrusive list to avoid checking revivng players twice for each player
Mario [Thu, 27 Sep 2018 05:29:38 +0000 (15:29 +1000)]
Adjust view offset too so it isn't poking out the top of the model
Mario [Thu, 27 Sep 2018 05:06:25 +0000 (15:06 +1000)]
Use the cvar directly (stats don't work server side for some reason)
Mario [Thu, 27 Sep 2018 04:34:49 +0000 (14:34 +1000)]
Add an option to use the Quake 3 hitbox size when playing VQ3 maps
Mario [Thu, 27 Sep 2018 02:06:03 +0000 (12:06 +1000)]
Make bots obey g_maxplayers
Mario [Thu, 27 Sep 2018 01:26:44 +0000 (01:26 +0000)]
Merge branch 'terencehill/ft_bugfix' into 'master'
FT bugfixes
Closes #2098 and #2079
See merge request xonotic/xonotic-data.pk3dir!600
Mario [Wed, 26 Sep 2018 10:46:43 +0000 (20:46 +1000)]
Unpress button14 on CSQC shutdown
Martin Taibr [Wed, 26 Sep 2018 06:43:27 +0000 (08:43 +0200)]
Merge branch 'master' into martin-t/bullet-trails
Mario [Wed, 26 Sep 2018 06:23:54 +0000 (06:23 +0000)]
Merge branch 'Mario/warmup_timer' into 'master'
Merge branch Mario/warmup_timer (XXS merge request)
See merge request xonotic/xonotic-data.pk3dir!598
Mario [Wed, 26 Sep 2018 00:30:44 +0000 (10:30 +1000)]
Add a temporary client-server option to allow turning off auto switching in CTS
terencehill [Tue, 25 Sep 2018 12:48:35 +0000 (14:48 +0200)]
Use FROZEN_* constants in all the Freeze calls
terencehill [Tue, 25 Sep 2018 12:34:00 +0000 (14:34 +0200)]
Rearrange code to avoid redundant checks
Mario [Mon, 24 Sep 2018 12:47:33 +0000 (22:47 +1000)]
Replace cases of !SAME_TEAM with DIFF_TEAM
Mario [Mon, 24 Sep 2018 12:46:44 +0000 (12:46 +0000)]
Merge branch 'packer/dmg-and-ca-scoring' into 'master'
fix dmg and ca scoring
See merge request xonotic/xonotic-data.pk3dir!599
Mario [Mon, 24 Sep 2018 08:07:29 +0000 (18:07 +1000)]
Add an undraggable function and make use of it in the exclusions
Mario [Mon, 24 Sep 2018 07:13:26 +0000 (17:13 +1000)]
Add a way for entities to tell whether they're draggable (currently unused)
Mario [Mon, 24 Sep 2018 01:57:10 +0000 (11:57 +1000)]
Rename Item to MenuItem, to avoid potential duplicate issues in the future
terencehill [Sun, 23 Sep 2018 16:35:39 +0000 (18:35 +0200)]
Fix #2079: "Progress indicator sometimes missing when reviving teammates in FT"
terencehill [Sun, 23 Sep 2018 10:49:27 +0000 (12:49 +0200)]
Introduce some constants to indicate frozen states; improve a few frozen state checks in freezetag code
Mario [Sun, 23 Sep 2018 03:12:18 +0000 (13:12 +1000)]
Minor optimisation to client physics options
Mario [Sun, 23 Sep 2018 01:48:18 +0000 (11:48 +1000)]
Fix unsticking so it uses the actual offset position rather than the entity's current position, also implement SV_CheckStuck for player unsticking to oldorigin
Mario [Sat, 22 Sep 2018 21:50:12 +0000 (07:50 +1000)]
Merge branch 'Mario/qcphysics'
Mario [Sat, 22 Sep 2018 21:48:56 +0000 (07:48 +1000)]
If stepdown is 2, enable the old fix for stair smoothing while going down stairs
terencehill [Sat, 22 Sep 2018 19:10:33 +0000 (21:10 +0200)]
Clean up code by avoiding resetting player's health in Unfreeze as it's not needed in most cases. Don't automatically count alive players in the ft hook of Unfreeze as it's now redundant
packer [Sat, 22 Sep 2018 11:43:49 +0000 (13:43 +0200)]
do not give damage score when shooting teammates
packer [Sat, 22 Sep 2018 11:37:48 +0000 (13:37 +0200)]
clan arena:
- fix how scoring is performed when damage exceeds remaining
health/armor fragged player (e.g. telefrag and void frag)
- dont give any score when killing teammates
Mario [Sat, 22 Sep 2018 05:39:40 +0000 (15:39 +1000)]
On second thought, don't override the intermission timer with the warmup text
Mario [Sat, 22 Sep 2018 05:36:38 +0000 (15:36 +1000)]
During warmup stage, show WARMUP instead of a timer, but restore the timer 1 minute before the match starts
Mario [Sat, 22 Sep 2018 05:17:01 +0000 (15:17 +1000)]
Abuse a button slot to tell the server when a player is playing a minigame
Mario [Sat, 22 Sep 2018 04:50:48 +0000 (04:50 +0000)]
Merge branch 'terencehill/scoreboard_stuff' into 'master'
Scoreboard stuff
See merge request xonotic/xonotic-data.pk3dir!592
terencehill [Fri, 21 Sep 2018 22:20:23 +0000 (00:20 +0200)]
Freezetag: fix wrong count of alive players when a frozen player becomes spectator or disconnects; it fixes #2098
Mario [Fri, 21 Sep 2018 22:11:28 +0000 (22:11 +0000)]
Merge branch 'Lyberta/OKShotgunAccuracy' into 'master'
Fix OKShotgun accuracy stats
See merge request xonotic/xonotic-data.pk3dir!596
Lyberta [Fri, 21 Sep 2018 04:34:11 +0000 (07:34 +0300)]
Fix OKShotgun accuracy stats.
Mario [Fri, 21 Sep 2018 02:19:30 +0000 (02:19 +0000)]
Merge branch 'Mario/cursor' into 'master'
Merge branch Mario/cursor (M merge request)
Closes #1128
See merge request xonotic/xonotic-data.pk3dir!570
Mario [Fri, 21 Sep 2018 02:14:12 +0000 (12:14 +1000)]
Don't prompt about turns in singleplayer minigames
Mario [Fri, 21 Sep 2018 02:04:35 +0000 (02:04 +0000)]
Merge branch 'terencehill/eventchase_spectated_change' into 'master'
Eeventchase when changing spectated player
See merge request xonotic/xonotic-data.pk3dir!594
Mario [Fri, 21 Sep 2018 01:57:44 +0000 (11:57 +1000)]
Tweak diameter range for automatic duel support
Mario [Fri, 21 Sep 2018 01:57:08 +0000 (11:57 +1000)]
Merge branch 'master' into Mario/duel
Mario [Fri, 21 Sep 2018 01:25:23 +0000 (11:25 +1000)]
Fix a misplaced break
Martin Taibr [Thu, 20 Sep 2018 20:28:28 +0000 (20:28 +0000)]
Merge branch 'Lyberta/OKShotgunRefire' into 'master'
Supposedly fix OKShotgun refire.
Closes #2099
See merge request xonotic/xonotic-data.pk3dir!595
Lyberta [Thu, 20 Sep 2018 12:33:47 +0000 (15:33 +0300)]
Supposedly fix OKShotgun refire.
terencehill [Wed, 19 Sep 2018 22:13:00 +0000 (00:13 +0200)]
Display name above player's head for a second when changing spectated player if 3rd person camera is active
terencehill [Wed, 19 Sep 2018 22:10:20 +0000 (00:10 +0200)]
Switch to 3rd person mode camera for a moment when changing spectated player so to help recognizing players in a more intuitive way
Mario [Tue, 18 Sep 2018 13:17:09 +0000 (23:17 +1000)]
Enable QC physics on players
terencehill [Tue, 18 Sep 2018 12:02:25 +0000 (14:02 +0200)]
Merge branch 'master' into Mario/cursor
Mario [Tue, 18 Sep 2018 02:56:10 +0000 (12:56 +1000)]
Some more minor code cleanup
Mario [Tue, 18 Sep 2018 02:29:20 +0000 (12:29 +1000)]
Fix a few FTEQCC compilation warnings (variable const isn't a thing)
Mario [Tue, 18 Sep 2018 01:56:31 +0000 (11:56 +1000)]
Fix a couple of wrong type fields
Mario [Mon, 17 Sep 2018 21:50:25 +0000 (07:50 +1000)]
Remove the old electro shader