]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
sev [Wed, 30 Mar 2011 20:31:39 +0000 (22:31 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
Rudolf Polzer [Wed, 30 Mar 2011 20:28:58 +0000 (22:28 +0200)]
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
sev [Wed, 30 Mar 2011 20:26:58 +0000 (22:26 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
Samual [Wed, 30 Mar 2011 17:01:55 +0000 (13:01 -0400)]
Replace the old default hud, and add some updated/better defaults for the confg
Samual [Wed, 30 Mar 2011 07:54:12 +0000 (03:54 -0400)]
Merge remote branch 'origin/master' into sev/hudlayout
Samual [Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)]
Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
mand1nga [Wed, 30 Mar 2011 02:35:42 +0000 (23:35 -0300)]
Experiment: Set MOVETYPE_TOSS on the vehicle when unmanned and taking damage
Jakob MG [Wed, 30 Mar 2011 00:38:31 +0000 (02:38 +0200)]
Racer fires one rocket at the time. All vehicles crush. Raptor primary fires two bolts ber side then has a slight refire added. Tweak settings
Jakob MG [Tue, 29 Mar 2011 20:28:45 +0000 (22:28 +0200)]
Update effectsinfo
Jakob MG [Tue, 29 Mar 2011 20:21:30 +0000 (22:21 +0200)]
Merge master
Jakob MG [Tue, 29 Mar 2011 20:18:53 +0000 (22:18 +0200)]
Make things somewhat usable before venturing into ODE land
Rudolf Polzer [Tue, 29 Mar 2011 16:32:04 +0000 (18:32 +0200)]
FINALLY fix the "warpzonelib" error a proper way
Jakob MG [Tue, 29 Mar 2011 04:09:40 +0000 (06:09 +0200)]
Fix wrong colormap for returnign vehicle after it returns / repsawn. Make vehicles un-enterable for a short while after beeing exited (so you dont accidently enter your vehicle again) Begin mass based force transfer colission system.
Rudolf Polzer [Mon, 28 Mar 2011 16:57:51 +0000 (18:57 +0200)]
Merge remote-tracking branch 'origin/samual/change_default_balance'
Rudolf Polzer [Mon, 28 Mar 2011 15:45:37 +0000 (17:45 +0200)]
rebalance this to actually make some difference
Rudolf Polzer [Mon, 28 Mar 2011 15:45:06 +0000 (17:45 +0200)]
fix slow push :P
Rudolf Polzer [Mon, 28 Mar 2011 15:31:46 +0000 (17:31 +0200)]
Fix some bugs in here
Rudolf Polzer [Mon, 28 Mar 2011 14:13:59 +0000 (16:13 +0200)]
new toy: autocvar_g_damagepush_speedfactor - ENJOY
Jakob MG [Mon, 28 Mar 2011 04:04:36 +0000 (06:04 +0200)]
New effects, revert to v_angle based steering (get rid of crazy turns), fix deth creds for spider and raptor, better settings, new rocket ai for racer rockets, and so on.
Rudolf Polzer [Sun, 27 Mar 2011 05:32:42 +0000 (07:32 +0200)]
move the minstanex_ammo hack out of WR_THINK, as now multiple WR_s may use it, even before WR_THINK is called
terencehill [Sat, 26 Mar 2011 19:48:29 +0000 (20:48 +0100)]
Fix minstagib where isn't possible to shoot when you have 9 cells left
Jakob MG [Sat, 26 Mar 2011 17:00:25 +0000 (18:00 +0100)]
Make colormap & fullbright work (uses g_fullbrightplayers), fix raptor shirt/pants. remove unused raptor_cockpit.jpg
Jakob MG [Sat, 26 Mar 2011 14:54:14 +0000 (15:54 +0100)]
Turn raptor bombs into csqc projectiles
Jakob MG [Sat, 26 Mar 2011 14:39:46 +0000 (15:39 +0100)]
Use pmove_vel & _org fro raptor bombing crosshair insted of buggy hakk, should be smooth now. A little better default settings for raptor
Rudolf Polzer [Fri, 25 Mar 2011 22:50:45 +0000 (23:50 +0100)]
some unused vars be gone
Jakob MG [Fri, 25 Mar 2011 19:45:59 +0000 (20:45 +0100)]
fix colormap in team games
mand1nga [Fri, 25 Mar 2011 16:58:30 +0000 (13:58 -0300)]
Added cvars for racer blowup damage
Jakob MG [Fri, 25 Mar 2011 16:32:35 +0000 (17:32 +0100)]
Some claim that you should acctualy add teh files you use. pfff.
mand1nga [Fri, 25 Mar 2011 03:34:45 +0000 (00:34 -0300)]
Minor changes
mand1nga [Fri, 25 Mar 2011 03:17:35 +0000 (00:17 -0300)]
Lots of fixes and polishing!
Rodrigo Mouton Laudin [Fri, 25 Mar 2011 03:15:59 +0000 (00:15 -0300)]
Initial version of Spanish translation
Jakob MG [Fri, 25 Mar 2011 01:46:01 +0000 (02:46 +0100)]
add more crosshairs for vehicles
Jakob MG [Fri, 25 Mar 2011 01:44:42 +0000 (02:44 +0100)]
clean up racer, make it steer arround crosshair & make it use new taregt lock system.
Jakob MG [Fri, 25 Mar 2011 00:27:25 +0000 (01:27 +0100)]
save state before removing stale code
Samual [Thu, 24 Mar 2011 16:24:41 +0000 (12:24 -0400)]
Merge remote branch 'origin/master' into samual/change_default_balance
sev [Thu, 24 Mar 2011 11:26:18 +0000 (12:26 +0100)]
New panel border color for single player: light blue, matching menu window color
Mircea Kitsune [Wed, 23 Mar 2011 16:59:49 +0000 (18:59 +0200)]
Better names
Mircea Kitsune [Wed, 23 Mar 2011 16:54:55 +0000 (18:54 +0200)]
Fix HUD blood splash being drawn at incorrect position / size. It was using the reticle positioning, which got filtered in a recent change.
sev [Wed, 23 Mar 2011 16:40:18 +0000 (17:40 +0100)]
Added HUD layout for the Luminos skin: hud_luminos_small. Between default and minimal.
Rudolf Polzer [Wed, 23 Mar 2011 06:17:14 +0000 (07:17 +0100)]
use crylink_impact again (which is a copy of crylink_impactbig currently, but keeping them separate for morphed to play with)
Rudolf Polzer [Wed, 23 Mar 2011 06:16:50 +0000 (07:16 +0100)]
Merge branch 'master' into samual/change_default_balance
Rudolf Polzer [Wed, 23 Mar 2011 06:16:16 +0000 (07:16 +0100)]
visual fix for crylink impact
Rudolf Polzer [Wed, 23 Mar 2011 06:12:06 +0000 (07:12 +0100)]
Merge remote branch 'origin/terencehill/misc_bugfixes'
Samual [Wed, 23 Mar 2011 01:36:13 +0000 (21:36 -0400)]
Merge branch 'samual/change_default_balance' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/change_default_balance
Samual [Tue, 22 Mar 2011 23:23:56 +0000 (19:23 -0400)]
Swap the file names back and add support for old seeker abilities -- now should be good to merge
Rudolf Polzer [Tue, 22 Mar 2011 21:20:38 +0000 (22:20 +0100)]
add key binds for balance testing (F7 = balanceSamual, F8 = balanceXonotic), also aliases balanceSamual, balanceFruitieX
terencehill [Tue, 22 Mar 2011 18:30:55 +0000 (19:30 +0100)]
Check for negative values returned by search_begin searching for waypoints frames
Also add a function to load waypoints frames of a specific extension to avoid code duplication
Actually, previous code is changed with the addition of the check for dh and of the variable ext_len
Samual [Tue, 22 Mar 2011 01:45:15 +0000 (21:45 -0400)]
Disable protection for minelayer proximity until further notice
Samual [Tue, 22 Mar 2011 00:15:00 +0000 (20:15 -0400)]
Lots of tweaks to the balance which were stashed away on my server - This should basically be done, as long as I didn't miss anything.
Samual [Mon, 21 Mar 2011 23:24:49 +0000 (19:24 -0400)]
Merge branch 'samual/crylink_updates' into samual/change_default_balance
Samual [Mon, 21 Mar 2011 23:22:28 +0000 (19:22 -0400)]
Merge branch 'samual/seeker_updates' into samual/change_default_balance
Samual [Mon, 21 Mar 2011 22:53:33 +0000 (18:53 -0400)]
Swap the configs and create one for FruitieX's old balance.
Samual [Mon, 21 Mar 2011 22:42:09 +0000 (18:42 -0400)]
Change the effect from crylink_impact to crylink_impactbig on the secondary of the crylink. Old way looked pathetically weak.
Samual [Mon, 21 Mar 2011 21:13:11 +0000 (17:13 -0400)]
New effect (slightly) for tag rockets
Samual [Mon, 21 Mar 2011 17:07:40 +0000 (13:07 -0400)]
Merge remote branch 'origin/master' into samual/seeker_updates
Samual [Mon, 21 Mar 2011 17:06:18 +0000 (13:06 -0400)]
Lets just add some placeholder sprites.... they're broken for some reason (and need tweaking ANYWAY)
Samual [Mon, 21 Mar 2011 07:57:11 +0000 (03:57 -0400)]
Change the effect slightly for the seeker, and swap primary with secondary
Jakob MG [Mon, 21 Mar 2011 01:44:02 +0000 (02:44 +0100)]
New cvar g_vehicle_raptor_cannon_locktarget, if 1 lets the raptors cannon lock onto and track a target if its udner the crosshaor for long enougth. New cvar g_vehicle_raptor_cannon_predicttarget, if above cvar and this one is 1, cannons also predicts target movement.
Mircea Kitsune [Sun, 20 Mar 2011 22:53:44 +0000 (00:53 +0200)]
Cvar the amount of health dead bodies must take in order to get gibbed. I thought this might have some uses, if the cost of one cvar can be accepted for this purpose. Currently defaulted to 100, as that feels best balanced to me.
terencehill [Sun, 20 Mar 2011 22:36:09 +0000 (23:36 +0100)]
Remove wrong unlimited ammo check in Hook attack code, it should be checked in W_DecreaseAmmo
terencehill [Sun, 20 Mar 2011 22:32:23 +0000 (23:32 +0100)]
Fix issues when shooting if you have unlimited ammo and current ammo is 0:
crylink and HLAC shoot once and then don't shoot anymore (or switch to a better weapon)
uzi doesn't shoot at all (or switches to a better weapon)
Jakob MG [Sun, 20 Mar 2011 21:56:34 +0000 (22:56 +0100)]
Fix raptor hud warn spam.
Jakob MG [Sun, 20 Mar 2011 21:49:35 +0000 (22:49 +0100)]
Better defaults, fix aux xhair, add aux xhair to raptor.
Jakob MG [Sun, 20 Mar 2011 19:46:26 +0000 (20:46 +0100)]
New branch, old was br0ked. new aux. crosshait system.
terencehill [Sun, 20 Mar 2011 18:58:33 +0000 (19:58 +0100)]
Fix impossibility to reload current weapon if you have unlimited ammo and current weapon ammo is 0
terencehill [Sun, 20 Mar 2011 17:29:56 +0000 (18:29 +0100)]
Merge branch 'master' into terencehill/misc_bugfixes
terencehill [Sun, 20 Mar 2011 00:01:10 +0000 (01:01 +0100)]
Add a quick check to exec the reticle code only when the reticle gets drawn!
The logic in this part of code is still a bit stupid and redundant, but I think no1 cares about so let leave it for the sake of the diff simplicity
terencehill [Sat, 19 Mar 2011 23:36:48 +0000 (00:36 +0100)]
precache gfx/reticle_* only in CSQC_Init as there's no gain doing it at every frame
terencehill [Sat, 19 Mar 2011 23:27:55 +0000 (00:27 +0100)]
Fix no weapon displayed in the HUD if cl_weaponpriority is set to "" before connecting to a new server
Rudolf Polzer [Sat, 19 Mar 2011 21:07:07 +0000 (22:07 +0100)]
turn off vid_netwmfullscreen
Samual [Sat, 19 Mar 2011 19:42:06 +0000 (15:42 -0400)]
Merge remote branch 'origin/master' into samual/seeker_updates
Samual [Sat, 19 Mar 2011 19:40:48 +0000 (15:40 -0400)]
More cleanups and fixes, add waypointsprite stuff (slightly), and add the rest of the cvars
Rudolf Polzer [Sat, 19 Mar 2011 07:56:06 +0000 (08:56 +0100)]
aircontrol penalty of 200 WAS too high. 180 feels good now.
Rudolf Polzer [Sat, 19 Mar 2011 07:49:46 +0000 (08:49 +0100)]
Merge remote-tracking branch 'origin/divVerent/physics-speedfix'
Rudolf Polzer [Sat, 19 Mar 2011 07:46:31 +0000 (08:46 +0100)]
Merge remote branch 'origin/terencehill/misc_bugfixes'
Samual [Fri, 18 Mar 2011 22:07:03 +0000 (18:07 -0400)]
Whoops this should be AFTER the return, or else you get multiple passes... weirdly.
Samual [Fri, 18 Mar 2011 22:00:14 +0000 (18:00 -0400)]
Merge remote branch 'origin/master' into samual/seeker_updates
Samual [Fri, 18 Mar 2011 21:40:45 +0000 (17:40 -0400)]
Lots and lots of updates for the seeker >;D
terencehill [Thu, 17 Mar 2011 21:08:25 +0000 (22:08 +0100)]
Restore menu_picmip_bypass cvar description deleted by akari I think unintentionally in
34c4a6687aaf83a50e266b63ef9ae1b299129f38
Things like this happen when the diff isn't checked line by line...
terencehill [Wed, 16 Mar 2011 18:51:51 +0000 (19:51 +0100)]
No need to check for g_freezetag too
terencehill [Tue, 15 Mar 2011 20:18:24 +0000 (21:18 +0100)]
Allow diff for tooltips.db (FINALLY!).
NOTE: attribute "diff" must be explicitly set because it's unset for *.db
Samual [Tue, 15 Mar 2011 18:54:49 +0000 (14:54 -0400)]
Update health/damageforcescale values for rocketlauncher and mortar, add reload to uzi, and also fix refires of crylink primary and electro secondary
terencehill [Tue, 15 Mar 2011 18:34:07 +0000 (19:34 +0100)]
Change last instances of nixnex into nix
Samual [Tue, 15 Mar 2011 18:32:25 +0000 (14:32 -0400)]
Some small fixes and just go back to the way it was before to avoid an artifact since stats aren't all updated at the same time
Rudolf Polzer [Tue, 15 Mar 2011 11:03:11 +0000 (12:03 +0100)]
more aircontrol penalty may feel better (more control)
Rudolf Polzer [Tue, 15 Mar 2011 10:43:20 +0000 (11:43 +0100)]
minor physics adjustment as suggested by FruitieX (but with maxspeed increased to 700)
Samual [Tue, 15 Mar 2011 05:08:21 +0000 (01:08 -0400)]
just use inner ring instead for when main ring is already used (for weapon reload information with weapons that already have rings)
Samual [Mon, 14 Mar 2011 23:02:08 +0000 (19:02 -0400)]
Small fix in view.qc
Samual [Mon, 14 Mar 2011 22:24:03 +0000 (18:24 -0400)]
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/fixes_for_latest_merge
Mircea Kitsune [Mon, 14 Mar 2011 22:22:14 +0000 (00:22 +0200)]
A safe tweak to my last change
Samual [Mon, 14 Mar 2011 22:17:40 +0000 (18:17 -0400)]
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/fixes_for_latest_merge
Mircea Kitsune [Mon, 14 Mar 2011 22:11:17 +0000 (00:11 +0200)]
Fix reloading with weapon arenas / unlimited weapon ammo. Weapon load will now be decreased as you fire, but when you reload it will take no ammo.
Samual [Mon, 14 Mar 2011 22:05:27 +0000 (18:05 -0400)]
Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
Samual [Mon, 14 Mar 2011 22:02:06 +0000 (18:02 -0400)]
Fix the sniper rifle ammo and also fix the issue of bots with reading undeclared cvars
Rudolf Polzer [Mon, 14 Mar 2011 07:11:31 +0000 (08:11 +0100)]
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
Samual [Mon, 14 Mar 2011 05:47:05 +0000 (01:47 -0400)]
Fix some of the broken things in univeral_reload_system merge to master. -- this should've been done before merging! but, anyway it's mostly fine now. Has problems with weaponarena though... need to figure that out.
Jakob MG [Sun, 13 Mar 2011 22:03:52 +0000 (23:03 +0100)]
Mircea Kitsune [Sun, 13 Mar 2011 00:19:34 +0000 (02:19 +0200)]
Fix an issue with my last change
Mircea Kitsune [Sun, 13 Mar 2011 00:13:22 +0000 (02:13 +0200)]
Fix some inconveniences with the MineLayer
Mircea Kitsune [Sat, 12 Mar 2011 22:44:18 +0000 (00:44 +0200)]
Also give the reload ring a little more alpha by default