]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sat, 27 Nov 2010 23:06:41 +0000 (00:06 +0100)]
Merge branch 'master' into terencehill/newpanelhud
terencehill [Fri, 26 Nov 2010 22:35:59 +0000 (23:35 +0100)]
Something can be done for drawpic_aspect too
terencehill [Fri, 26 Nov 2010 22:17:10 +0000 (23:17 +0100)]
Less expensive drawstring_* functions
Rudolf Polzer [Fri, 26 Nov 2010 19:49:36 +0000 (20:49 +0100)]
catch errors
Rudolf Polzer [Fri, 26 Nov 2010 19:35:22 +0000 (20:35 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 26 Nov 2010 19:35:00 +0000 (20:35 +0100)]
add some test code for uri_post
terencehill [Fri, 26 Nov 2010 19:07:39 +0000 (20:07 +0100)]
Tiny cleanups
terencehill [Fri, 26 Nov 2010 18:59:49 +0000 (19:59 +0100)]
The caller of DrawNumIcon should set drawfont
terencehill [Fri, 26 Nov 2010 17:35:48 +0000 (18:35 +0100)]
Same story of the previous commit for the healtharmor panel
terencehill [Fri, 26 Nov 2010 17:15:38 +0000 (18:15 +0100)]
Powerups panel: thanks to the previous changes it's now easy (adding the var is_vertical) to reduce the code furthermore
Changed the aspect ratio check to display the vertical layout like the horizontal one for every aspect ratio
Rudolf Polzer [Fri, 26 Nov 2010 08:56:31 +0000 (09:56 +0100)]
Merge remote branch 'origin/fruitiex/add_soundchan'
Rudolf Polzer [Fri, 26 Nov 2010 08:47:25 +0000 (09:47 +0100)]
Merge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Fri, 26 Nov 2010 08:44:26 +0000 (09:44 +0100)]
Merge remote branch 'origin/fruitiex/noaccuracyspam'
Rudolf Polzer [Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)]
Merge remote branch 'origin/fruitiex/effectinfo_nerf'
FruitieX [Thu, 25 Nov 2010 23:29:18 +0000 (01:29 +0200)]
lower secondary mortar speed
terencehill [Thu, 25 Nov 2010 23:08:00 +0000 (00:08 +0100)]
HUD_Panel_GetProgressBarColorForString: most often queried items as first cases
FruitieX [Thu, 25 Nov 2010 22:58:41 +0000 (00:58 +0200)]
tiny shotgun nerf now
terencehill [Thu, 25 Nov 2010 22:54:16 +0000 (23:54 +0100)]
Check directly the cvar hud_panel_powerups_flip
FruitieX [Thu, 25 Nov 2010 22:52:33 +0000 (00:52 +0200)]
electro combo slightly stronger
terencehill [Thu, 25 Nov 2010 22:47:58 +0000 (23:47 +0100)]
DrawNumIcon vertical layout: draw number and icon with the same algorithm of the horizontal layout, it gives better results
FruitieX [Thu, 25 Nov 2010 22:46:34 +0000 (00:46 +0200)]
shotgun primary max dmg from 60 to 80 to balance it out a little more (it's currently second last on the damage stats)
FruitieX [Thu, 25 Nov 2010 22:44:56 +0000 (00:44 +0200)]
disable falloff on electro primary
terencehill [Thu, 25 Nov 2010 21:50:36 +0000 (22:50 +0100)]
Let's use consecutive numbers as possible align values to avoid confusion
terencehill [Thu, 25 Nov 2010 21:43:29 +0000 (22:43 +0100)]
DrawNumIcon vertical layout: draw numbers with different number of digits with the same y size
FruitieX [Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)]
Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance
terencehill [Thu, 25 Nov 2010 21:17:30 +0000 (22:17 +0100)]
Handle iconalign cvar value outside DrawNumIcon so that the logic in DrawNumIcon is simpler
terencehill [Thu, 25 Nov 2010 18:26:56 +0000 (19:26 +0100)]
DrawNumIcon can now display a vertical layout too (now more similar to the horizontal one)
FruitieX [Thu, 25 Nov 2010 15:29:43 +0000 (17:29 +0200)]
comment out a debug print
FruitieX [Thu, 25 Nov 2010 15:13:56 +0000 (17:13 +0200)]
nerf shotgun, uzi and hagar impact effects, they were a bit too insane with particle quality 1.0 (which is supposed to be the value we tweak these to!)
FruitieX [Thu, 25 Nov 2010 14:46:26 +0000 (16:46 +0200)]
add an additional arg to the W_SetupShot* functions for adjusting the sound channel. Use this on electro secondary and minstanex secondary laser
Rudolf Polzer [Thu, 25 Nov 2010 13:22:00 +0000 (14:22 +0100)]
move electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightning sound
Rudolf Polzer [Thu, 25 Nov 2010 12:37:20 +0000 (13:37 +0100)]
sync dpextensions with darkplaces (uri_post stuff)
Rudolf Polzer [Thu, 25 Nov 2010 06:19:36 +0000 (07:19 +0100)]
fix bad side effects of picking up ammo/health
Rudolf Polzer [Wed, 24 Nov 2010 20:15:36 +0000 (21:15 +0100)]
do announcer messages for bullets only for the rifle
Rudolf Polzer [Wed, 24 Nov 2010 19:56:58 +0000 (20:56 +0100)]
crylink link maintenance: fix one odd case that may have caused corruption
Rudolf Polzer [Wed, 24 Nov 2010 19:01:30 +0000 (20:01 +0100)]
better handle >100% accuracy
Rudolf Polzer [Wed, 24 Nov 2010 18:58:24 +0000 (19:58 +0100)]
crylink: properly calculate maxdmg
Rudolf Polzer [Wed, 24 Nov 2010 18:48:47 +0000 (19:48 +0100)]
more accuracy fixes
Rudolf Polzer [Wed, 24 Nov 2010 18:03:56 +0000 (19:03 +0100)]
Merge remote branch 'origin/divVerent/accuracy-fixes'
Rudolf Polzer [Wed, 24 Nov 2010 17:57:38 +0000 (18:57 +0100)]
remove two balance configs nobody needs AT ALL
FruitieX [Wed, 24 Nov 2010 17:39:14 +0000 (19:39 +0200)]
Merge remote branch 'origin/master' into fruitiex/balance
terencehill [Wed, 24 Nov 2010 16:41:51 +0000 (17:41 +0100)]
Extend HUD_Panel_DrawProgressBar to accept lenght_ratio and right_align parameters and compute the actual size
I had to tweak the acceleration progressbar because it wasn't limited; now uses a scale value of 1
terencehill [Wed, 24 Nov 2010 14:15:08 +0000 (15:15 +0100)]
Merge branch 'master' into terencehill/newpanelhud
Rudolf Polzer [Tue, 23 Nov 2010 17:22:05 +0000 (18:22 +0100)]
mine layer: properly inherit spawnshieldtime when sticking to a wall, to fix remote detonate
Rudolf Polzer [Tue, 23 Nov 2010 13:05:39 +0000 (14:05 +0100)]
accuracy: only resend if the accuracy value actually changed
Rudolf Polzer [Mon, 22 Nov 2010 16:12:08 +0000 (17:12 +0100)]
more fixes of accuracy new system
Rudolf Polzer [Mon, 22 Nov 2010 15:41:59 +0000 (16:41 +0100)]
forgot to actually initialize the accuracy tracking
Rudolf Polzer [Mon, 22 Nov 2010 15:41:00 +0000 (16:41 +0100)]
don't cull the accuracy entity
Rudolf Polzer [Mon, 22 Nov 2010 13:43:05 +0000 (14:43 +0100)]
accuracy: csqc updates to match the svqc stuff
Rudolf Polzer [Mon, 22 Nov 2010 13:31:15 +0000 (14:31 +0100)]
properly count minstanex damage
Rudolf Polzer [Mon, 22 Nov 2010 13:28:59 +0000 (14:28 +0100)]
resend accuracy when spectating
Rudolf Polzer [Mon, 22 Nov 2010 13:26:27 +0000 (14:26 +0100)]
way more fixes
Rudolf Polzer [Mon, 22 Nov 2010 12:49:47 +0000 (13:49 +0100)]
beginning of a SANE accuracy networking system
FruitieX [Sun, 21 Nov 2010 21:36:22 +0000 (23:36 +0200)]
with all the other stuff we have compromised, let's compromise this too! sv_maxspeed 360 = (320 + 400) / 2
FruitieX [Sun, 21 Nov 2010 21:34:14 +0000 (23:34 +0200)]
electro: eat less ammo again (5 per sec, with secondary you'll quickly empty it anyway)
terencehill [Sun, 21 Nov 2010 21:26:37 +0000 (22:26 +0100)]
Fix acceleration bar not correctly centered on y axis cause of sz initialized after pos
terencehill [Sun, 21 Nov 2010 21:07:09 +0000 (22:07 +0100)]
Remove unneeded code and vars of the radar panel
FruitieX [Sun, 21 Nov 2010 20:49:44 +0000 (22:49 +0200)]
less damage falloff on electro primary... dont make it useless at it's tip
FruitieX [Sun, 21 Nov 2010 20:20:02 +0000 (22:20 +0200)]
only 100 armor in lms/ca
FruitieX [Sun, 21 Nov 2010 20:10:51 +0000 (22:10 +0200)]
Merge remote branch 'origin/master' into fruitiex/balance
Rudolf Polzer [Sun, 21 Nov 2010 20:05:40 +0000 (21:05 +0100)]
more typos
Rudolf Polzer [Sun, 21 Nov 2010 20:05:12 +0000 (21:05 +0100)]
fix another typo
Rudolf Polzer [Sun, 21 Nov 2010 20:00:43 +0000 (21:00 +0100)]
do not reset items bits in non-ctf and non-nexball
Rudolf Polzer [Sun, 21 Nov 2010 20:00:13 +0000 (21:00 +0100)]
key bind editor: allow permanently unbinding keys
terencehill [Sun, 21 Nov 2010 15:56:32 +0000 (16:56 +0100)]
Master check for autocvar__hud_configure in HUD_Panel_GetBgAlpha
terencehill [Sun, 21 Nov 2010 15:54:02 +0000 (16:54 +0100)]
Rearrange a check in HUD_Panel_GetBgAlpha
terencehill [Sun, 21 Nov 2010 15:31:16 +0000 (16:31 +0100)]
If panel_bg is 0 avoid to waste time getting useless data
Not adding a similar check for alpha as it cannot be set to 0 in menu
terencehill [Sun, 21 Nov 2010 10:51:24 +0000 (11:51 +0100)]
Fix cvar name in Notify dialog
terencehill [Sun, 21 Nov 2010 10:42:09 +0000 (11:42 +0100)]
hud_fontsize isn't used by the HUD any longer (scoreboard and map voting screen use it and initialize it within their own code)
terencehill [Sun, 21 Nov 2010 09:55:11 +0000 (10:55 +0100)]
Display an example of rankings in hud_configure mode
terencehill [Sat, 20 Nov 2010 21:22:51 +0000 (22:22 +0100)]
Merge branch 'master' into terencehill/newpanelhud
Rudolf Polzer [Sat, 20 Nov 2010 06:40:54 +0000 (07:40 +0100)]
campaigntimer: allow win by timelimit if no fraglimit is set
Rudolf Polzer [Sat, 20 Nov 2010 06:15:04 +0000 (07:15 +0100)]
rename physics configs: Xonotic now uses physicsX0, Nexuiz ones are now called physicsNexuiz10 etc.
Rudolf Polzer [Sat, 20 Nov 2010 05:59:44 +0000 (06:59 +0100)]
nexball: don't display a useless health bar on a lone ball (BUT: could be undone, and later used for having the ball "time out")
terencehill [Fri, 19 Nov 2010 23:24:06 +0000 (00:24 +0100)]
Remove unused radar vars (they were used in the old radar code)
terencehill [Fri, 19 Nov 2010 23:06:46 +0000 (00:06 +0100)]
Delete ons-frame.tga and ons-frame-team.tga of the old radar view: code for it has been removed
Since no waypoint gets precached, neither precache ons-cp-* waypoints (path was wrong anyway, they are in models/sprites)
Rudolf Polzer [Fri, 19 Nov 2010 21:28:53 +0000 (22:28 +0100)]
fix latest fix
Rudolf Polzer [Fri, 19 Nov 2010 21:22:46 +0000 (22:22 +0100)]
ballistic projectiles: bail out on weapclip
Rudolf Polzer [Fri, 19 Nov 2010 21:08:35 +0000 (22:08 +0100)]
crylink: some debugging
FruitieX [Fri, 19 Nov 2010 19:46:18 +0000 (21:46 +0200)]
jointime 0.1 on crylink primary
Rudolf Polzer [Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)]
Merge remote branch 'origin/tzork/turrets-assualt-fix'
Rudolf Polzer [Fri, 19 Nov 2010 11:39:48 +0000 (12:39 +0100)]
Merge remote branch 'origin/fruitiex/cl_gentle_damage'
terencehill [Fri, 19 Nov 2010 08:27:54 +0000 (09:27 +0100)]
Use directly panel_pos and panel_size instead of copying them into panelPos and panelSize (in HUD_Panel_HighlightCheck and HUD_Panel_Highlight)
terencehill [Fri, 19 Nov 2010 08:15:15 +0000 (09:15 +0100)]
Fix 2 checks and use cursorsize
terencehill [Thu, 18 Nov 2010 23:39:42 +0000 (00:39 +0100)]
Less operations drawing pressed keys
FruitieX [Thu, 18 Nov 2010 21:47:29 +0000 (23:47 +0200)]
make the secondary grenades slower (speed 1000, speed_up 300)
FruitieX [Thu, 18 Nov 2010 21:44:53 +0000 (23:44 +0200)]
make this a fruit_vs_tzork_vs_samual-balance branch, by merging in Samual's rocketlauncher speeds ;)
FruitieX [Thu, 18 Nov 2010 21:36:45 +0000 (23:36 +0200)]
set pain_threshold_health back at 50. And s/treshold/threshold/g
FruitieX [Thu, 18 Nov 2010 21:10:36 +0000 (23:10 +0200)]
nerf the damage flash (same amount of damage now raises alpha by half the amount it used to), allow coloring the gentle flash with a custom color
Rudolf Polzer [Thu, 18 Nov 2010 21:05:12 +0000 (22:05 +0100)]
crylink: joinspeed -> joinspread (easier to tune in balance config)
tzork [Thu, 18 Nov 2010 16:04:14 +0000 (17:04 +0100)]
Make turrets switch team corretly in assualt.
FruitieX [Thu, 18 Nov 2010 14:23:13 +0000 (16:23 +0200)]
cl_gentle version of the damage flash
Rudolf Polzer [Thu, 18 Nov 2010 13:21:06 +0000 (14:21 +0100)]
fix the bug that antilagged bullets get newtonian projectile direction adjustment applied... as this is just wrong
Rudolf Polzer [Thu, 18 Nov 2010 12:11:15 +0000 (13:11 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Thu, 18 Nov 2010 12:11:00 +0000 (13:11 +0100)]
chooksta!
terencehill [Thu, 18 Nov 2010 11:32:11 +0000 (12:32 +0100)]
Different ammo count for each ammo type in hud_configure mode
terencehill [Thu, 18 Nov 2010 11:12:10 +0000 (12:12 +0100)]
autocvar_hud_configure_bg_minalpha
Rudolf Polzer [Thu, 18 Nov 2010 06:27:49 +0000 (07:27 +0100)]
Merge remote branch 'origin/fruitiex/csqc_polyblend'
Rudolf Polzer [Thu, 18 Nov 2010 06:22:33 +0000 (07:22 +0100)]
fix fruitiex's fix
Rudolf Polzer [Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +0100)]
Merge remote branch 'origin/fruitiex/fbfix'