]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sun, 5 Feb 2012 19:09:38 +0000 (20:09 +0100)]
Code improvements to make possible to keep the zoom state while browsing the images (not applied to the screenshot viewer but it'd be handy in the player model selector hehe)
terencehill [Sat, 4 Feb 2012 21:47:32 +0000 (22:47 +0100)]
Display the screenshot name as dialog title :)
terencehill [Sat, 4 Feb 2012 21:29:40 +0000 (22:29 +0100)]
Add a missing check to fix the broken zooming
terencehill [Sat, 4 Feb 2012 19:10:06 +0000 (20:10 +0100)]
Fix some post-merge issues
terencehill [Sat, 4 Feb 2012 19:04:42 +0000 (20:04 +0100)]
Merge branch 'master' into terencehill/screenshot_viewer
Conflicts:
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/menu/item/image.c
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/mainwindow.c
Rudolf Polzer [Thu, 2 Feb 2012 18:07:41 +0000 (19:07 +0100)]
mapinfo: rename nexball -> nb, keepaway -> ka, freezetag -> ft, to keep all names consistently short.
Old names are supported for compatibility, but warned about.
Rudolf Polzer [Tue, 31 Jan 2012 19:48:23 +0000 (20:48 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 31 Jan 2012 19:41:43 +0000 (20:41 +0100)]
bump g_xonoticversion
Rudolf Polzer [Mon, 30 Jan 2012 15:54:42 +0000 (16:54 +0100)]
latch prvm_language changes from menu
Rudolf Polzer [Sun, 29 Jan 2012 10:14:48 +0000 (11:14 +0100)]
be a bit nicer to scripts running the engine by also echoing ]quit when quitting from the menu
Rudolf Polzer [Fri, 27 Jan 2012 19:11:40 +0000 (20:11 +0100)]
fix accelerometer with csqcmodels
Rudolf Polzer [Fri, 27 Jan 2012 15:13:48 +0000 (16:13 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 27 Jan 2012 15:11:15 +0000 (16:11 +0100)]
make vid_width, vid_height, vid_pixelwidth fully authoritative again, make menu_vid_width etc. cvars temporary and internal (prefixed with underscore) instead
Rudolf Polzer [Fri, 27 Jan 2012 11:33:29 +0000 (12:33 +0100)]
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 27 Jan 2012 11:33:16 +0000 (12:33 +0100)]
add Mepper
Samual [Fri, 27 Jan 2012 03:47:21 +0000 (22:47 -0500)]
Lower spread a little for hagar
Samual [Fri, 27 Jan 2012 03:10:06 +0000 (22:10 -0500)]
Fix draw_aspect for when the image has no size, previously the engine used to return '16 16 0' (notexture size), now it returns just '0 0 0', so just check for this in the macro.
Samual [Fri, 27 Jan 2012 00:22:12 +0000 (19:22 -0500)]
Merge remote branch 'origin/terencehill/hud_config_fixes'
Samual [Thu, 26 Jan 2012 23:19:33 +0000 (18:19 -0500)]
Merge remote branch 'origin/master' into terencehill/hud_config_fixes
Samual [Thu, 26 Jan 2012 22:47:00 +0000 (17:47 -0500)]
Fix issue #1040
Samual [Thu, 26 Jan 2012 22:38:00 +0000 (17:38 -0500)]
Various fixes for menu
Rudolf Polzer [Thu, 26 Jan 2012 20:23:20 +0000 (21:23 +0100)]
get rid of "this command only works on servers" error, because such commands ARE supposed to work on LISTEN servers too, not just DEDICATED!
Rudolf Polzer [Thu, 26 Jan 2012 17:45:51 +0000 (18:45 +0100)]
reinit renderer if at initial startup texture compression state changed. Fixes lots of bugs.
Rudolf Polzer [Thu, 26 Jan 2012 16:19:16 +0000 (17:19 +0100)]
also call updateCompression on menu init, may fix problem with +exec +map
Rudolf Polzer [Thu, 26 Jan 2012 12:52:22 +0000 (13:52 +0100)]
fix the TDempty call
Rudolf Polzer [Thu, 26 Jan 2012 12:47:56 +0000 (13:47 +0100)]
more french
Rudolf Polzer [Thu, 26 Jan 2012 12:46:53 +0000 (13:46 +0100)]
translation updates for German by Sless
Rudolf Polzer [Thu, 26 Jan 2012 12:36:42 +0000 (13:36 +0100)]
change cc address
Rudolf Polzer [Thu, 26 Jan 2012 12:35:57 +0000 (13:35 +0100)]
Calinou translated this
Rudolf Polzer [Thu, 26 Jan 2012 12:32:51 +0000 (13:32 +0100)]
french fixes
Rudolf Polzer [Thu, 26 Jan 2012 12:31:31 +0000 (13:31 +0100)]
french csprogs translation
Rudolf Polzer [Thu, 26 Jan 2012 12:30:00 +0000 (13:30 +0100)]
add back a missing indent
Rudolf Polzer [Thu, 26 Jan 2012 12:28:34 +0000 (13:28 +0100)]
fix two wrong sized items
Rudolf Polzer [Thu, 26 Jan 2012 12:27:24 +0000 (13:27 +0100)]
fix size of player model selector
Rudolf Polzer [Thu, 26 Jan 2012 12:24:58 +0000 (13:24 +0100)]
showboxes fixes
Rudolf Polzer [Thu, 26 Jan 2012 12:02:41 +0000 (13:02 +0100)]
show boxes around inputbox too
Rudolf Polzer [Thu, 26 Jan 2012 11:56:25 +0000 (12:56 +0100)]
fix listboxes with showboxes
Rudolf Polzer [Thu, 26 Jan 2012 11:53:31 +0000 (12:53 +0100)]
update german; menu_showboxes debug feature
Rudolf Polzer [Thu, 26 Jan 2012 11:24:31 +0000 (12:24 +0100)]
no idea why this was missing, but: update the .pot file again
Rudolf Polzer [Wed, 25 Jan 2012 18:20:42 +0000 (19:20 +0100)]
Merge remote-tracking branch 'origin/master' into samual/menu_updates
Rudolf Polzer [Wed, 25 Jan 2012 17:22:50 +0000 (18:22 +0100)]
fix some g_ka_ cvars, they should be g_keepaway_
Rudolf Polzer [Wed, 25 Jan 2012 17:14:13 +0000 (18:14 +0100)]
fix translated tooltips too
Rudolf Polzer [Wed, 25 Jan 2012 17:13:19 +0000 (18:13 +0100)]
fix tooltip of cl_particles_quality
Rudolf Polzer [Tue, 24 Jan 2012 21:47:51 +0000 (22:47 +0100)]
Merge branch 'samual/menu_updates' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/menu_updates
Rudolf Polzer [Tue, 24 Jan 2012 21:47:38 +0000 (22:47 +0100)]
make use of DRAW_CACHEPIC_MIPMAP
Rudolf Polzer [Tue, 24 Jan 2012 21:29:00 +0000 (22:29 +0100)]
resync dpdefs
Samual [Tue, 24 Jan 2012 18:17:21 +0000 (13:17 -0500)]
Merge remote branch 'origin/master' into samual/menu_updates
Rudolf Polzer [Tue, 24 Jan 2012 17:20:05 +0000 (18:20 +0100)]
edit the benchmark demo to remove the curl commands
Rudolf Polzer [Tue, 24 Jan 2012 17:07:47 +0000 (18:07 +0100)]
new keyhunt demo by mepper
Rudolf Polzer [Mon, 23 Jan 2012 12:27:29 +0000 (13:27 +0100)]
workaround for nexball bugs :(
Rudolf Polzer [Mon, 23 Jan 2012 12:21:06 +0000 (13:21 +0100)]
weapon-stay bugfixes
Rudolf Polzer [Sun, 22 Jan 2012 16:52:31 +0000 (17:52 +0100)]
allow gl_picmip 3 as "Lowest"
Rudolf Polzer [Sun, 22 Jan 2012 14:57:04 +0000 (15:57 +0100)]
casings: if they got removed by a touch function, abort the draw handler
Rudolf Polzer [Sat, 21 Jan 2012 19:01:19 +0000 (20:01 +0100)]
Merge branch 'master' into samual/menu_updates
Rudolf Polzer [Sat, 21 Jan 2012 18:59:21 +0000 (19:59 +0100)]
cvar color picker:
1. fix it constantly setting the cvar when enabled, instead support the saveCvars/loadCvars system
2. when the cvar name ends with an underscore, append red, green, blue and use separate cvars
Rudolf Polzer [Sat, 21 Jan 2012 16:50:08 +0000 (17:50 +0100)]
we no longer need to turn off "c" and "cs" :)
Rudolf Polzer [Sat, 21 Jan 2012 16:45:02 +0000 (17:45 +0100)]
error for another bad fteqcc bug
Rudolf Polzer [Sat, 21 Jan 2012 16:30:21 +0000 (17:30 +0100)]
fix bad use of "" vs string_null
Rudolf Polzer [Sat, 21 Jan 2012 15:40:38 +0000 (16:40 +0100)]
fix scroll vs drag detection in the weapons list
Rudolf Polzer [Fri, 20 Jan 2012 21:13:26 +0000 (22:13 +0100)]
compile fix
Rudolf Polzer [Fri, 20 Jan 2012 21:06:45 +0000 (22:06 +0100)]
fireball: don't use ammo any more
Rudolf Polzer [Fri, 20 Jan 2012 17:02:49 +0000 (18:02 +0100)]
flip pitch. Don't ask.
Rudolf Polzer [Fri, 20 Jan 2012 16:20:25 +0000 (17:20 +0100)]
implement target support
Rudolf Polzer [Fri, 20 Jan 2012 16:17:25 +0000 (17:17 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 20 Jan 2012 16:17:11 +0000 (17:17 +0100)]
g_max_info_autoscreenshot
Samual [Fri, 20 Jan 2012 04:21:57 +0000 (23:21 -0500)]
Add defaults for older client support
Samual [Fri, 20 Jan 2012 04:17:07 +0000 (23:17 -0500)]
Add back cl_forcemyplayermodel, but again hidden normally
Samual [Fri, 20 Jan 2012 02:57:02 +0000 (21:57 -0500)]
tweak crosshair defaults
Samual [Fri, 20 Jan 2012 02:54:40 +0000 (21:54 -0500)]
Merge remote branch 'origin/master' into samual/menu_updates
Conflicts:
qcsrc/menu/xonotic/dialog_settings_effects.c
Samual [Fri, 20 Jan 2012 01:37:53 +0000 (20:37 -0500)]
Merge remote branch 'origin/mirceakitsune/damage_effects'
Samual [Fri, 20 Jan 2012 01:16:35 +0000 (20:16 -0500)]
Merge remote branch 'origin/master' into mirceakitsune/damage_effects
Samual [Fri, 20 Jan 2012 00:48:52 +0000 (19:48 -0500)]
Merge remote branch 'origin/master' into samual/menu_updates
Samual [Fri, 20 Jan 2012 00:20:26 +0000 (19:20 -0500)]
Remove useless comments
Samual [Fri, 20 Jan 2012 00:18:19 +0000 (19:18 -0500)]
Reorganize serverinfo window and improve it slightly
Rudolf Polzer [Thu, 19 Jan 2012 20:44:41 +0000 (21:44 +0100)]
jumppad: don't set jump anim on dead players. Fixes #1029
Samual [Thu, 19 Jan 2012 20:07:25 +0000 (15:07 -0500)]
Make the xaw skin use the same rows/width for credits dialog as the other skins (why was this separate in the first place? Someone forgot to change it when updating skins perhaps?)
Samual [Thu, 19 Jan 2012 20:05:45 +0000 (15:05 -0500)]
Update menu skin files to use new color options
Samual [Thu, 19 Jan 2012 19:47:22 +0000 (14:47 -0500)]
More ZCTX stuff
Samual [Thu, 19 Jan 2012 19:32:23 +0000 (14:32 -0500)]
Use ZCTX(_("")) for the translated strings where "disabled" or such arises, just in case the string needs to be specific to the option
Samual [Thu, 19 Jan 2012 19:16:18 +0000 (14:16 -0500)]
Fix apply immediately in playersetup window
Rudolf Polzer [Thu, 19 Jan 2012 19:15:50 +0000 (20:15 +0100)]
turn off EF_RED for superweapons, it's annoying
Rudolf Polzer [Thu, 19 Jan 2012 19:09:29 +0000 (20:09 +0100)]
fix settemp alias
Rudolf Polzer [Thu, 19 Jan 2012 19:00:15 +0000 (20:00 +0100)]
even more verbose on bot script timing errors
Rudolf Polzer [Thu, 19 Jan 2012 18:39:48 +0000 (19:39 +0100)]
be more detailed in complaints
Rudolf Polzer [Thu, 19 Jan 2012 18:18:13 +0000 (19:18 +0100)]
don't show porto preview beams when secondary exists
Samual [Thu, 19 Jan 2012 18:17:39 +0000 (13:17 -0500)]
Some cleanups for gametype list and create tab
Samual [Thu, 19 Jan 2012 17:39:57 +0000 (12:39 -0500)]
Here too
Samual [Thu, 19 Jan 2012 17:38:17 +0000 (12:38 -0500)]
And adjust effects settings a bit
Samual [Thu, 19 Jan 2012 17:37:05 +0000 (12:37 -0500)]
Adjust demos tab a bit
Samual [Thu, 19 Jan 2012 17:30:30 +0000 (12:30 -0500)]
Finish making the HUD settings dialog
Samual [Thu, 19 Jan 2012 16:42:01 +0000 (11:42 -0500)]
Tweak the view settings dialog to look a little better
Samual [Thu, 19 Jan 2012 16:38:59 +0000 (11:38 -0500)]
Finish model dialog
Samual [Thu, 19 Jan 2012 15:31:27 +0000 (10:31 -0500)]
Working on model dialog
Rudolf Polzer [Thu, 19 Jan 2012 13:03:06 +0000 (14:03 +0100)]
clear superweapons_finished once lost
Rudolf Polzer [Thu, 19 Jan 2012 13:02:03 +0000 (14:02 +0100)]
fix superweapons detection better
Rudolf Polzer [Thu, 19 Jan 2012 12:52:50 +0000 (13:52 +0100)]
enable portal gun mode in default balance
Rudolf Polzer [Thu, 19 Jan 2012 12:52:13 +0000 (13:52 +0100)]
porto: turn into superweapon with timer; add cvar g_balance_porto_secondary for portal gun (still in and out portal are separate)
Samual [Thu, 19 Jan 2012 06:12:19 +0000 (01:12 -0500)]
Better phrasing
Samual [Thu, 19 Jan 2012 04:15:57 +0000 (23:15 -0500)]
Add "mutewhenidle" selection in audio tab, move tooltip selection to misc tab, and generally finish writing the misc tab
Samual [Thu, 19 Jan 2012 02:37:58 +0000 (21:37 -0500)]
Add cl_netlocalping for misc settings