xonotic/xonotic-data.pk3dir.git
9 years agoMerge remote-tracking branch 'origin/samual/no_dead_airshots'
Rudolf Polzer [Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)]
Merge remote-tracking branch 'origin/samual/no_dead_airshots'

9 years agoMerge remote-tracking branch 'origin/samual/fix_anim_divisionbyzero'
Rudolf Polzer [Fri, 27 May 2011 18:48:59 +0000 (20:48 +0200)]
Merge remote-tracking branch 'origin/samual/fix_anim_divisionbyzero'

9 years agoremove a stupid percent sign
Rudolf Polzer [Fri, 27 May 2011 18:43:54 +0000 (20:43 +0200)]
remove a stupid percent sign

9 years agomake intermission chase cam always on
Rudolf Polzer [Fri, 27 May 2011 18:42:26 +0000 (20:42 +0200)]
make intermission chase cam always on

don't need a cvar for that; that way, we allow Samual's code to break the non-intermissionchase version of the code :P

9 years agoMerge remote-tracking branch 'origin/samual/intermission_fixes'
Rudolf Polzer [Fri, 27 May 2011 18:33:02 +0000 (20:33 +0200)]
Merge remote-tracking branch 'origin/samual/intermission_fixes'

9 years agoMerge remote-tracking branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Fri, 27 May 2011 18:19:34 +0000 (20:19 +0200)]
Merge remote-tracking branch 'origin/fruitiex/panelhud'

9 years agoNo damage splash when !!chase_active
FruitieX [Thu, 26 May 2011 13:04:14 +0000 (16:04 +0300)]
No damage splash when !!chase_active

9 years agoStop the weapon model from changing pitch while in intermission (makes no sense,...
Samual [Wed, 25 May 2011 04:10:01 +0000 (00:10 -0400)]
Stop the weapon model from changing pitch while in intermission (makes no sense, the player should be frozen)

9 years agoFix intermission player model so that it doesn't tilt based on where the player is...
Samual [Wed, 25 May 2011 04:04:35 +0000 (00:04 -0400)]
Fix intermission player model so that it doesn't tilt based on where the player is aiming. (wtf comes to mind.. why was this broken in the first place?)

9 years agoFix a warning given by setanim since it had no animation information sent to it.
Samual [Wed, 25 May 2011 02:38:36 +0000 (22:38 -0400)]
Fix a warning given by setanim since it had no animation information sent to it.

9 years agoAdd checks for other.deadflag when announcing airshot -- this way airshots don't...
Samual [Tue, 24 May 2011 23:45:29 +0000 (19:45 -0400)]
Add checks for other.deadflag when announcing airshot -- this way airshots don't happen when the player is dead.

9 years agoTHE BIG BALANCE SWITCHOVER!!!1
Rudolf Polzer [Tue, 24 May 2011 20:03:10 +0000 (22:03 +0200)]
THE BIG BALANCE SWITCHOVER!!!1

9 years agorename the sniper rifle to just a rifle.
Rudolf Polzer [Tue, 24 May 2011 12:29:16 +0000 (14:29 +0200)]
rename the sniper rifle to just a rifle.

If we ever want to rename it again, we then just need to change the visible name.

9 years agoEarly+++ changes to sniper rifle to be more of just a "rifle" instead of a sniper.
Samual [Tue, 24 May 2011 05:02:00 +0000 (01:02 -0400)]
Early+++ changes to sniper rifle to be more of just a "rifle" instead of a sniper.

9 years agoChange some things about Nex charge slightly -- Instead of using shot multiplier...
Samual [Tue, 24 May 2011 04:50:35 +0000 (00:50 -0400)]
Change some things about Nex charge slightly -- Instead of using shot multiplier, just go directly from 0 charge to 100% each time (same exact time to charge as before, 2 seconds, but done in a better way) - Also make it so that you have 50% charge when you first pick up the weapon, so you aren't totally screwed from it.

9 years agoSome improvements to the hagar (lower spread on primary, better settings for secondar...
Samual [Tue, 24 May 2011 04:40:23 +0000 (00:40 -0400)]
Some improvements to the hagar (lower spread on primary, better settings for secondary load damage/radius)

9 years agoMerge remote-tracking branch 'origin/diabolik/newanims'
merlijn [Mon, 23 May 2011 19:29:18 +0000 (21:29 +0200)]
Merge remote-tracking branch 'origin/diabolik/newanims'

9 years agoMerge remote branch 'origin/master' into diabolik/newanims
Sahil Singhal [Mon, 23 May 2011 18:59:05 +0000 (14:59 -0400)]
Merge remote branch 'origin/master' into diabolik/newanims

9 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Mon, 23 May 2011 15:44:42 +0000 (17:44 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agomove the contentdownload URL to xonotic.org
Rudolf Polzer [Mon, 23 May 2011 15:44:26 +0000 (17:44 +0200)]
move the contentdownload URL to xonotic.org

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Sun, 22 May 2011 18:42:44 +0000 (21:42 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

9 years agoSome updates to the shotgun melee
Samual [Sat, 21 May 2011 16:18:59 +0000 (12:18 -0400)]
Some updates to the shotgun melee

9 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Sat, 21 May 2011 16:01:08 +0000 (12:01 -0400)]
Merge remote branch 'origin/master' into samual/balance

9 years agoremove menu_slist_modfilter for now, as we currently don't need it
Rudolf Polzer [Sat, 21 May 2011 10:44:10 +0000 (12:44 +0200)]
remove menu_slist_modfilter for now, as we currently don't need it

9 years agoadd bots back to the playerstats
FruitieX [Fri, 20 May 2011 14:40:37 +0000 (17:40 +0300)]
add bots back to the playerstats

9 years agofinally fix accuracy stats, well hopefully. Testing shows that they do work :P
FruitieX [Fri, 20 May 2011 13:48:27 +0000 (16:48 +0300)]
finally fix accuracy stats, well hopefully. Testing shows that they do work :P

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Fri, 20 May 2011 13:32:53 +0000 (16:32 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

9 years agoMerge remote branch 'origin/master' into diabolik/newanims
Sahil Singhal [Thu, 19 May 2011 19:43:28 +0000 (15:43 -0400)]
Merge remote branch 'origin/master' into diabolik/newanims

9 years agoActually set the melee anim.
Sahil Singhal [Thu, 19 May 2011 19:42:56 +0000 (15:42 -0400)]
Actually set the melee anim.

9 years agoMerge remote-tracking branch 'origin/master' into samual/balance
FruitieX [Thu, 19 May 2011 19:38:40 +0000 (22:38 +0300)]
Merge remote-tracking branch 'origin/master' into samual/balance

9 years agoMerge remote-tracking branch 'origin/samual/balance'
Rudolf Polzer [Thu, 19 May 2011 19:34:03 +0000 (21:34 +0200)]
Merge remote-tracking branch 'origin/samual/balance'

9 years agoNew rescaled ignis thanks to nifrek :)
Sahil Singhal [Thu, 19 May 2011 06:17:07 +0000 (02:17 -0400)]
New rescaled ignis thanks to nifrek :)

9 years agoMerge remote branch 'origin/master' into diabolik/newanims
Sahil Singhal [Thu, 19 May 2011 06:09:46 +0000 (02:09 -0400)]
Merge remote branch 'origin/master' into diabolik/newanims

9 years agorename physicsX0.cfg to physicsX.cfg, and bring back 0.1.0preview's physics as physic...
Rudolf Polzer [Wed, 18 May 2011 11:52:46 +0000 (13:52 +0200)]
rename physicsX0.cfg to physicsX.cfg, and bring back 0.1.0preview's physics as physicsX010.cfg

9 years agoset speed limit back to 800 - 700 was a bit too low, I think. Maybe someone try 750?
Rudolf Polzer [Wed, 18 May 2011 08:12:19 +0000 (10:12 +0200)]
set speed limit back to 800 - 700 was a bit too low, I think. Maybe someone try 750?

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Tue, 17 May 2011 19:57:38 +0000 (22:57 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

9 years agoimprove comment
FruitieX [Tue, 17 May 2011 19:12:40 +0000 (22:12 +0300)]
improve comment

9 years agomake AddPlayer harmless if he already has an ID
Rudolf Polzer [Tue, 17 May 2011 19:03:50 +0000 (21:03 +0200)]
make AddPlayer harmless if he already has an ID

9 years agofix playerstats hashkey sending
Rudolf Polzer [Tue, 17 May 2011 19:03:07 +0000 (21:03 +0200)]
fix playerstats hashkey sending

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Tue, 17 May 2011 18:48:45 +0000 (21:48 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

9 years agomake the t field per-player instead, fix a bug that could've caused the hashkey to...
FruitieX [Tue, 17 May 2011 18:46:21 +0000 (21:46 +0300)]
make the t field per-player instead, fix a bug that could've caused the hashkey to be never sent

9 years agolet's add some amount of strafe acceleration (max acceleration boost: +100% vs forwar...
Rudolf Polzer [Tue, 17 May 2011 18:08:49 +0000 (20:08 +0200)]
let's add some amount of strafe acceleration (max acceleration boost: +100% vs forward acceleration)

9 years agoupdate the spec comment
FruitieX [Tue, 17 May 2011 17:59:36 +0000 (20:59 +0300)]
update the spec comment

9 years agofix the spam by adding for loops
FruitieX [Tue, 17 May 2011 17:48:08 +0000 (20:48 +0300)]
fix the spam by adding for loops

9 years agoapply the stretchfactor at the right point
Rudolf Polzer [Tue, 17 May 2011 17:47:10 +0000 (19:47 +0200)]
apply the stretchfactor at the right point

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/playerstats
FruitieX [Tue, 17 May 2011 17:15:28 +0000 (20:15 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats

9 years agogive it a name: sv_airaccel_qw_stretchfactor ("stretch factor" of QW based bunnyhop...
Rudolf Polzer [Tue, 17 May 2011 10:06:25 +0000 (12:06 +0200)]
give it a name: sv_airaccel_qw_stretchfactor ("stretch factor" of QW based bunnyhop accel, values <= 0 mean unlimited accel, values > 0 limit strafing, 1 means like Xonotic currently does)

9 years agodd a var "speedclamp" (macro -DSPEEDCLAMP=...) to influence the strafe accel reductio...
Rudolf Polzer [Tue, 17 May 2011 08:09:35 +0000 (10:09 +0200)]
dd a var "speedclamp" (macro -DSPEEDCLAMP=...) to influence the strafe accel reduction; try -DSPEEDCLAMP=-0.2 and -DSPEEDCLAMP=50

9 years agoremove textures/pickups files as these are no longer in use for quite some time now
Rudolf Polzer [Mon, 16 May 2011 13:06:09 +0000 (15:06 +0200)]
remove textures/pickups files as these are no longer in use for quite some time now

9 years agomore ent_cs fixes
Rudolf Polzer [Sun, 15 May 2011 19:24:37 +0000 (21:24 +0200)]
more ent_cs fixes

9 years agomake shownames use its own set of entities
Rudolf Polzer [Sun, 15 May 2011 18:55:55 +0000 (20:55 +0200)]
make shownames use its own set of entities

9 years agoremove entity spam from shownames
Rudolf Polzer [Sun, 15 May 2011 18:12:46 +0000 (20:12 +0200)]
remove entity spam from shownames

9 years agofix a stupid typo (why did the more stupid fteqcc not notice it)
Rudolf Polzer [Sun, 15 May 2011 18:00:22 +0000 (20:00 +0200)]
fix a stupid typo (why did the more stupid fteqcc not notice it)

9 years agomake entcs entities use sendflags (preparation for including h/a info)
Rudolf Polzer [Sun, 15 May 2011 17:18:03 +0000 (19:18 +0200)]
make entcs entities use sendflags (preparation for including h/a info)

9 years agowoops remove silly entity leak
FruitieX [Sun, 15 May 2011 01:15:03 +0000 (04:15 +0300)]
woops remove silly entity leak

9 years agomake the statusbar a bit more visible
FruitieX [Sun, 15 May 2011 01:10:24 +0000 (04:10 +0300)]
make the statusbar a bit more visible

9 years agoonly send armor/health updates as increments of 10
FruitieX [Sun, 15 May 2011 01:09:01 +0000 (04:09 +0300)]
only send armor/health updates as increments of 10

9 years agoremove shownames entity when going spec, bring it back when joining. Don't show own...
FruitieX [Sun, 15 May 2011 00:51:14 +0000 (03:51 +0300)]
remove shownames entity when going spec, bring it back when joining. Don't show own tag if chase_active == 0

9 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Sat, 14 May 2011 20:30:59 +0000 (16:30 -0400)]
Merge remote branch 'origin/master' into samual/balance

9 years agofix armor bar being 2x too wide
FruitieX [Sat, 14 May 2011 19:57:20 +0000 (22:57 +0300)]
fix armor bar being 2x too wide

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/panelhud
FruitieX [Sat, 14 May 2011 19:54:16 +0000 (22:54 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

9 years agofix some things that i forgot
FruitieX [Sat, 14 May 2011 19:53:56 +0000 (22:53 +0300)]
fix some things that i forgot

9 years agobunch of updates, statusbars instead of icons
FruitieX [Sat, 14 May 2011 19:33:46 +0000 (22:33 +0300)]
bunch of updates, statusbars instead of icons

9 years agodon't null origin_z :(
Rudolf Polzer [Sat, 14 May 2011 18:55:01 +0000 (20:55 +0200)]
don't null origin_z :(

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/panelhud
FruitieX [Sat, 14 May 2011 18:20:57 +0000 (21:20 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/panelhud
FruitieX [Sat, 14 May 2011 18:12:54 +0000 (21:12 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

9 years agooh right, we HAVE destructors
Rudolf Polzer [Sat, 14 May 2011 18:12:08 +0000 (20:12 +0200)]
oh right, we HAVE destructors

9 years agoadd another check
Rudolf Polzer [Sat, 14 May 2011 18:10:52 +0000 (20:10 +0200)]
add another check

9 years agocall ArrayGet*entcs_receiver one time less
Rudolf Polzer [Sat, 14 May 2011 18:09:29 +0000 (20:09 +0200)]
call ArrayGet*entcs_receiver one time less

9 years agoadd a getplayerorigin() function that finds any player's origin if the system knows it
Rudolf Polzer [Sat, 14 May 2011 18:06:49 +0000 (20:06 +0200)]
add a getplayerorigin() function that finds any player's origin if the system knows it

9 years agoadapt shownames to use player positions shared from the engine
FruitieX [Sat, 14 May 2011 18:06:19 +0000 (21:06 +0300)]
adapt shownames to use player positions shared from the engine

9 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Sat, 14 May 2011 15:58:57 +0000 (11:58 -0400)]
Merge remote branch 'origin/master' into samual/balance

9 years agointerpolate, y u no work :(
FruitieX [Sat, 14 May 2011 14:05:22 +0000 (17:05 +0300)]
interpolate, y u no work :(

9 years agonew cvars: sv_shownames and sv_shownames_delay (default on, 0.2 sec)
FruitieX [Sat, 14 May 2011 13:43:07 +0000 (16:43 +0300)]
new cvars: sv_shownames and sv_shownames_delay (default on, 0.2 sec)

9 years agono crosshair when observing, that's just pointless
FruitieX [Sat, 14 May 2011 13:38:21 +0000 (16:38 +0300)]
no crosshair when observing, that's just pointless

9 years agoMerge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
FruitieX [Sat, 14 May 2011 13:04:28 +0000 (16:04 +0300)]
Merge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud

9 years agoMerge remote-tracking branch 'origin/master' into fruitiex/panelhud
FruitieX [Sat, 14 May 2011 13:04:17 +0000 (16:04 +0300)]
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

9 years agoMerge remote-tracking branch 'origin/mirceakitsune/new_loading_screens'
Rudolf Polzer [Sat, 14 May 2011 13:03:00 +0000 (15:03 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/new_loading_screens'

9 years agoMerge remote-tracking branch 'origin/terencehill/fexists'
Rudolf Polzer [Sat, 14 May 2011 12:48:56 +0000 (14:48 +0200)]
Merge remote-tracking branch 'origin/terencehill/fexists'

9 years agoMerge remote-tracking branch 'origin/terencehill/big_close_button_fix'
Rudolf Polzer [Sat, 14 May 2011 12:44:37 +0000 (14:44 +0200)]
Merge remote-tracking branch 'origin/terencehill/big_close_button_fix'

9 years agoFaster zoom, many people don't want the slow++ 3.5 default. A compromise between...
Samual [Thu, 21 Apr 2011 02:41:01 +0000 (22:41 -0400)]
Faster zoom, many people don't want the slow++ 3.5 default. A compromise between this can be made if it's too fast, but I really think it should be much higher than 4 at least.

9 years agoMerge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'
Rudolf Polzer [Sat, 14 May 2011 12:37:33 +0000 (14:37 +0200)]
Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'

9 years agoMerge remote-tracking branch 'origin/fruitiex/disable-shootanim'
Rudolf Polzer [Sat, 14 May 2011 12:33:46 +0000 (14:33 +0200)]
Merge remote-tracking branch 'origin/fruitiex/disable-shootanim'

9 years agoMerge remote-tracking branch 'origin/terencehill/stats_for_spectators'
Rudolf Polzer [Sat, 14 May 2011 12:32:51 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/terencehill/stats_for_spectators'

9 years agoMerge remote-tracking branch 'origin/mirceakitsune/event_chasecam_fix'
Rudolf Polzer [Sat, 14 May 2011 12:31:19 +0000 (14:31 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/event_chasecam_fix'

9 years agoMerge remote-tracking branch 'origin/samual/defaults/fix_scoreboard_offset'
Rudolf Polzer [Sat, 14 May 2011 12:30:45 +0000 (14:30 +0200)]
Merge remote-tracking branch 'origin/samual/defaults/fix_scoreboard_offset'

9 years agoMerge remote-tracking branch 'origin/samual/remove_useless_stuff'
Rudolf Polzer [Sat, 14 May 2011 12:30:26 +0000 (14:30 +0200)]
Merge remote-tracking branch 'origin/samual/remove_useless_stuff'

9 years agoMerge remote-tracking branch 'origin/samual/verbose_warnings'
Rudolf Polzer [Sat, 14 May 2011 12:30:05 +0000 (14:30 +0200)]
Merge remote-tracking branch 'origin/samual/verbose_warnings'

9 years agoTweak the electro secondary so that the orbs slow down more when they bounce -- plus...
Samual [Sat, 14 May 2011 04:29:31 +0000 (00:29 -0400)]
Tweak the electro secondary so that the orbs slow down more when they bounce -- plus increase the comboradius slightly. This should make it much better for doing combos/placing the orbs more easily

9 years agoUpdate the hagar to use the new secondary by Taoki.... -- THIS NEEDS A LOT OF TWEAKIN...
Samual [Sat, 14 May 2011 04:21:20 +0000 (00:21 -0400)]
Update the hagar to use the new secondary by Taoki.... -- THIS NEEDS A LOT OF TWEAKING, will definitely be difficult to master

9 years agoI take it back, 14 damage instead of 13 on sustained.
Samual [Sat, 14 May 2011 04:06:20 +0000 (00:06 -0400)]
I take it back, 14 damage instead of 13 on sustained.

9 years agoSome new settings for the laser force -- same amount of force upwards technically...
Samual [Sat, 14 May 2011 04:05:07 +0000 (00:05 -0400)]
Some new settings for the laser force -- same amount of force upwards technically, but less restrictions on velocity bias and more horizontal force slightly.

9 years agoLower uzi damage slightly, but also cut down on its force -- this means you won't...
Samual [Sat, 14 May 2011 03:11:24 +0000 (23:11 -0400)]
Lower uzi damage slightly, but also cut down on its force -- this means you won't be able to lock a player in position/push them away from you so easily anymore with the uzi

9 years agoSome tweaks to the regen/rot for health and armor... maybe too much, but hopefullly...
Samual [Sat, 14 May 2011 03:09:40 +0000 (23:09 -0400)]
Some tweaks to the regen/rot for health and armor... maybe too much, but hopefullly this is "just right"

9 years agoFixes a bug with the event chasecam, which caused the intermission camera to not...
Mircea Kitsune [Fri, 13 May 2011 21:07:16 +0000 (00:07 +0300)]
Fixes a bug with the event chasecam, which caused the intermission camera to not rotate properly. This seems to have been caused by not setting the view angles together with the view origin, which is actually not a good thing to do at all.

9 years agoMerge branch 'master' into mirceakitsune/new_loading_screens
Mircea Kitsune [Fri, 13 May 2011 20:16:27 +0000 (23:16 +0300)]
Merge branch 'master' into mirceakitsune/new_loading_screens

9 years agoMerge remote-tracking branch 'origin/mirceakitsune/weapon_hagar_secondary_load'
merlijn [Fri, 13 May 2011 20:06:33 +0000 (22:06 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/weapon_hagar_secondary_load'

9 years agoMerge branch 'master' into mirceakitsune/new_loading_screens
Mircea Kitsune [Fri, 13 May 2011 20:04:01 +0000 (23:04 +0300)]
Merge branch 'master' into mirceakitsune/new_loading_screens

9 years agoMerge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
Mircea Kitsune [Fri, 13 May 2011 20:03:00 +0000 (23:03 +0300)]
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load

9 years agoMerge remote-tracking branch 'origin/mirceakitsune/glowmod_weapons'
merlijn [Fri, 13 May 2011 18:58:29 +0000 (20:58 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/glowmod_weapons'