]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual Lenks [Sun, 24 Nov 2013 03:50:18 +0000 (22:50 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Conflicts:
qcsrc/client/View.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c
qcsrc/menu/xonotic/dialog_multiplayer_profile.c
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/dialog_settings_game_view.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_user.c
qcsrc/menu/xonotic/dialog_settings_video.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/util.qc
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.
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.
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:38:57 +0000 (14:38 -0400)]
Merge branch 'samual/serverlist' into samual/combined_updates
Samual Lenks [Thu, 24 Oct 2013 18:38:46 +0000 (14:38 -0400)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
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.
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.
Samual Lenks [Wed, 16 Oct 2013 19:25:33 +0000 (15:25 -0400)]
Updates to misc tab
Samual Lenks [Wed, 16 Oct 2013 03:08:10 +0000 (23:08 -0400)]
Fix some spacing
Samual Lenks [Wed, 16 Oct 2013 02:46:54 +0000 (22:46 -0400)]
Auto sendcvar on clippedspectating toggle
Samual Lenks [Wed, 16 Oct 2013 02:20:19 +0000 (22:20 -0400)]
Swap sides of view tab
Samual Lenks [Wed, 16 Oct 2013 01:59:46 +0000 (21:59 -0400)]
Decrease size of settings dialog, and clean up view tab
Samual Lenks [Tue, 15 Oct 2013 22:39:47 +0000 (18:39 -0400)]
Add exact same 0.5 offset to all settings tabs
Samual Lenks [Tue, 15 Oct 2013 22:29:40 +0000 (18:29 -0400)]
Massive improvements to crosshairs tab
Samual Lenks [Tue, 15 Oct 2013 19:34:09 +0000 (15:34 -0400)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Samual Lenks [Tue, 15 Oct 2013 19:28:17 +0000 (15:28 -0400)]
Working on crosshair tab for game settings menu (plus hittest stuff)
Rudolf Polzer [Tue, 15 Oct 2013 16:43:23 +0000 (18:43 +0200)]
Use new cvar check URL; kill CVAR_POPCON.
Samual Lenks [Mon, 14 Oct 2013 21:37:20 +0000 (17:37 -0400)]
Add view tab
Samual Lenks [Mon, 14 Oct 2013 20:17:14 +0000 (16:17 -0400)]
Working game settings tab setup/spacing, as well as settings window
spacing
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...
Samual Lenks [Sun, 13 Oct 2013 21:23:42 +0000 (17:23 -0400)]
Working on moving these dialogs to be tabs in the game settings tab
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
Samual Lenks [Sun, 13 Oct 2013 14:55:14 +0000 (10:55 -0400)]
Whoops, forgot to commit the particle slider file.... >.>
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
Samual Lenks [Sun, 13 Oct 2013 06:35:00 +0000 (02:35 -0400)]
Merge remote-tracking branch 'origin/samual/serverlist' into samual/combined_updates
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_join.c
Samual Lenks [Sun, 13 Oct 2013 05:43:12 +0000 (01:43 -0400)]
Fix some minor things
Samual Lenks [Sun, 13 Oct 2013 05:35:35 +0000 (01:35 -0400)]
Shrink settings window down by one row (now that settings is not so large)
Samual Lenks [Sun, 13 Oct 2013 05:26:42 +0000 (01:26 -0400)]
New slider/handling for particle effects settings
Samual Lenks [Sun, 13 Oct 2013 03:11:39 +0000 (23:11 -0400)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
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
Samual Lenks [Sun, 13 Oct 2013 01:17:08 +0000 (21:17 -0400)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Conflicts:
qcsrc/server/cl_client.qc
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
Rudolf Polzer [Sat, 12 Oct 2013 22:09:07 +0000 (00:09 +0200)]
Add a checkbox for crypto_aeslevel.
Samual Lenks [Sat, 12 Oct 2013 19:53:06 +0000 (15:53 -0400)]
Switch to recommendation mode 3
Samual Lenks [Sat, 12 Oct 2013 19:09:45 +0000 (15:09 -0400)]
Rename "Bookmark" button to "Favorite" button (it's called favorites...)
Rudolf Polzer [Sat, 12 Oct 2013 17:27:49 +0000 (19:27 +0200)]
Revert "Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height." no, users probably can know what they are doing, and adjust expectations ;)
This reverts commit
f1a4f975c754e9993e5617dc86e7025779f75bd2 .
Rudolf Polzer [Sat, 12 Oct 2013 17:26:22 +0000 (19:26 +0200)]
Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height.
Samual Lenks [Sat, 12 Oct 2013 17:22:16 +0000 (13:22 -0400)]
Adjustments to category rendering- left align with colon over servername
Rudolf Polzer [Sat, 12 Oct 2013 17:18:54 +0000 (19:18 +0200)]
This (zero-sizes text warning) can now actually happen if someone sets 320x240 res. Let's just allow it.
Rudolf Polzer [Sat, 12 Oct 2013 17:17:00 +0000 (19:17 +0200)]
r_restart on conwidth/conheight change to reload fonts at the proper sizes
Rudolf Polzer [Sat, 12 Oct 2013 17:08:49 +0000 (19:08 +0200)]
kill more 640x480 hacks
Rudolf Polzer [Sat, 12 Oct 2013 02:00:06 +0000 (04:00 +0200)]
Simplify a LOT.
Samual Lenks [Sat, 12 Oct 2013 01:57:00 +0000 (21:57 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist
Rudolf Polzer [Fri, 11 Oct 2013 14:54:39 +0000 (16:54 +0200)]
Fix compilation with gmqcc.
Rudolf Polzer [Fri, 11 Oct 2013 14:51:19 +0000 (16:51 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/func_train_beizer_curve'
Conflicts:
qcsrc/server/t_plats.qc
Rudolf Polzer [Fri, 11 Oct 2013 14:48:35 +0000 (16:48 +0200)]
Merge remote-tracking branch 'origin/mrbougo/quickfix-mapinfo_gen_typo', fixes #1756
* origin/mrbougo/quickfix-mapinfo_gen_typo:
fix typo in mapinfo generation
Rudolf Polzer [Fri, 11 Oct 2013 14:45:51 +0000 (16:45 +0200)]
Merge matthiaskrgr/cmds by squashing, fixes #1783.
Rudolf Polzer [Fri, 11 Oct 2013 12:59:03 +0000 (14:59 +0200)]
Refactor item position code. Should be easier to adapt to new category handling.
Rudolf Polzer [Fri, 11 Oct 2013 06:06:25 +0000 (08:06 +0200)]
ONE BYTE.
Rudolf Polzer [Fri, 11 Oct 2013 05:43:14 +0000 (07:43 +0200)]
Fix bug in begin handling.
Rudolf Polzer [Fri, 11 Oct 2013 05:33:52 +0000 (07:33 +0200)]
Bottom align the headings.
Rudolf Polzer [Fri, 11 Oct 2013 05:20:04 +0000 (07:20 +0200)]
Give the headings 1.5 rows height.
Rudolf Polzer [Fri, 11 Oct 2013 05:21:21 +0000 (07:21 +0200)]
Merge remote-tracking branch 'origin/master' into samual/serverlist
Rudolf Polzer [Fri, 11 Oct 2013 04:33:13 +0000 (06:33 +0200)]
use a proper binary search
Samual Lenks [Fri, 11 Oct 2013 03:11:59 +0000 (23:11 -0400)]
Add comment for another binary search method
Samual Lenks [Fri, 11 Oct 2013 01:08:27 +0000 (21:08 -0400)]
Use binary search to find first item for each category
Samual Lenks [Thu, 10 Oct 2013 22:59:48 +0000 (18:59 -0400)]
remove useless comment
Samual Lenks [Thu, 10 Oct 2013 22:12:04 +0000 (18:12 -0400)]
Improve purity checks for category selection
Samual Lenks [Thu, 10 Oct 2013 21:50:45 +0000 (17:50 -0400)]
More improvements to recommendations logic
Samual Lenks [Thu, 10 Oct 2013 19:27:15 +0000 (15:27 -0400)]
Registration has to be done much earlier, not in configuration
Samual Lenks [Thu, 10 Oct 2013 18:57:34 +0000 (14:57 -0400)]
Working on recommendation logic
Rudolf Polzer [Thu, 10 Oct 2013 17:47:56 +0000 (19:47 +0200)]
Revert "another superslow loop. FIXME added." as this is just once per
frame.
This reverts commit
d6ba966669f62089c5cb01bcc9662ad4cddc6054 .
Rudolf Polzer [Thu, 10 Oct 2013 17:45:38 +0000 (19:45 +0200)]
another superslow loop. FIXME added.
Rudolf Polzer [Thu, 10 Oct 2013 17:43:33 +0000 (19:43 +0200)]
add FIXME for totally slow unacceptable code
Rudolf Polzer [Thu, 10 Oct 2013 17:41:10 +0000 (19:41 +0200)]
Apply rename of category function.
Samual Lenks [Thu, 10 Oct 2013 17:40:32 +0000 (13:40 -0400)]
Add updatenotification support for recommended servers
Samual Lenks [Thu, 10 Oct 2013 17:25:17 +0000 (13:25 -0400)]
Merge branch 'samual/serverlist' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/serverlist
Samual Lenks [Thu, 10 Oct 2013 17:24:54 +0000 (13:24 -0400)]
Clean up retrieval methods
Rudolf Polzer [Thu, 10 Oct 2013 17:14:28 +0000 (19:14 +0200)]
sync dpdefs