]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mircea Kitsune [Thu, 25 Aug 2011 19:51:35 +0000 (22:51 +0300)]
Revert entcs back, and use getplayerorigin() to get the origin for the effect
Mircea Kitsune [Thu, 25 Aug 2011 16:44:21 +0000 (19:44 +0300)]
Update existing damage effect info instead of spawning a new one.
Mircea Kitsune [Thu, 25 Aug 2011 16:36:38 +0000 (19:36 +0300)]
Re-implement lifetime for the effects
Mircea Kitsune [Thu, 25 Aug 2011 16:23:47 +0000 (19:23 +0300)]
Fix some things in the damage code
Mircea Kitsune [Thu, 25 Aug 2011 15:57:38 +0000 (18:57 +0300)]
Allow specifying how often to generate the particles. Also randomize them for gibs, so gibs don't all generate effects at the same time and look ugly.
Mircea Kitsune [Thu, 25 Aug 2011 15:37:47 +0000 (18:37 +0300)]
Arrange the code better, and allow setting effects on players and gibs independently.
Mircea Kitsune [Thu, 25 Aug 2011 15:29:54 +0000 (18:29 +0300)]
Tweak some gib code and comments for the damage effects
Mircea Kitsune [Thu, 25 Aug 2011 15:23:38 +0000 (18:23 +0300)]
Enable damage effects on gibs again, and fix local player detection
Mircea Kitsune [Thu, 25 Aug 2011 15:17:34 +0000 (18:17 +0300)]
Another entcs tweak, to allow sending it for dead players. Again, this needs a decision.
Mircea Kitsune [Thu, 25 Aug 2011 14:55:51 +0000 (17:55 +0300)]
Temporarily tweak entcs so it's sent for both self and enemy players in the view. This might be buggy and needs to be discussed first!
Mircea Kitsune [Thu, 25 Aug 2011 14:44:01 +0000 (17:44 +0300)]
Get the damage effects PARTLY working again. They will only show on team mates so far, due to an apparent entcs bug (entcs not being sent to enemies of the player).
Mircea Kitsune [Thu, 25 Aug 2011 14:04:50 +0000 (17:04 +0300)]
Attempt to move the repeater of the damage effect client side, using entcs to get the player's origin. Previously, the server would send the effect to all clients every 0.1 seconds (lots of bandwidth). With this change, it will only send it once per damage event, and the client will find the origin and repeat it. Not guaranteed to work yet, and this commit might break it!
Mircea Kitsune [Thu, 25 Aug 2011 12:36:41 +0000 (15:36 +0300)]
Merge branch 'master' into mirceakitsune/damage_effects
Conflicts:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
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
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
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'
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.
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
mand1nga [Thu, 18 Aug 2011 19:43:19 +0000 (16:43 -0300)]
Experimental: path optimization
Rudolf Polzer [Thu, 18 Aug 2011 19:00:42 +0000 (21:00 +0200)]
Merge branch 'master' into divVerent/urllib-weaponstats
Rudolf Polzer [Thu, 18 Aug 2011 19:00:29 +0000 (21:00 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Thu, 18 Aug 2011 18:59:51 +0000 (20:59 +0200)]
some cvar check updates
mand1nga [Thu, 18 Aug 2011 18:45:48 +0000 (15:45 -0300)]
Fix escaping from jump pads
mand1nga [Thu, 18 Aug 2011 13:53:21 +0000 (10:53 -0300)]
Take in account cvar g_antilag_bullets for aiming (only for shotgun for now)
mand1nga [Thu, 18 Aug 2011 13:28:15 +0000 (10:28 -0300)]
Use real shotgun primary speed for bot aiming
mand1nga [Thu, 18 Aug 2011 12:57:34 +0000 (09:57 -0300)]
Fix rifle aim for bots
mand1nga [Thu, 18 Aug 2011 12:38:23 +0000 (09:38 -0300)]
Set the right hit flags for bot aiming