]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge remote-tracking branch 'origin/master' into tzork/vehicles-2
Jakob MG [Wed, 6 Apr 2011 06:42:08 +0000 (08:42 +0200)]
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

13 years agoMerge remote-tracking branch 'origin/samual/fix_csqc_strings'
Jakob MG [Tue, 5 Apr 2011 22:55:58 +0000 (00:55 +0200)]
Merge remote-tracking branch 'origin/samual/fix_csqc_strings'

13 years agoMerge remote-tracking branch 'origin/samual/balance'
Jakob MG [Tue, 5 Apr 2011 22:51:08 +0000 (00:51 +0200)]
Merge remote-tracking branch 'origin/samual/balance'

13 years agoMerge remote-tracking branch 'origin/samual/fix_hud_drawpic_expanding'
Jakob MG [Tue, 5 Apr 2011 22:48:11 +0000 (00:48 +0200)]
Merge remote-tracking branch 'origin/samual/fix_hud_drawpic_expanding'

13 years agoMerge remote-tracking branch 'origin/master' into tzork/vehicles-2
Jakob MG [Tue, 5 Apr 2011 20:40:06 +0000 (22:40 +0200)]
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2

13 years agoThis is a commit message, one of many noone will realy need or read
Jakob MG [Tue, 5 Apr 2011 20:25:34 +0000 (22:25 +0200)]
This is a commit message, one of many noone will realy need or read

13 years agoMerge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Jakob MG [Tue, 5 Apr 2011 19:08:01 +0000 (21:08 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/vehicles-2

13 years agosome more particle fx
Morphed [Tue, 5 Apr 2011 19:04:48 +0000 (21:04 +0200)]
some more particle fx

13 years agoMerge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Jakob MG [Tue, 5 Apr 2011 18:04:35 +0000 (20:04 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/vehicles-2

13 years agoSome updates to falldamage - It should hurt more to fall from a flying vehicle ^_^
Samual [Tue, 5 Apr 2011 13:33:06 +0000 (09:33 -0400)]
Some updates to falldamage - It should hurt more to fall from a flying vehicle ^_^

13 years agoACTUALLY make drawpic_aspect_skin_expanding use the proper rendering for the aspect...
Samual [Tue, 5 Apr 2011 11:24:00 +0000 (07:24 -0400)]
ACTUALLY make drawpic_aspect_skin_expanding use the proper rendering for the aspect ratio. Fixes a bug that the expanding image mismatches the normal image in the HUD, now can be used for any HUD skin

13 years agoLower turnrate just slightly on the seeker
Samual [Tue, 5 Apr 2011 10:44:58 +0000 (06:44 -0400)]
Lower turnrate just slightly on the seeker

13 years agomore particles for vehicles
Morphed [Tue, 5 Apr 2011 10:23:01 +0000 (12:23 +0200)]
more particles for vehicles

13 years agog_start_weapon_sniperrifle 0 - Disable sniper rifle for now, at least until it gets...
Samual [Tue, 5 Apr 2011 10:13:36 +0000 (06:13 -0400)]
g_start_weapon_sniperrifle 0 - Disable sniper rifle for now, at least until it gets new functionality.

13 years agogettext a string which was missed for warmup
Samual [Tue, 5 Apr 2011 09:55:46 +0000 (05:55 -0400)]
gettext a string which was missed for warmup

13 years agoswitching branch
Jakob MG [Tue, 5 Apr 2011 09:27:19 +0000 (11:27 +0200)]
switching branch

13 years agoUpdate starting ammo values for warmup, LMS, and nix
Samual [Tue, 5 Apr 2011 09:13:02 +0000 (05:13 -0400)]
Update starting ammo values for warmup, LMS, and nix

13 years agofix health in ekg
Rudolf Polzer [Tue, 5 Apr 2011 07:12:26 +0000 (09:12 +0200)]
fix health in ekg

13 years agoMerge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Morphed [Tue, 5 Apr 2011 00:51:10 +0000 (02:51 +0200)]
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into vehicles-2

13 years agonew effects for vehicles
Morphed [Tue, 5 Apr 2011 00:44:02 +0000 (02:44 +0200)]
new effects for vehicles

13 years agoStop using vehicles_customizeentityforclient, its expensive. (lets see how much break...
Jakob MG [Mon, 4 Apr 2011 02:49:55 +0000 (04:49 +0200)]
Stop using vehicles_customizeentityforclient, its expensive. (lets see how much breaks =). Fix angles overflow for raptor rotors. Stop player fierinf weapons from inside vehicle while raptor is taking off. Dont apply friction to racer's z-velocity - its upwards speed is handeld elsewhere (not perfect but better)

13 years agonew bomblet size
Morphed [Mon, 4 Apr 2011 01:19:51 +0000 (03:19 +0200)]
new bomblet size

13 years agoRemove some stale code, very basic racer tough csqc (disabled) new models for raptor...
Jakob MG [Mon, 4 Apr 2011 01:03:34 +0000 (03:03 +0200)]
Remove some stale code, very basic racer tough csqc (disabled) new models for raptor & otehr models, thanks morphed. friction cvar for racer.

13 years agoMerge remote branch 'origin/samual/defaults/smoothcrouch_enable'
mand1nga [Mon, 4 Apr 2011 00:51:55 +0000 (21:51 -0300)]
Merge remote branch 'origin/samual/defaults/smoothcrouch_enable'

13 years agoMerge remote branch 'origin/samual/balance'
mand1nga [Mon, 4 Apr 2011 00:38:36 +0000 (21:38 -0300)]
Merge remote branch 'origin/samual/balance'

13 years agoThis enables a featured I added in the engine a while ago which basically smooths...
Samual [Mon, 4 Apr 2011 00:34:25 +0000 (20:34 -0400)]
This enables a featured I added in the engine a while ago which basically smooths the view when crouching (previously it was an instant switch... which looked very odd.) This was SUPPOSED to be added into master a long time ago, but I didn't notice as I had it in my config.

13 years agoNew health limit and rot rate plus use g_balance_damagepush_speedfactor 2.5
Samual [Mon, 4 Apr 2011 00:17:20 +0000 (20:17 -0400)]
New health limit and rot rate plus use g_balance_damagepush_speedfactor 2.5

13 years agoMerge remote branch 'origin/fruitiex/mapvote_fix'
mand1nga [Sun, 3 Apr 2011 23:18:32 +0000 (20:18 -0300)]
Merge remote branch 'origin/fruitiex/mapvote_fix'

13 years agoMerge remote branch 'origin/fruitiex/accelerometer_fix'
mand1nga [Sun, 3 Apr 2011 23:17:12 +0000 (20:17 -0300)]
Merge remote branch 'origin/fruitiex/accelerometer_fix'

13 years agoadd the acceleration bars for these two skins too
FruitieX [Sun, 3 Apr 2011 22:24:40 +0000 (01:24 +0300)]
add the acceleration bars for these two skins too

13 years agoMerge remote branch 'origin/morphed/hpitems'
mand1nga [Sun, 3 Apr 2011 21:55:42 +0000 (18:55 -0300)]
Merge remote branch 'origin/morphed/hpitems'

13 years agoSync with master
Jakob MG [Sun, 3 Apr 2011 17:29:02 +0000 (19:29 +0200)]
Sync with master

13 years agoMake raptr bombs bounce if vehicle that droped them is to close to impact. Better...
Jakob MG [Sun, 3 Apr 2011 17:04:44 +0000 (19:04 +0200)]
Make raptr bombs bounce if vehicle that droped them is to close to impact. Better hover handeling for racer (gravity was accidently applied twice), should get stuck less now. Some pointless but nice looking bobbing while racer is unmaned. Clean up and speed up vehicle shiled handeling

13 years agoMerge remote branch 'origin/terencehill/italian_update'
mand1nga [Sun, 3 Apr 2011 16:48:09 +0000 (13:48 -0300)]
Merge remote branch 'origin/terencehill/italian_update'

13 years agoCorrect various errors and translate some more strings
terencehill [Sun, 3 Apr 2011 13:48:26 +0000 (15:48 +0200)]
Correct various errors and translate some more strings

13 years agoAdd Italian to languages.txt so that it can be selected in the menu
terencehill [Sun, 3 Apr 2011 13:34:05 +0000 (15:34 +0200)]
Add Italian to languages.txt so that it can be selected in the menu

13 years agoCreate and use vehicles_projectile(...) to reduce code duplication. Spiderbot deaht...
Jakob MG [Sun, 3 Apr 2011 02:39:02 +0000 (04:39 +0200)]
Create and use vehicles_projectile(...) to reduce code duplication. Spiderbot deaht aimations. New spiderbot top & cockpit models. Aditional textures for spider and racer

13 years agoFix fb cockpit, better camera location for raptor
Jakob MG [Sat, 2 Apr 2011 21:36:48 +0000 (23:36 +0200)]
Fix fb cockpit, better camera location for raptor

13 years agoBring back raptor straferoll, fix raptor mode 1 movement, fix raptor bomb reload...
Jakob MG [Sat, 2 Apr 2011 20:38:16 +0000 (22:38 +0200)]
Bring back raptor straferoll, fix raptor mode 1 movement, fix raptor bomb reload, make lock decrease quicker if you aim at anoterh ENTITY (so you can pick target faster). Clean up some junk.

13 years agoskip the WarpZone_StoreProjectileData loop if there are no warpzones
Rudolf Polzer [Sat, 2 Apr 2011 19:33:55 +0000 (21:33 +0200)]
skip the WarpZone_StoreProjectileData loop if there are no warpzones

13 years agoFix rpojectile models/shader for vehicles, disable upforce case in racer_frame as...
Jakob MG [Sat, 2 Apr 2011 18:05:50 +0000 (20:05 +0200)]
Fix rpojectile models/shader for vehicles, disable upforce case in racer_frame as tahts handled selwhere now

13 years agoGet rid of 240 tracelines / second for racer by disabelign swept colission code,...
Jakob MG [Sat, 2 Apr 2011 17:53:50 +0000 (19:53 +0200)]
Get rid of 240 tracelines / second for racer by disabelign swept colission code, its bbox is large eougth to make it not cut so much into world now anyway. make upforce stabalizer a bit better, but longer springs for racer. better movetype (less bouncy)

13 years agocsqc projectile types for vehicles, and models
Jakob MG [Sat, 2 Apr 2011 16:08:05 +0000 (18:08 +0200)]
csqc projectile types for vehicles, and models

13 years agoaccelerometer: remove the "glow"/fade out effects from the status bar image. They...
FruitieX [Sat, 2 Apr 2011 14:46:48 +0000 (17:46 +0300)]
accelerometer: remove the "glow"/fade out effects from the status bar image. They created an annoying gap in the center of the accelerometer.

13 years agoMapvote: Don't show the "-1 votes" count when a map has been voted out
FruitieX [Sat, 2 Apr 2011 14:32:17 +0000 (17:32 +0300)]
Mapvote: Don't show the "-1 votes" count when a map has been voted out

13 years agoFix racer rockets, reset lock on spawn, zero avelocity on exit
Jakob MG [Fri, 1 Apr 2011 18:56:39 +0000 (20:56 +0200)]
Fix racer rockets, reset lock on spawn, zero avelocity on exit

13 years agoForgot a bad lines in raptor spawn code
Jakob MG [Fri, 1 Apr 2011 17:17:38 +0000 (19:17 +0200)]
Forgot a bad lines in raptor spawn code

13 years agoMake a common vehicles_spawn to handle bulk stuff / reduce code duplication. Make...
Jakob MG [Fri, 1 Apr 2011 16:49:00 +0000 (18:49 +0200)]
Make a common vehicles_spawn to handle bulk stuff / reduce code duplication. Make raptor steer/aim by angular velocity (smoother, compatibel with ode). Make raptor & spiderbut use a combination of v_angle and crosshait_trace for accurate aim regardless of chase or not

13 years agoput the watermark in an ifdef
Rudolf Polzer [Fri, 1 Apr 2011 16:48:02 +0000 (18:48 +0200)]
put the watermark in an ifdef

13 years agoSwitching branch
Jakob MG [Fri, 1 Apr 2011 14:35:28 +0000 (16:35 +0200)]
Switching branch

13 years agosupport # comments in player stats
Rudolf Polzer [Fri, 1 Apr 2011 13:53:36 +0000 (15:53 +0200)]
support # comments in player stats

13 years agosend a "R" line in the player stats POST that is the current version string
Rudolf Polzer [Fri, 1 Apr 2011 13:44:20 +0000 (15:44 +0200)]
send a "R" line in the player stats POST that is the current version string

13 years agoin adminmsg: entnumber 0 means "all clients"
Rudolf Polzer [Fri, 1 Apr 2011 13:12:55 +0000 (15:12 +0200)]
in adminmsg: entnumber 0 means "all clients"

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 1 Apr 2011 13:09:06 +0000 (15:09 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agonew command: sv_cmd adminmsg <clientno> "string" <infobartime>
Rudolf Polzer [Fri, 1 Apr 2011 13:07:57 +0000 (15:07 +0200)]
new command: sv_cmd adminmsg <clientno> "string" <infobartime>

shows using the "infobar" console command on the client

13 years agoimprove team spawn logic
Rudolf Polzer [Thu, 31 Mar 2011 19:59:05 +0000 (21:59 +0200)]
improve team spawn logic

in a non-team match, ignore team spawns if there is at least one non-team spawn

13 years agoMerge remote branch 'origin/mirceakitsune/cvared_gib_health'
Rudolf Polzer [Thu, 31 Mar 2011 07:27:22 +0000 (09:27 +0200)]
Merge remote branch 'origin/mirceakitsune/cvared_gib_health'

13 years agoMerge remote branch 'origin/mand1nga/i18n-ES'
Rudolf Polzer [Thu, 31 Mar 2011 07:26:06 +0000 (09:26 +0200)]
Merge remote branch 'origin/mand1nga/i18n-ES'

13 years agoMerge remote branch 'origin/sev/hudlayout'
Rudolf Polzer [Thu, 31 Mar 2011 07:25:44 +0000 (09:25 +0200)]
Merge remote branch 'origin/sev/hudlayout'

13 years agoMerge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
Morphed [Wed, 30 Mar 2011 21:38:48 +0000 (23:38 +0200)]
Merge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into morphed/hpitems

13 years agobigger size, removed leaning, more unified texture brightness
Morphed [Wed, 30 Mar 2011 21:22:43 +0000 (23:22 +0200)]
bigger size, removed leaning, more unified texture brightness

13 years agoSmaller powerups panel
sev [Wed, 30 Mar 2011 20:50:04 +0000 (22:50 +0200)]
Smaller powerups panel

13 years agoMerge branch 'sev/hudlayout' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev...
sev [Wed, 30 Mar 2011 20:45:47 +0000 (22:45 +0200)]
Merge branch 'sev/hudlayout' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout

13 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
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

13 years agoMerge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
Rudolf Polzer [Wed, 30 Mar 2011 20:28:58 +0000 (22:28 +0200)]
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'

13 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
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

13 years agoReplace the old default hud, and add some updated/better defaults for the confg
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

13 years agoMerge remote branch 'origin/master' into sev/hudlayout
Samual [Wed, 30 Mar 2011 07:54:12 +0000 (03:54 -0400)]
Merge remote branch 'origin/master' into sev/hudlayout

13 years agoMerge remote branch 'origin/master' into samual/fixes_for_latest_merge
Samual [Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)]
Merge remote branch 'origin/master' into samual/fixes_for_latest_merge

13 years agoExperiment: Set MOVETYPE_TOSS on the vehicle when unmanned and taking damage
mand1nga [Wed, 30 Mar 2011 02:35:42 +0000 (23:35 -0300)]
Experiment: Set MOVETYPE_TOSS on the vehicle when unmanned and taking damage

13 years agoRacer fires one rocket at the time. All vehicles crush. Raptor primary fires two...
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

13 years agoUpdate effectsinfo
Jakob MG [Tue, 29 Mar 2011 20:28:45 +0000 (22:28 +0200)]
Update effectsinfo

13 years agoMerge master
Jakob MG [Tue, 29 Mar 2011 20:21:30 +0000 (22:21 +0200)]
Merge master

13 years agoMake things somewhat usable before venturing into ODE land
Jakob MG [Tue, 29 Mar 2011 20:18:53 +0000 (22:18 +0200)]
Make things somewhat usable before venturing into ODE land

13 years agoFINALLY fix the "warpzonelib" error a proper way
Rudolf Polzer [Tue, 29 Mar 2011 16:32:04 +0000 (18:32 +0200)]
FINALLY fix the "warpzonelib" error a proper way

13 years agoFix wrong colormap for returnign vehicle after it returns / repsawn. Make vehicles...
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.

13 years agoMerge remote-tracking branch 'origin/samual/change_default_balance'
Rudolf Polzer [Mon, 28 Mar 2011 16:57:51 +0000 (18:57 +0200)]
Merge remote-tracking branch 'origin/samual/change_default_balance'

13 years agorebalance this to actually make some difference
Rudolf Polzer [Mon, 28 Mar 2011 15:45:37 +0000 (17:45 +0200)]
rebalance this to actually make some difference

13 years agofix slow push :P
Rudolf Polzer [Mon, 28 Mar 2011 15:45:06 +0000 (17:45 +0200)]
fix slow push :P

13 years agoFix some bugs in here
Rudolf Polzer [Mon, 28 Mar 2011 15:31:46 +0000 (17:31 +0200)]
Fix some bugs in here

13 years agonew toy: autocvar_g_damagepush_speedfactor - ENJOY
Rudolf Polzer [Mon, 28 Mar 2011 14:13:59 +0000 (16:13 +0200)]
new toy: autocvar_g_damagepush_speedfactor - ENJOY

13 years agoNew effects, revert to v_angle based steering (get rid of crazy turns), fix deth...
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.

13 years agomove the minstanex_ammo hack out of WR_THINK, as now multiple WR_s may use it, even...
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

13 years agoFix minstagib where isn't possible to shoot when you have 9 cells left
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

13 years agoMake colormap & fullbright work (uses g_fullbrightplayers), fix raptor shirt/pants...
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

13 years agoTurn raptor bombs into csqc projectiles
Jakob MG [Sat, 26 Mar 2011 14:54:14 +0000 (15:54 +0100)]
Turn raptor bombs into csqc projectiles

13 years agoUse pmove_vel & _org fro raptor bombing crosshair insted of buggy hakk, should be...
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

13 years agosome unused vars be gone
Rudolf Polzer [Fri, 25 Mar 2011 22:50:45 +0000 (23:50 +0100)]
some unused vars be gone

13 years agofix colormap in team games
Jakob MG [Fri, 25 Mar 2011 19:45:59 +0000 (20:45 +0100)]
fix colormap in team games

13 years agoAdded cvars for racer blowup damage
mand1nga [Fri, 25 Mar 2011 16:58:30 +0000 (13:58 -0300)]
Added cvars for racer blowup damage

13 years agoSome claim that you should acctualy add teh files you use. pfff.
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.

13 years agoMinor changes
mand1nga [Fri, 25 Mar 2011 03:34:45 +0000 (00:34 -0300)]
Minor changes

13 years agoLots of fixes and polishing!
mand1nga [Fri, 25 Mar 2011 03:17:35 +0000 (00:17 -0300)]
Lots of fixes and polishing!

13 years agoInitial version of Spanish translation
Rodrigo Mouton Laudin [Fri, 25 Mar 2011 03:15:59 +0000 (00:15 -0300)]
Initial version of Spanish translation

13 years agoadd more crosshairs for vehicles
Jakob MG [Fri, 25 Mar 2011 01:46:01 +0000 (02:46 +0100)]
add more crosshairs for vehicles

13 years agoclean up racer, make it steer arround crosshair & make it use new taregt lock system.
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.

13 years agosave state before removing stale code
Jakob MG [Fri, 25 Mar 2011 00:27:25 +0000 (01:27 +0100)]
save state before removing stale code

13 years agoMerge remote branch 'origin/master' into samual/change_default_balance
Samual [Thu, 24 Mar 2011 16:24:41 +0000 (12:24 -0400)]
Merge remote branch 'origin/master' into samual/change_default_balance

13 years agoNew panel border color for single player: light blue, matching menu window color
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

13 years agoBetter names
Mircea Kitsune [Wed, 23 Mar 2011 16:59:49 +0000 (18:59 +0200)]
Better names