xonotic/xonotic-data.pk3dir.git
10 years agogradually fade out the "charge" on the nex so if you go fast but hit a wall, you...
FruitieX [Tue, 12 Oct 2010 23:26:04 +0000 (02:26 +0300)]
gradually fade out the "charge" on the nex so if you go fast but hit a wall, you still can do lots of damage for a little while

10 years agodouble the halflife distance for the nex
FruitieX [Tue, 12 Oct 2010 22:21:13 +0000 (01:21 +0300)]
double the halflife distance for the nex

10 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Tue, 12 Oct 2010 21:08:35 +0000 (00:08 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

10 years agouzi nerf, primary dps: 90, secondary dps: 80
FruitieX [Tue, 12 Oct 2010 21:07:04 +0000 (00:07 +0300)]
uzi nerf, primary dps: 90, secondary dps: 80

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
FruitieX [Tue, 12 Oct 2010 20:24:26 +0000 (23:24 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agofix ONE possible lgbeam breakage
Rudolf Polzer [Tue, 12 Oct 2010 20:22:47 +0000 (22:22 +0200)]
fix ONE possible lgbeam breakage

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
FruitieX [Tue, 12 Oct 2010 18:16:55 +0000 (21:16 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agoMerge remote branch 'origin/fruitiex/gakarmor'
Rudolf Polzer [Tue, 12 Oct 2010 18:03:29 +0000 (20:03 +0200)]
Merge remote branch 'origin/fruitiex/gakarmor'

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Tue, 12 Oct 2010 18:02:45 +0000 (20:02 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

Conflicts:
qcsrc/client/View.qc

10 years agolower grenade secondary lifetime to 3 (from 5), set the mine layer shader to the...
FruitieX [Tue, 12 Oct 2010 17:42:33 +0000 (20:42 +0300)]
lower grenade secondary lifetime to 3 (from 5), set the mine layer shader to the official "this model needs a replacement" shader

10 years agoMerge remote branch 'origin/fruitiex/precache_crosshair_ring'
Rudolf Polzer [Tue, 12 Oct 2010 17:17:20 +0000 (19:17 +0200)]
Merge remote branch 'origin/fruitiex/precache_crosshair_ring'

10 years agoMerge remote branch 'origin/fruitiex/loadscreen'
Rudolf Polzer [Tue, 12 Oct 2010 17:17:14 +0000 (19:17 +0200)]
Merge remote branch 'origin/fruitiex/loadscreen'

10 years agoMerge remote branch 'origin/fruitiex/gakarmor'
Rudolf Polzer [Tue, 12 Oct 2010 17:16:05 +0000 (19:16 +0200)]
Merge remote branch 'origin/fruitiex/gakarmor'

10 years agoMerge remote branch 'origin/master' into fruitiex/gakarmor
FruitieX [Tue, 12 Oct 2010 17:12:07 +0000 (20:12 +0300)]
Merge remote branch 'origin/master' into fruitiex/gakarmor

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
FruitieX [Tue, 12 Oct 2010 17:09:17 +0000 (20:09 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agoMerge remote branch 'origin/fruitiex/crosshairs'
Rudolf Polzer [Tue, 12 Oct 2010 17:02:46 +0000 (19:02 +0200)]
Merge remote branch 'origin/fruitiex/crosshairs'

10 years agoMerge remote branch 'origin/fruitiex/scoreboardcolor'
Rudolf Polzer [Tue, 12 Oct 2010 16:53:01 +0000 (18:53 +0200)]
Merge remote branch 'origin/fruitiex/scoreboardcolor'

10 years agochange the scoreboard color to be light-blue instead of the old nexuiz color
FruitieX [Tue, 12 Oct 2010 16:27:35 +0000 (19:27 +0300)]
change the scoreboard color to be light-blue instead of the old nexuiz color

10 years agomore visible default color, another crosshair, smaller size
FruitieX [Tue, 12 Oct 2010 16:21:13 +0000 (19:21 +0300)]
more visible default color, another crosshair, smaller size

10 years agoreplace some of the ugliest remaining old crosshairs
FruitieX [Tue, 12 Oct 2010 16:07:59 +0000 (19:07 +0300)]
replace some of the ugliest remaining old crosshairs

10 years agofit all items into the playersetup page, tweak the crosshair size constants
FruitieX [Tue, 12 Oct 2010 15:59:27 +0000 (18:59 +0300)]
fit all items into the playersetup page, tweak the crosshair size constants

10 years agonew crosshairs by unfa, add an optional centered dot for each of them (toggleable...
FruitieX [Tue, 12 Oct 2010 15:47:03 +0000 (18:47 +0300)]
new crosshairs by unfa, add an optional centered dot for each of them (toggleable via player setup menu), do some general cleanups in the player setup tab

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
FruitieX [Tue, 12 Oct 2010 13:17:58 +0000 (16:17 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Tue, 12 Oct 2010 12:04:13 +0000 (15:04 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

10 years agoalso set SendFlags when updating a camera
Rudolf Polzer [Sun, 10 Oct 2010 18:11:19 +0000 (20:11 +0200)]
also set SendFlags when updating a camera

10 years agodon't care if a BOT can see a warp getting rearranged
Rudolf Polzer [Sun, 10 Oct 2010 17:34:55 +0000 (19:34 +0200)]
don't care if a BOT can see a warp getting rearranged

10 years agomake warpzone reconnect entity also able to reconnect cameras
Rudolf Polzer [Sun, 10 Oct 2010 17:22:51 +0000 (19:22 +0200)]
make warpzone reconnect entity also able to reconnect cameras

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
FruitieX [Sat, 9 Oct 2010 08:58:06 +0000 (11:58 +0300)]
Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance

10 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Sat, 9 Oct 2010 08:57:25 +0000 (11:57 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

10 years agopyria_glow_moar.tga
FruitieX [Fri, 8 Oct 2010 17:59:41 +0000 (20:59 +0300)]
pyria_glow_moar.tga

10 years agoumbra_glow_moar.tga
FruitieX [Fri, 8 Oct 2010 17:40:13 +0000 (20:40 +0300)]
umbra_glow_moar.tga

10 years agoglow on gakarmor
FruitieX [Fri, 8 Oct 2010 16:45:36 +0000 (19:45 +0300)]
glow on gakarmor

10 years agoprecache the crosshair_ring to prevent a slight stutter when switching to the nex...
FruitieX [Fri, 8 Oct 2010 16:14:03 +0000 (19:14 +0300)]
precache the crosshair_ring to prevent a slight stutter when switching to the nex/rifle for the first time

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 7 Oct 2010 13:38:43 +0000 (15:38 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

10 years agoIPv6: new ban mask sizes to better match what ISPs do
Rudolf Polzer [Thu, 7 Oct 2010 13:36:25 +0000 (15:36 +0200)]
IPv6: new ban mask sizes to better match what ISPs do

10 years ago- Fix typo in fireball code that was causing to: * being able to shoot with primary...
terencehill [Mon, 4 Oct 2010 13:57:43 +0000 (15:57 +0200)]
- Fix typo in fireball code that was causing to: * being able to shoot with primary fire even if u don't have enough fuel, showing a wrong fuel progress bar because fuel quantity becomes negative * not being able to shoot with secondary fire if u have less than g_balance_fireball_primary_ammo fuel

- Cleanup: use directly STAT_FUEL

10 years agomake the mortar behave like the nexuiz mortar again
FruitieX [Wed, 6 Oct 2010 17:00:07 +0000 (20:00 +0300)]
make the mortar behave like the nexuiz mortar again

10 years agoMerge remote branch 'origin/master'
Rudolf Polzer [Wed, 6 Oct 2010 08:29:41 +0000 (10:29 +0200)]
Merge remote branch 'origin/master'

10 years agoadding Lee Stricklin's recent balance changes
rpolzer [Wed, 6 Oct 2010 08:29:09 +0000 (10:29 +0200)]
adding Lee Stricklin's recent balance changes

10 years agoadd some dark gradient to the background so that it works better on top of the console
FruitieX [Tue, 5 Oct 2010 18:58:47 +0000 (21:58 +0300)]
add some dark gradient to the background so that it works better on top of the console

10 years agoi challenge you to create a worse loading screen than this.
FruitieX [Tue, 5 Oct 2010 18:48:43 +0000 (21:48 +0300)]
i challenge you to create a worse loading screen than this.

10 years agofix an electro issue causing it not to fire sometimes
FruitieX [Tue, 5 Oct 2010 17:20:45 +0000 (20:20 +0300)]
fix an electro issue causing it not to fire sometimes

10 years agoMerge remote branch 'origin/mirceakitsune/weapon_mine_layer' into fruitiex/fruitbalance
FruitieX [Tue, 5 Oct 2010 16:28:44 +0000 (19:28 +0300)]
Merge remote branch 'origin/mirceakitsune/weapon_mine_layer' into fruitiex/fruitbalance

10 years agoremove minelayer test map
FruitieX [Tue, 5 Oct 2010 16:26:31 +0000 (19:26 +0300)]
remove minelayer test map

10 years agoadd the cvars to all balance configs to stop the ./all script from complaining
FruitieX [Tue, 5 Oct 2010 13:20:49 +0000 (16:20 +0300)]
add the cvars to all balance configs to stop the ./all script from complaining

10 years agoMore detail to mine layer crosshair. Still needs to be better though
Mircea Kitsune [Mon, 4 Oct 2010 21:44:02 +0000 (00:44 +0300)]
More detail to mine layer crosshair. Still needs to be better though

10 years agoAdd mine layer to priority list and add another forgotten cvar
Mircea Kitsune [Mon, 4 Oct 2010 21:38:45 +0000 (00:38 +0300)]
Add mine layer to priority list and add another forgotten cvar

10 years agoRename and correct a float
Mircea Kitsune [Mon, 4 Oct 2010 21:35:30 +0000 (00:35 +0300)]
Rename and correct a float

10 years agoCrosshair for the mine layer
Mircea Kitsune [Mon, 4 Oct 2010 21:28:37 +0000 (00:28 +0300)]
Crosshair for the mine layer

10 years agoDeadflag works better
Mircea Kitsune [Mon, 4 Oct 2010 21:12:37 +0000 (00:12 +0300)]
Deadflag works better

10 years agoa player's mines shall explode if he disconnects or dies
Mircea Kitsune [Mon, 4 Oct 2010 21:11:14 +0000 (00:11 +0300)]
a player's mines shall explode if he disconnects or dies

10 years agoAllow switching to the Mine Layer with no ammo when we have planted mines (wasn't...
Mircea Kitsune [Mon, 4 Oct 2010 20:57:02 +0000 (23:57 +0300)]
Allow switching to the Mine Layer with no ammo when we have planted mines (wasn't that tricky :) )

10 years agoFix the last commit. It allowed the Mine Layer to go minus on ammo and place mines...
Mircea Kitsune [Mon, 4 Oct 2010 20:45:22 +0000 (23:45 +0300)]
Fix the last commit. It allowed the Mine Layer to go minus on ammo and place mines forever :P

10 years agoDon't switch away from the Mine Layer when pressing primary fire if there are mines...
Mircea Kitsune [Mon, 4 Oct 2010 20:40:49 +0000 (23:40 +0300)]
Don't switch away from the Mine Layer when pressing primary fire if there are mines placed on the ground. Being able to select the mine layer again if you switched to another weapon however (if you have no ammo) is a bit trickier.

10 years agoMore tiny tweaks to cvar and comment
Mircea Kitsune [Mon, 4 Oct 2010 20:20:17 +0000 (23:20 +0300)]
More tiny tweaks to cvar and comment

10 years agoSome comments I forgot
Mircea Kitsune [Mon, 4 Oct 2010 20:16:45 +0000 (23:16 +0300)]
Some comments I forgot

10 years agoTiny cvar tweaks
Mircea Kitsune [Mon, 4 Oct 2010 20:15:08 +0000 (23:15 +0300)]
Tiny cvar tweaks

10 years agoSmall tweaks and arrangements
Mircea Kitsune [Mon, 4 Oct 2010 19:51:02 +0000 (22:51 +0300)]
Small tweaks and arrangements

10 years agoPrecache mine model, place comment and remove the last todo. The mine layer should...
Mircea Kitsune [Mon, 4 Oct 2010 19:40:40 +0000 (22:40 +0300)]
Precache mine model, place comment and remove the last todo. The mine layer should be 100% ready code wise :)

10 years agofix W_Mine_RespawnEntity
FruitieX [Mon, 4 Oct 2010 17:46:49 +0000 (20:46 +0300)]
fix W_Mine_RespawnEntity

10 years agoAttempt to re-spawn the projectile as a non-csqc entity once it hits the ground,...
Mircea Kitsune [Mon, 4 Oct 2010 17:11:32 +0000 (20:11 +0300)]
Attempt to re-spawn the projectile as a non-csqc entity once it hits the ground, so it can face in the proper dirrection. Not ready yet and this revision only brakes the gun!

10 years agorifle ring with the new function
FruitieX [Mon, 4 Oct 2010 16:24:57 +0000 (19:24 +0300)]
rifle ring with the new function

10 years agoIt's obvious we need new models and sounds, so remove this todo from the code
Mircea Kitsune [Mon, 4 Oct 2010 15:39:27 +0000 (18:39 +0300)]
It's obvious we need new models and sounds, so remove this todo from the code

10 years agoRemove "last mine" system, kept from the rocket launcher. It doesn't matter which...
Mircea Kitsune [Mon, 4 Oct 2010 15:37:01 +0000 (18:37 +0300)]
Remove "last mine" system, kept from the rocket launcher. It doesn't matter which your last mine is, since all your mines are treated equally. This appears to fix the remote detonation bug too.

10 years agomine layer start weapon cvar
Mircea Kitsune [Mon, 4 Oct 2010 15:22:45 +0000 (18:22 +0300)]
mine layer start weapon cvar

10 years agoMines only have their lanching speed, so don't keep two speed cvars
Mircea Kitsune [Mon, 4 Oct 2010 15:15:40 +0000 (18:15 +0300)]
Mines only have their lanching speed, so don't keep two speed cvars

10 years agoMine Layer code for havocbot
Mircea Kitsune [Mon, 4 Oct 2010 15:12:42 +0000 (18:12 +0300)]
Mine Layer code for havocbot

10 years agoFix "mines getting stuck in the air" issues. A mine that touches any moving entity...
Mircea Kitsune [Mon, 4 Oct 2010 14:38:36 +0000 (17:38 +0300)]
Fix "mines getting stuck in the air" issues. A mine that touches any moving entity will just fall, and only lock in place when it touches non-movable objects.

10 years agoslower the uzi primary refire just a bit, tweak damage so dps remains unchanged ...
FruitieX [Mon, 4 Oct 2010 14:28:47 +0000 (17:28 +0300)]
slower the uzi primary refire just a bit, tweak damage so dps remains unchanged (it's not a chaingun)

10 years agoDon't cancel mine explosion if the foe left its vicinity before it goes off
Mircea Kitsune [Mon, 4 Oct 2010 14:19:02 +0000 (17:19 +0300)]
Don't cancel mine explosion if the foe left its vicinity before it goes off

10 years agoProper protection system
Mircea Kitsune [Mon, 4 Oct 2010 14:16:08 +0000 (17:16 +0300)]
Proper protection system

10 years agoAttempt to implement friend protection (the mine not exploding if it would hurt the...
Mircea Kitsune [Mon, 4 Oct 2010 13:58:10 +0000 (16:58 +0300)]
Attempt to implement friend protection (the mine not exploding if it would hurt the owner or a team mate). Not ready yet.

10 years agoTODO list in the weapon file, for the important things that must be done before this...
Mircea Kitsune [Mon, 4 Oct 2010 13:39:08 +0000 (16:39 +0300)]
TODO list in the weapon file, for the important things that must be done before this weapon is ready (to be deleted once everything is done)

10 years agoCorrect weapon slot
Mircea Kitsune [Mon, 4 Oct 2010 13:30:05 +0000 (16:30 +0300)]
Correct weapon slot

10 years agoMerge branch 'master' into mirceakitsune/weapon_mine_layer
Mircea Kitsune [Mon, 4 Oct 2010 13:16:57 +0000 (16:16 +0300)]
Merge branch 'master' into mirceakitsune/weapon_mine_layer

10 years agoReasonable default detonation delay
Mircea Kitsune [Mon, 4 Oct 2010 13:14:35 +0000 (16:14 +0300)]
Reasonable default detonation delay

10 years agoPlay the mine trigger sound
Mircea Kitsune [Mon, 4 Oct 2010 13:09:14 +0000 (16:09 +0300)]
Play the mine trigger sound

10 years agoMine trigger sound file
Mircea Kitsune [Mon, 4 Oct 2010 13:06:35 +0000 (16:06 +0300)]
Mine trigger sound file

10 years agoDelayed detonation now working properly. Next we need a beep sound when the mine...
Mircea Kitsune [Mon, 4 Oct 2010 13:03:11 +0000 (16:03 +0300)]
Delayed detonation now working properly. Next we need a beep sound when the mine is triggered (until it detonates)

10 years agoFirst step toward a mine delayed detonation. Not ready yet
Mircea Kitsune [Mon, 4 Oct 2010 12:55:01 +0000 (15:55 +0300)]
First step toward a mine delayed detonation. Not ready yet

10 years agosend max/minvelocity, make the circle drawing code a function, allow some customizati...
FruitieX [Sun, 3 Oct 2010 18:48:12 +0000 (21:48 +0300)]
send max/minvelocity, make the circle drawing code a function, allow some customization via cvars

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
FruitieX [Sun, 3 Oct 2010 16:46:58 +0000 (19:46 +0300)]
Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance

10 years agouse only XY velocity on nex
FruitieX [Sun, 3 Oct 2010 16:46:27 +0000 (19:46 +0300)]
use only XY velocity on nex

10 years agofix a bunch of typos
Rudolf Polzer [Sun, 3 Oct 2010 16:45:47 +0000 (18:45 +0200)]
fix a bunch of typos

10 years agoget rid of x0, y0
Rudolf Polzer [Sun, 3 Oct 2010 16:37:55 +0000 (18:37 +0200)]
get rid of x0, y0

10 years agouse one less poly
Rudolf Polzer [Sun, 3 Oct 2010 16:36:29 +0000 (18:36 +0200)]
use one less poly

10 years agofix it ;)
Rudolf Polzer [Sun, 3 Oct 2010 16:32:27 +0000 (18:32 +0200)]
fix it ;)

10 years agoMerge branch 'master' into fruitiex/fruitbalance
Rudolf Polzer [Sun, 3 Oct 2010 16:17:00 +0000 (18:17 +0200)]
Merge branch 'master' into fruitiex/fruitbalance

10 years agob0rken nex speed indicator
FruitieX [Sun, 3 Oct 2010 16:15:37 +0000 (19:15 +0300)]
b0rken nex speed indicator

10 years agoalso apply nightvision overlay on r_fullbright use (really, nobody should be using...
Rudolf Polzer [Sun, 3 Oct 2010 15:37:05 +0000 (17:37 +0200)]
also apply nightvision overlay on r_fullbright use (really, nobody should be using that)

10 years agolower speed of primary mortar projectile, lower bouncefactor too
FruitieX [Sun, 3 Oct 2010 12:23:18 +0000 (15:23 +0300)]
lower speed of primary mortar projectile, lower bouncefactor too

10 years agolonger refire/animtime on rifle primary, more damage so dps stays the same
FruitieX [Sun, 3 Oct 2010 12:05:43 +0000 (15:05 +0300)]
longer refire/animtime on rifle primary, more damage so dps stays the same

10 years agosimplify player/botclip collision cvars
Rudolf Polzer [Sun, 3 Oct 2010 11:54:01 +0000 (13:54 +0200)]
simplify player/botclip collision cvars

10 years agofix typo
FruitieX [Sun, 3 Oct 2010 11:49:23 +0000 (14:49 +0300)]
fix typo

10 years agoremove useless old messy feature
FruitieX [Sun, 3 Oct 2010 11:36:17 +0000 (14:36 +0300)]
remove useless old messy feature

10 years agogrenadelauncher remote detonation test
FruitieX [Sun, 3 Oct 2010 11:31:56 +0000 (14:31 +0300)]
grenadelauncher remote detonation test

10 years agoBotclip CTF flags and Keyhunt keys too. Or if the key / flag gets dropped through...
Mircea Kitsune [Sun, 3 Oct 2010 11:30:28 +0000 (14:30 +0300)]
Botclip CTF flags and Keyhunt keys too. Or if the key / flag gets dropped through a botclip, bots may not reach them an continue the game on some maps.

10 years agoBot clips should block waypoints too
Mircea Kitsune [Sun, 3 Oct 2010 11:24:00 +0000 (14:24 +0300)]
Bot clips should block waypoints too

10 years agoImplement botclip common shader. Bot clips can now be used to block bots from specifi...
Mircea Kitsune [Sun, 3 Oct 2010 11:18:12 +0000 (14:18 +0300)]
Implement botclip common shader. Bot clips can now be used to block bots from specific areas of a map. The common shader should be restored with this change too.

10 years agouse ExponentialFalloff()
FruitieX [Sun, 3 Oct 2010 10:31:42 +0000 (13:31 +0300)]
use ExponentialFalloff()