]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Rudolf Polzer [Sat, 27 Aug 2011 15:07:54 +0000 (17:07 +0200)]
Fix CRLFs
Rudolf Polzer [Sat, 27 Aug 2011 14:19:29 +0000 (16:19 +0200)]
Merge remote-tracking branch 'origin/terencehill/centerprint_stuff'
Rudolf Polzer [Sat, 27 Aug 2011 14:08:08 +0000 (16:08 +0200)]
Merge remote-tracking branch 'origin/terencehill/cvar_desc'
Rudolf Polzer [Sat, 27 Aug 2011 14:07:18 +0000 (16:07 +0200)]
Merge remote-tracking branch 'origin/terencehill/tooltips_update'
Rudolf Polzer [Sat, 27 Aug 2011 14:12:00 +0000 (16:12 +0200)]
credits and languages list update
Rudolf Polzer [Sat, 27 Aug 2011 09:40:58 +0000 (11:40 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Sat, 27 Aug 2011 09:38:01 +0000 (11:38 +0200)]
Squashed commit of the following:
commit
eb19c38fc0c797e88327b814cd8ef26f98bc6f14
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu Aug 25 00:56:51 2011 +0300
Increase the font size of tips from 10 to 14, as requested by divVerent and Samual. Probability to rest in peace leveled up!
commit
f1b132ef40d7f4c173a025bce7151d194f0a1373
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed Aug 24 19:31:37 2011 +0300
Tweak some glow effects again
commit
4d45e15ee77c0e0ff9cabf3b1c5a9cb52c07d28d
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed Aug 24 19:23:18 2011 +0300
Add a screen and grain effect to the loading screens, and do a few other tweaks
commit
77870937718597480c2945078da3535fc7ff0b13
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed Aug 24 16:44:03 2011 +0300
Big changes to the loading screens; Blur the background, and use the Dry Brush effect in Photoshop to cartoonify it a bit. Fix white edges on players in most areas, making them look less ugly and fake. Add a 'bevel and enboss' effect on characters, to give them a nice lightning. Change font in tip messages to Xolonium... which looks pretty ugly, but it was requested :P Lastly, highlight keybinds in tip messages to yellow.
Rudolf Polzer [Sat, 27 Aug 2011 09:35:53 +0000 (11:35 +0200)]
reject server entries with negative ping
(workaround for an engine bug)
Rudolf Polzer [Fri, 26 Aug 2011 19:08:25 +0000 (21:08 +0200)]
german: fix capitalization "Wiederbelebt"
porto: fix a possible ready-restart bug
Rudolf Polzer [Thu, 25 Aug 2011 19:48:07 +0000 (21:48 +0200)]
ready restart: PROPERLY remove crylink projectiles
Rudolf Polzer [Thu, 25 Aug 2011 04:28:14 +0000 (06:28 +0200)]
update Finnish
Rudolf Polzer [Thu, 25 Aug 2011 04:26:20 +0000 (06:26 +0200)]
update credit for taximus
Rudolf Polzer [Wed, 24 Aug 2011 14:17:50 +0000 (16:17 +0200)]
also accept items as a proof we're not inside a "stupid cage"
Rudolf Polzer [Wed, 24 Aug 2011 14:14:21 +0000 (16:14 +0200)]
impulse 911: check if the destination location is "somewhat close" to a spawnpoint
Rudolf Polzer [Wed, 24 Aug 2011 13:37:40 +0000 (15:37 +0200)]
fix a possible double-damage bug from the crylink
Rudolf Polzer [Wed, 24 Aug 2011 13:34:34 +0000 (15:34 +0200)]
allow two more remove calls, these are safe
Rudolf Polzer [Wed, 24 Aug 2011 12:11:18 +0000 (14:11 +0200)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 24 Aug 2011 12:08:21 +0000 (14:08 +0200)]
Taximus' credit info
Rudolf Polzer [Wed, 24 Aug 2011 10:17:21 +0000 (12:17 +0200)]
simplify crylink code, handle removal by skybox proactively
Rudolf Polzer [Wed, 24 Aug 2011 10:09:15 +0000 (12:09 +0200)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 24 Aug 2011 10:08:04 +0000 (12:08 +0200)]
disallow removing crylink spikes if they are still referenced by players somehow
Rudolf Polzer [Wed, 24 Aug 2011 09:55:16 +0000 (11:55 +0200)]
more crylink cleanup
Rudolf Polzer [Wed, 24 Aug 2011 09:46:06 +0000 (11:46 +0200)]
do not prevent shooting crylink secondary while holding primary fire to focus later
Rudolf Polzer [Wed, 24 Aug 2011 09:42:53 +0000 (11:42 +0200)]
crylink: only block the SAME fire button while waiting for release
Rudolf Polzer [Wed, 24 Aug 2011 09:37:10 +0000 (11:37 +0200)]
strreplace
Rudolf Polzer [Wed, 24 Aug 2011 09:18:35 +0000 (11:18 +0200)]
fix typo
Rudolf Polzer [Wed, 24 Aug 2011 08:39:53 +0000 (10:39 +0200)]
Merge remote branch 'origin/divVerent/nixnex-fixes'
Rudolf Polzer [Wed, 24 Aug 2011 08:23:50 +0000 (10:23 +0200)]
Hide the map bsp file name if it is equal to the title other than for trivial changes
Should make the menu look better
Rudolf Polzer [Wed, 24 Aug 2011 08:06:59 +0000 (10:06 +0200)]
update French translation by Taximus
Rudolf Polzer [Tue, 23 Aug 2011 19:50:56 +0000 (21:50 +0200)]
spectating: BUTTON_USE = unlock view
Mircea Kitsune [Tue, 23 Aug 2011 19:06:04 +0000 (22:06 +0300)]
Set gloss back to 1, divVerent said nono. I'll leave the cvar in defaultXonotic.cfg however.
Mircea Kitsune [Tue, 23 Aug 2011 19:05:33 +0000 (22:05 +0300)]
Don't blur the bloom that far, but make it a little brighter
Mircea Kitsune [Tue, 23 Aug 2011 18:39:40 +0000 (21:39 +0300)]
Merge branch 'master' into mirceakitsune/rendering_tweaks
Rudolf Polzer [Tue, 23 Aug 2011 18:06:53 +0000 (20:06 +0200)]
bloom changes: undo changes to r_bloom_colorexponent and r_bloom_colorscale as these break HDR
Rudolf Polzer [Tue, 23 Aug 2011 17:59:55 +0000 (19:59 +0200)]
Merge commit '
97790f3c091dc810bd2540e0533b06a592bf6918 ' (mirceakitsune/rendering_tweaks)
Mircea Kitsune [Tue, 23 Aug 2011 17:25:04 +0000 (20:25 +0300)]
Bump r_shadow_glossintensity to 3 by default. Yep, you heard that right. It looms MUCH more awesome, trust me. Still to be tweaked.
Mircea Kitsune [Tue, 23 Aug 2011 17:23:31 +0000 (20:23 +0300)]
Much better and different overall bloom settings. Still to be tweaked.
Mircea Kitsune [Tue, 23 Aug 2011 16:38:04 +0000 (19:38 +0300)]
Lower color exponent for bloom
Mircea Kitsune [Tue, 23 Aug 2011 16:25:01 +0000 (19:25 +0300)]
Another one of my "lets make Xonotic have super-modern graphics" moments. Use more bloom blur by default, which looks better and more spread.
Rudolf Polzer [Tue, 23 Aug 2011 14:49:56 +0000 (16:49 +0200)]
fix english display of "Play". Thanks, terencehill.
Rudolf Polzer [Tue, 23 Aug 2011 12:46:05 +0000 (14:46 +0200)]
fix credit for Akari and ThePWTULN
Rudolf Polzer [Tue, 23 Aug 2011 12:12:07 +0000 (14:12 +0200)]
mickrip's credit
Rudolf Polzer [Tue, 23 Aug 2011 08:30:34 +0000 (10:30 +0200)]
put in the TODO for the credits
Rudolf Polzer [Tue, 23 Aug 2011 06:24:28 +0000 (08:24 +0200)]
bump gameversion. From now on, 0.1.0preview can no longer join.
Rudolf Polzer [Tue, 23 Aug 2011 06:23:13 +0000 (08:23 +0200)]
also charge the nex
Rudolf Polzer [Tue, 23 Aug 2011 06:19:50 +0000 (08:19 +0200)]
Hagar: fix the case of losing the weapon due to NIX
terencehill [Mon, 22 Aug 2011 22:20:11 +0000 (00:20 +0200)]
Tooltip for "Waypoints setup..." button in all the translations is outdated so remove it
terencehill [Mon, 22 Aug 2011 22:17:25 +0000 (00:17 +0200)]
Also update tooltips.db.ru
Rudolf Polzer [Mon, 22 Aug 2011 19:42:02 +0000 (21:42 +0200)]
try preventing weapon switching a more sensible way. Should work well with NIX that way.
Rudolf Polzer [Mon, 22 Aug 2011 19:32:58 +0000 (21:32 +0200)]
get rid of weird "forbid change" logic that breaks NIX
Rudolf Polzer [Mon, 22 Aug 2011 19:17:29 +0000 (21:17 +0200)]
NIX: reset weapon load on forced weapon switch
Rudolf Polzer [Mon, 22 Aug 2011 13:49:46 +0000 (15:49 +0200)]
experimental warpzone fix for sniping a player who stands halfway in a warpzone (not tested)
Rudolf Polzer [Mon, 22 Aug 2011 13:31:49 +0000 (15:31 +0200)]
do what the original fix was SUPPOSED to be (prevents players from hiding from rockets using a warpzone)
Rudolf Polzer [Mon, 22 Aug 2011 13:08:14 +0000 (15:08 +0200)]
fix a division by zero - NOTE: PLEASE RETEST WARPZONES WITH SLOW PROJECTILES AGAIN
Rudolf Polzer [Mon, 22 Aug 2011 07:21:58 +0000 (09:21 +0200)]
update .es too
Rudolf Polzer [Mon, 22 Aug 2011 07:20:49 +0000 (09:20 +0200)]
portuguese updates
Rudolf Polzer [Mon, 22 Aug 2011 04:48:55 +0000 (06:48 +0200)]
make urllib state machine more strict, error() immediately when a problem is detected
Rudolf Polzer [Mon, 22 Aug 2011 04:32:53 +0000 (06:32 +0200)]
urllib: make sure all errors have negative status
Rudolf Polzer [Sun, 21 Aug 2011 19:45:21 +0000 (21:45 +0200)]
playerstats: use urllib too
this allows writing the stats to a log file too for debugging
Rudolf Polzer [Sun, 21 Aug 2011 18:34:29 +0000 (20:34 +0200)]
Merge remote-tracking branch 'origin/terencehill/infinite_ammo'
Rudolf Polzer [Sun, 21 Aug 2011 18:26:45 +0000 (20:26 +0200)]
when resetting vote, notify the nagger
Rudolf Polzer [Sun, 21 Aug 2011 18:23:53 +0000 (20:23 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 21 Aug 2011 18:23:11 +0000 (20:23 +0200)]
rewrite instant action
now uses a truly random map, no longer .instantaction files
Rudolf Polzer [Sun, 21 Aug 2011 18:22:57 +0000 (20:22 +0200)]
don't add hidden maps by the "All" button in the menu
Rudolf Polzer [Sun, 21 Aug 2011 18:22:34 +0000 (20:22 +0200)]
up default bot skill from 1 to 4
mand1nga [Sun, 21 Aug 2011 16:33:31 +0000 (13:33 -0300)]
Minor changes to spanish translation
Rudolf Polzer [Sun, 21 Aug 2011 12:02:50 +0000 (14:02 +0200)]
German OK now
Rudolf Polzer [Sun, 21 Aug 2011 12:00:11 +0000 (14:00 +0200)]
update pot file
Rudolf Polzer [Sun, 21 Aug 2011 11:58:55 +0000 (13:58 +0200)]
update check script a bit
Rudolf Polzer [Sun, 21 Aug 2011 11:53:05 +0000 (13:53 +0200)]
Partially merged translation changes by terencehill
His branch conflicts!
Rudolf Polzer [Sun, 21 Aug 2011 11:50:23 +0000 (13:50 +0200)]
make check-translations.sh no longer work on non authorized systems
terencehill used it and caused merge conflicts for his branch that inhibit merging it
mand1nga [Sun, 21 Aug 2011 05:49:40 +0000 (02:49 -0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
mand1nga [Sun, 21 Aug 2011 05:48:48 +0000 (02:48 -0300)]
Update last translator for Spanish
Rudolf Polzer [Sun, 21 Aug 2011 05:38:16 +0000 (07:38 +0200)]
fix obviously wrong email address
Samual [Sun, 21 Aug 2011 05:22:29 +0000 (01:22 -0400)]
Update the string for hud_postprocessing effects in settings dialog
mand1nga [Sun, 21 Aug 2011 03:59:42 +0000 (00:59 -0300)]
Merge remote-tracking branch 'origin/samual/flyingspectators'
Samual [Sun, 21 Aug 2011 03:49:04 +0000 (23:49 -0400)]
Quick update with mand1nga's suggestion: Remove magical numbers for spectator size, instead use PL_CROUCH_* settings as that is roughly what I was going for anyway
mand1nga [Sun, 21 Aug 2011 03:10:17 +0000 (00:10 -0300)]
Merge remote-tracking branch 'origin/samual/flyingspectators'
mand1nga [Sun, 21 Aug 2011 02:54:31 +0000 (23:54 -0300)]
Merge remote-tracking branch 'origin/samual/fix_crosshair_hitindication'
mand1nga [Sun, 21 Aug 2011 01:44:28 +0000 (22:44 -0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
mand1nga [Sun, 21 Aug 2011 01:42:09 +0000 (22:42 -0300)]
CTF roles that need immediate actions should refresh their goals immediately
Rudolf Polzer [Sat, 20 Aug 2011 16:36:04 +0000 (18:36 +0200)]
add a fixme comment
Rudolf Polzer [Sat, 20 Aug 2011 16:32:10 +0000 (18:32 +0200)]
Avoid spawning gibs inside solid, fixes #589
terencehill [Sat, 20 Aug 2011 16:00:02 +0000 (18:00 +0200)]
Better description of g_ctf_shield_max_ratio and g_ctf_shield_min_negscore
terencehill [Sat, 20 Aug 2011 15:53:12 +0000 (17:53 +0200)]
Send one byte less in Send_KillNotification, Send_CSQC_KillCenterprint and Send_CSQC_Centerprint_Generic by networking directly TE_CSQC_* constants rather than TE_CSQC_NOTIFY + CSQC_* constants
Rudolf Polzer [Sat, 20 Aug 2011 15:50:56 +0000 (17:50 +0200)]
urllib: improve error handling
Rudolf Polzer [Sat, 20 Aug 2011 15:42:04 +0000 (17:42 +0200)]
add comments
Rudolf Polzer [Sat, 20 Aug 2011 15:40:48 +0000 (17:40 +0200)]
Merge remote-tracking branch 'origin/divVerent/urllib-weaponstats'
terencehill [Sat, 20 Aug 2011 15:15:48 +0000 (17:15 +0200)]
Rename Send_CSQC_Centerprint to Send_CSQC_KillCenterprint and HUD_Centerprint to HUD_KillCenterprint to make code less ambiguous
Samual [Sat, 20 Aug 2011 08:14:13 +0000 (04:14 -0400)]
Whoops forgot the comment
Samual [Sat, 20 Aug 2011 08:13:35 +0000 (04:13 -0400)]
Apply same logic to crosshair_pickup animation as well
Samual [Sat, 20 Aug 2011 08:02:52 +0000 (04:02 -0400)]
Better time for maxtimedifference value
Samual [Sat, 20 Aug 2011 08:00:29 +0000 (04:00 -0400)]
Work around a bug where if you spectate a player and they had a shot newer than your last hit_time then the code would still think it was your own shot when you switched to them (and thusly would play the hit sound/animation) -- Basically just check how old the hit_time is.
terencehill [Fri, 19 Aug 2011 23:11:45 +0000 (01:11 +0200)]
Merge branch 'master' into terencehill/centerprint_stuff
Rudolf Polzer [Fri, 19 Aug 2011 04:49:47 +0000 (06:49 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 19 Aug 2011 04:43:29 +0000 (06:43 +0200)]
don't remove a func_plat just because blocked got called at the wrong time
mand1nga [Thu, 18 Aug 2011 22:21:34 +0000 (19:21 -0300)]
Fix bug in CTF retriever
Rudolf Polzer [Thu, 18 Aug 2011 20:30:32 +0000 (22:30 +0200)]
Merge branch 'master' into divVerent/urllib-weaponstats
Rudolf Polzer [Thu, 18 Aug 2011 20:30:17 +0000 (22:30 +0200)]
add a comment about a bot personality idea
mand1nga [Thu, 18 Aug 2011 20:05:30 +0000 (17:05 -0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir