]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual Lenks [Sat, 4 Jan 2014 01:37:04 +0000 (20:37 -0500)]
Always ensure pixel accuracy instead of manually setting it
Samual Lenks [Sat, 4 Jan 2014 01:23:24 +0000 (20:23 -0500)]
use cvar_settemp for orthoview settings
Rudolf Polzer [Wed, 1 Jan 2014 10:14:00 +0000 (11:14 +0100)]
Merge remote-tracking branch 'origin/divVerent/ballistic2'
* origin/divVerent/ballistic2:
Oops. Fix rifle config.
We DO need to detect double-hits, due to the weird engine tracing that happens sometimes at low angles.
Always show DamageInfo, even when hitting the same player twice.
Fix use of "self".
fix some bugs
Kill some cvars I forgot.
cvar cleanup
Kill zcurveparticles due to 0 users.
Simplify a LOT.
work on restructuring fireBallisticBullet
Rudolf Polzer [Wed, 1 Jan 2014 09:55:58 +0000 (10:55 +0100)]
Oops. Fix rifle config.
Rudolf Polzer [Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)]
Merge branch 'master' into divVerent/ballistic2
Rudolf Polzer [Wed, 1 Jan 2014 09:47:38 +0000 (10:47 +0100)]
Add the most obvious __VA_ARGS__ macro of all.
Rudolf Polzer [Wed, 1 Jan 2014 09:37:49 +0000 (10:37 +0100)]
Fix terencehill's variable abuse. Unbreaks centerprint.
WHY DID I LET THIS GO WHEN REVIEWING THIS STUFF.
Samual Lenks [Mon, 30 Dec 2013 19:01:18 +0000 (14:01 -0500)]
Actually, use a more simple comparison (looks cleaner, easier to understand)
Samual Lenks [Mon, 30 Dec 2013 18:51:18 +0000 (13:51 -0500)]
Merge remote-tracking branch 'origin/samual/makemulti_inverse'
* origin/samual/makemulti_inverse:
Remove r_hidewater changes from this branch
Add ability for makeMulti inverse cvars (for r_water_hideplayer switching)
Samual Lenks [Mon, 30 Dec 2013 18:48:32 +0000 (13:48 -0500)]
Remove r_hidewater changes from this branch
Samual Lenks [Mon, 30 Dec 2013 18:34:55 +0000 (13:34 -0500)]
Merge remote-tracking branch 'origin/master' into samual/makemulti_inverse
Samual Lenks [Mon, 30 Dec 2013 17:54:49 +0000 (12:54 -0500)]
Merge remote-tracking branch 'origin/samual/orthoview'
* origin/samual/orthoview:
Use vec3 and get rid of FL2VEC -- This function didn't exist when I first made orthoview :)
Lets just set resolution via a cvar
Fix issues with FL2VEC
Fix remaining known issue with orthoview (on abyss, techassault)
Add definition for orthoview accuracy, plus some final cleanup
Clean up debug stuff
Add "set" for orthoview cvars
Add cvars to defaultXonotic.cfg
Use r_drawfog 0 while in orthoview
Fix center of map and distance setting
On second thought, keep the override cvar
Use center of world bbox instead of '0 0 0' origin, solves a bug :D
Fix it so that fov adjusts properly too
Clean up orthoview maths, add logic for handling r_nearclip and r_farclip
Working on adding orthoview feature for map screenshots from above
Samual Lenks [Mon, 30 Dec 2013 17:53:26 +0000 (12:53 -0500)]
Merge remote-tracking branch 'origin/samual/fix_crosshair_hittest'
* origin/samual/fix_crosshair_hittest:
Fix spectating
Fix crosshair_hittest_showimpact by using proper loc instead of vieworigin
Samual Lenks [Mon, 30 Dec 2013 17:52:06 +0000 (12:52 -0500)]
Merge remote-tracking branch 'origin/Mario/shownames_minalpha'
# By Samual Lenks (3) and Mario (1)
* origin/Mario/shownames_minalpha:
Multiply shownames alpha by player alpha
Allow shownames to be seen with low alpha if they're the same team
Clean some things up
Hide player name if their alpha is below a limit
Rudolf Polzer [Mon, 30 Dec 2013 13:29:36 +0000 (14:29 +0100)]
Try fixing centerprint expiring.
- Avoid drawing stuff at alpha 0.
- Simplify alpha calculation.
Samual Lenks [Sun, 29 Dec 2013 10:29:16 +0000 (05:29 -0500)]
Merge remote-tracking branch 'origin/terencehill/color_picker_carets'
# By terencehill
# Via terencehill
* origin/terencehill/color_picker_carets:
Optimize a check
If there's a caret before the cursor in the input box when clicking on the color picker, escape the caret so we can add a valid color code
Improve detection of color codes when dragging the mouse in the color picker: color code isn't valid if caret is escaped (e.g. ^^x123)
Samual Lenks [Sun, 29 Dec 2013 09:14:32 +0000 (04:14 -0500)]
Multiply shownames alpha by player alpha
Samual Lenks [Sat, 28 Dec 2013 19:11:12 +0000 (14:11 -0500)]
Allow shownames to be seen with low alpha if they're the same team
Samual Lenks [Sat, 28 Dec 2013 19:09:26 +0000 (14:09 -0500)]
Clean some things up
Samual Lenks [Sat, 28 Dec 2013 19:00:11 +0000 (14:00 -0500)]
Merge remote-tracking branch 'origin/master' into Mario/shownames_minalpha
Samual Lenks [Sat, 28 Dec 2013 18:50:06 +0000 (13:50 -0500)]
Use vec3 and get rid of FL2VEC -- This function didn't exist when I first
made orthoview :)
Samual Lenks [Sat, 28 Dec 2013 18:23:20 +0000 (13:23 -0500)]
Fix spectating
Samual Lenks [Sat, 28 Dec 2013 18:02:30 +0000 (13:02 -0500)]
Fix crosshair_hittest_showimpact by using proper loc instead of vieworigin
Samual Lenks [Fri, 27 Dec 2013 04:01:54 +0000 (23:01 -0500)]
Add ability for makeMulti inverse cvars (for r_water_hideplayer switching)
Samual Lenks [Fri, 27 Dec 2013 01:32:10 +0000 (20:32 -0500)]
Lets just set resolution via a cvar
Samual Lenks [Fri, 27 Dec 2013 01:28:13 +0000 (20:28 -0500)]
Fix issues with FL2VEC
Samual Lenks [Thu, 26 Dec 2013 09:54:59 +0000 (04:54 -0500)]
Fix remaining known issue with orthoview (on abyss, techassault)
Samual Lenks [Thu, 26 Dec 2013 08:23:02 +0000 (03:23 -0500)]
Add definition for orthoview accuracy, plus some final cleanup
Samual Lenks [Thu, 26 Dec 2013 08:11:34 +0000 (03:11 -0500)]
Clean up debug stuff
Samual Lenks [Thu, 26 Dec 2013 07:23:54 +0000 (02:23 -0500)]
Merge remote-tracking branch 'origin/master' into samual/orthoview
Rudolf Polzer [Fri, 20 Dec 2013 10:44:45 +0000 (11:44 +0100)]
Fix csqcmodel display for cloned/dead players. Also clone aiming direction :)
Rudolf Polzer [Thu, 19 Dec 2013 12:49:22 +0000 (13:49 +0100)]
up sendflags to 3 bytes in csqcmodel. Fixes accidentally double-sent
data.
Rudolf Polzer [Wed, 11 Dec 2013 10:12:07 +0000 (11:12 +0100)]
We DO need to detect double-hits, due to the weird engine tracing that
happens sometimes at low angles.
Rudolf Polzer [Wed, 11 Dec 2013 08:48:12 +0000 (09:48 +0100)]
Always show DamageInfo, even when hitting the same player twice.
Also, prevention of hitting the same player twice SHOULD be no longer
necessary (but let's keep a big warning for this anwyay for now), as
this could only really happen due to curved projectile movement.
Rudolf Polzer [Wed, 11 Dec 2013 08:42:25 +0000 (09:42 +0100)]
Merge branch 'master' into divVerent/ballistic2
Rudolf Polzer [Wed, 11 Dec 2013 08:42:13 +0000 (09:42 +0100)]
Fix use of "self".
Mario [Mon, 25 Nov 2013 02:25:29 +0000 (13:25 +1100)]
Hide player name if their alpha is below a limit
Rudolf Polzer [Sun, 24 Nov 2013 09:03:31 +0000 (10:03 +0100)]
fix scale networking
Rudolf Polzer [Sun, 24 Nov 2013 08:44:45 +0000 (09:44 +0100)]
Fix "scale" networking. Sorry for that.
Samual Lenks [Sun, 24 Nov 2013 04:55:13 +0000 (23:55 -0500)]
Merge remote-tracking branch 'origin/samual/serverlist'
* origin/samual/serverlist: (63 commits)
Use new cvar check URL; kill CVAR_POPCON.
Show recommended servers when categories are disabled too
Add a compatibility stop date to the update notification info.
Fix my breaking of emergency pk3's :D
ARGH, that really was a STUPID bug.
Make APPEND_STRING behave "sane".
Some cleanup
Properly handle the cvars for serverlist categories now
Support promoted servers in the recommendations
Switch to new format for updatenotification
Switch to recommendation mode 3
Rename "Bookmark" button to "Favorite" button (it's called favorites...)
Adjustments to category rendering- left align with colon over servername
Simplify a LOT.
Refactor item position code. Should be easier to adapt to new category handling.
ONE BYTE.
Fix bug in begin handling.
Bottom align the headings.
Give the headings 1.5 rows height.
use a proper binary search
...
Conflicts:
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/util.qc
Samual Lenks [Sun, 24 Nov 2013 04:37:50 +0000 (23:37 -0500)]
Merge remote-tracking branch 'origin/Mario/csqc_models'
# By Mario
# Via Mario
* origin/Mario/csqc_models:
Use WriteShort for mins/maxs linking
Comment out size reset (can cause crashes with some models on first load)
Use WriteChar for mins/maxs linking & WriteByte for scale linking
Network colormod to fix sandbox object colors
Add func_breakable CSQC model linking again
Remove func_breakable CSQC model linking
Allow larger model scale
Roughly link onslaught control points
Network model scale, mins & maxs, link sandbox & breakable models with CSQC
Samual Lenks [Sun, 24 Nov 2013 04:36:52 +0000 (23:36 -0500)]
Merge remote-tracking branch 'origin/Mario/respawn_delays'
# By Mario
# Via Mario
* origin/Mario/respawn_delays:
Fix some issues brought up in the tracker
Only use g_respawn_delay_max if it's higher than normal respawn delay
Add a new option for forced respawn: g_respawn_delay_max. Forces players to spawn after this many seconds or optionally respawn after normal delay
Samual Lenks [Sun, 24 Nov 2013 04:33:51 +0000 (23:33 -0500)]
Merge remote-tracking branch 'origin/Mario/arena_nuke'
* origin/Mario/arena_nuke:
Remove arena gamemode
Conflicts:
qcsrc/server/command/cmd.qc
qcsrc/server/mutators/gamemode_arena.qc
Rudolf Polzer [Tue, 19 Nov 2013 18:44:03 +0000 (19:44 +0100)]
fix some bugs
Rudolf Polzer [Tue, 19 Nov 2013 13:21:56 +0000 (14:21 +0100)]
Kill some cvars I forgot.
Rudolf Polzer [Tue, 19 Nov 2013 10:39:59 +0000 (11:39 +0100)]
cvar cleanup
Rudolf Polzer [Tue, 19 Nov 2013 10:18:27 +0000 (11:18 +0100)]
Kill zcurveparticles due to 0 users.
Rudolf Polzer [Tue, 19 Nov 2013 10:16:41 +0000 (11:16 +0100)]
Simplify a LOT.
Rudolf Polzer [Mon, 18 Nov 2013 18:56:50 +0000 (19:56 +0100)]
work on restructuring fireBallisticBullet
Rudolf Polzer [Fri, 15 Nov 2013 10:02:30 +0000 (11:02 +0100)]
French tooltips update by Spike29.
Rudolf Polzer [Mon, 11 Nov 2013 16:18:58 +0000 (17:18 +0100)]
Kill g_antilag_bullets (always assume 1); kill bullet gravity.
Real code simplification to be done later.
Mario [Sat, 9 Nov 2013 12:41:18 +0000 (23:41 +1100)]
Use WriteShort for mins/maxs linking
Mario [Fri, 8 Nov 2013 20:42:14 +0000 (07:42 +1100)]
Comment out size reset (can cause crashes with some models on first load)
Mario [Fri, 8 Nov 2013 20:29:41 +0000 (07:29 +1100)]
Use WriteChar for mins/maxs linking & WriteByte for scale linking
Rudolf Polzer [Fri, 8 Nov 2013 16:28:36 +0000 (17:28 +0100)]
More stuff.
Rudolf Polzer [Fri, 8 Nov 2013 13:14:44 +0000 (14:14 +0100)]
pos_ done.
Rudolf Polzer [Fri, 8 Nov 2013 11:52:10 +0000 (12:52 +0100)]
Fix function types.
Rudolf Polzer [Thu, 7 Nov 2013 10:51:04 +0000 (11:51 +0100)]
Force sp_after_comma (only is inconsistent because of historic fteqcc
bug).
Rudolf Polzer [Thu, 7 Nov 2013 07:42:15 +0000 (08:42 +0100)]
Force // comment and if(cond)
Rudolf Polzer [Thu, 7 Nov 2013 07:40:46 +0000 (08:40 +0100)]
Updated.
Rudolf Polzer [Wed, 6 Nov 2013 16:33:53 +0000 (17:33 +0100)]
Ignore space-around-arithmetic-operator. Let the coder decide there.
Rudolf Polzer [Tue, 5 Nov 2013 08:18:32 +0000 (09:18 +0100)]
Update config to 0.60
Rudolf Polzer [Mon, 4 Nov 2013 19:30:42 +0000 (20:30 +0100)]
Start of uncrusticracy script, and kill trailing whitespace in all sources.
Mario [Sat, 2 Nov 2013 07:33:34 +0000 (18:33 +1100)]
Network colormod to fix sandbox object colors
Mario [Sat, 2 Nov 2013 07:32:28 +0000 (18:32 +1100)]
Merge branch 'master' into Mario/csqc_models
Rudolf Polzer [Wed, 30 Oct 2013 13:17:51 +0000 (14:17 +0100)]
A config file.
Rudolf Polzer [Wed, 30 Oct 2013 12:36:14 +0000 (13:36 +0100)]
Manual riddance of remaining "if not".
Rudolf Polzer [Wed, 30 Oct 2013 12:26:29 +0000 (13:26 +0100)]
Get rid of if not, step 1.
Rudolf Polzer [Fri, 25 Oct 2013 12:33:42 +0000 (14:33 +0200)]
inputtimeout: should be 0.066 (slightly less than 2 frames) so if one
frame was lost, it's compensated almost correctly.
Samual Lenks [Thu, 24 Oct 2013 18:11:06 +0000 (14:11 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist
Rudolf Polzer [Thu, 24 Oct 2013 11:23:09 +0000 (13:23 +0200)]
Actually, 0.04 was always intended here, not 0.07. Now checked engine
source that 0.04 still supports cl_netrepeatinput 1.
Mario [Wed, 23 Oct 2013 08:58:54 +0000 (19:58 +1100)]
Fix some issues brought up in the tracker
Mario [Tue, 22 Oct 2013 13:46:04 +0000 (00:46 +1100)]
Merge branch 'master' into Mario/respawn_delays
Mario [Tue, 22 Oct 2013 01:31:27 +0000 (12:31 +1100)]
Add func_breakable CSQC model linking again
Mario [Mon, 21 Oct 2013 08:39:15 +0000 (19:39 +1100)]
Remove func_breakable CSQC model linking
Mario [Mon, 21 Oct 2013 08:38:12 +0000 (19:38 +1100)]
Merge branch 'master' into Mario/csqc_models
Rudolf Polzer [Fri, 18 Oct 2013 01:15:57 +0000 (03:15 +0200)]
fix g_warmup_allguns 1
Rudolf Polzer [Fri, 18 Oct 2013 00:38:07 +0000 (02:38 +0200)]
Simpler function accumulation. Thanks, graphitemaster.
Samual Lenks [Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'
* origin/samual/warmup_onlyonmap:
Add feature to warmup_allguns which only provides weapons in the map
Samual Lenks [Thu, 17 Oct 2013 20:25:14 +0000 (16:25 -0400)]
Add feature to warmup_allguns which only provides weapons in the map
Rudolf Polzer [Thu, 17 Oct 2013 19:50:53 +0000 (21:50 +0200)]
Fix a division by zero.
Rudolf Polzer [Thu, 17 Oct 2013 19:44:56 +0000 (21:44 +0200)]
Get rid of an useless trace and like 1000 instructions each frame and player.
Rudolf Polzer [Tue, 15 Oct 2013 16:43:23 +0000 (18:43 +0200)]
Use new cvar check URL; kill CVAR_POPCON.
Rudolf Polzer [Mon, 14 Oct 2013 01:38:25 +0000 (03:38 +0200)]
fix typo
Samual Lenks [Mon, 14 Oct 2013 00:01:06 +0000 (20:01 -0400)]
Show recommended servers when categories are disabled too
Rudolf Polzer [Sun, 13 Oct 2013 22:49:15 +0000 (00:49 +0200)]
Add a compatibility stop date to the update notification info.
After this date, servers below the current minor version (second part of
version number) will not be shown any more.
Rudolf Polzer [Sun, 13 Oct 2013 22:50:32 +0000 (00:50 +0200)]
Merge branch 'master' into samual/serverlist
Rudolf Polzer [Sun, 13 Oct 2013 21:16:46 +0000 (23:16 +0200)]
OOPS. Add missing strcmp builtin defs. How could that have slipped through for ages...
Rudolf Polzer [Sun, 13 Oct 2013 20:34:17 +0000 (22:34 +0200)]
Hide empty servers a little bit more, making good servers stand out more.
Samual Lenks [Sun, 13 Oct 2013 19:19:31 +0000 (15:19 -0400)]
Fix my breaking of emergency pk3's :D
Rudolf Polzer [Sun, 13 Oct 2013 16:09:57 +0000 (18:09 +0200)]
Fix colormap loading, fixes #1558
Rudolf Polzer [Sun, 13 Oct 2013 14:23:50 +0000 (16:23 +0200)]
Menu: avoid loading font twice on resolution switch; avoid extra r_restart on resolution switch; avoid menu reload on resolution switch
Rudolf Polzer [Sun, 13 Oct 2013 01:21:45 +0000 (03:21 +0200)]
ARGH, that really was a STUPID bug.
Rudolf Polzer [Sun, 13 Oct 2013 01:21:45 +0000 (03:21 +0200)]
ARGH, that really was a STUPID bug.
Samual Lenks [Sun, 13 Oct 2013 01:20:49 +0000 (21:20 -0400)]
Hide DVD resolutions
Rudolf Polzer [Sun, 13 Oct 2013 00:04:58 +0000 (02:04 +0200)]
Make APPEND_STRING behave "sane".
Samual Lenks [Sat, 12 Oct 2013 23:17:20 +0000 (19:17 -0400)]
Some cleanup
Samual Lenks [Sat, 12 Oct 2013 23:15:26 +0000 (19:15 -0400)]
Properly handle the cvars for serverlist categories now
Samual Lenks [Sat, 12 Oct 2013 22:54:31 +0000 (18:54 -0400)]
Support promoted servers in the recommendations
Samual Lenks [Sat, 12 Oct 2013 22:42:00 +0000 (18:42 -0400)]
Switch to new format for updatenotification