xonotic/xonotic-data.pk3dir.git
10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/outofammosound'
Rudolf Polzer [Tue, 19 Oct 2010 05:42:06 +0000 (07:42 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound'

10 years agoMerge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 19 Oct 2010 05:37:39 +0000 (07:37 +0200)]
Merge branch 'master' of de.git.xonotic.org/xonotic/xonotic-data.pk3dir

10 years agomisc_laser: allow turning off the dlight by setting "modelscale" "-1"
Rudolf Polzer [Tue, 19 Oct 2010 05:37:20 +0000 (07:37 +0200)]
misc_laser: allow turning off the dlight by setting "modelscale" "-1"

10 years agoa simpler strength sound limiter
Rudolf Polzer [Tue, 19 Oct 2010 05:34:34 +0000 (07:34 +0200)]
a simpler strength sound limiter

10 years agodryfire.wav sound when out of ammo
FruitieX [Mon, 18 Oct 2010 23:46:20 +0000 (02:46 +0300)]
dryfire.wav sound when out of ammo

10 years agoprevent insane strength sound spam on weapons that fire at each frame (tuba, electro...
FruitieX [Mon, 18 Oct 2010 21:39:32 +0000 (00:39 +0300)]
prevent insane strength sound spam on weapons that fire at each frame (tuba, electro, gauntlet laser if someone still uses that), and weapons that apparently fire multiple times per frame?! (hlac secondary)

10 years agodon't consume cells if charge is 100% and secondary is held down, nerf velocity charg...
FruitieX [Mon, 18 Oct 2010 21:17:57 +0000 (00:17 +0300)]
don't consume cells if charge is 100% and secondary is held down, nerf velocity charge slightly, increase the base charge rate, increase secondary charge rate slightly. This way it hopefully requires a bit more effort to get up to 120 damage.

10 years agoonly add a "base charge" up to 50%
FruitieX [Mon, 18 Oct 2010 21:10:39 +0000 (00:10 +0300)]
only add a "base charge" up to 50%

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Mon, 18 Oct 2010 17:20:37 +0000 (19:20 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

10 years agonerf grenadelauncher to dmg 50/70 from 60/80
FruitieX [Mon, 18 Oct 2010 17:18:02 +0000 (20:18 +0300)]
nerf grenadelauncher to dmg 50/70 from 60/80

10 years agoadd completion for playermodel command
Rudolf Polzer [Mon, 18 Oct 2010 16:11:22 +0000 (18:11 +0200)]
add completion for playermodel command

10 years agoalso support JPEG waypointsprites
Rudolf Polzer [Mon, 18 Oct 2010 12:13:31 +0000 (14:13 +0200)]
also support JPEG waypointsprites

10 years agofix direction of infinite lasers
Rudolf Polzer [Mon, 18 Oct 2010 07:38:06 +0000 (09:38 +0200)]
fix direction of infinite lasers

10 years agostart out with 0.25 charge
FruitieX [Sun, 17 Oct 2010 23:14:07 +0000 (02:14 +0300)]
start out with 0.25 charge

10 years agonerf the nex charging rate a bit, but decrease the amount of charge depleted at shot
FruitieX [Sun, 17 Oct 2010 23:02:10 +0000 (02:02 +0300)]
nerf the nex charging rate a bit, but decrease the amount of charge depleted at shot

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sun, 17 Oct 2010 20:21:45 +0000 (22:21 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

10 years agoreset nex_charge at spawn
FruitieX [Sun, 17 Oct 2010 20:05:48 +0000 (23:05 +0300)]
reset nex_charge at spawn

10 years agodon't send the effect number for infinite non-collisiontesting lasers
Rudolf Polzer [Sun, 17 Oct 2010 20:02:53 +0000 (22:02 +0200)]
don't send the effect number for infinite non-collisiontesting lasers

10 years agoCharge the nex in a little different way, by always charging at a set rate. If the...
FruitieX [Sun, 17 Oct 2010 19:59:53 +0000 (22:59 +0300)]
Charge the nex in a little different way, by always charging at a set rate. If the player goes faster, this rate gets faster, and can be increased further with the secondary just as before

10 years agomisc_laser: add a spawn flag to disable collision testing of the laser (laser then...
Rudolf Polzer [Sun, 17 Oct 2010 19:59:02 +0000 (21:59 +0200)]
misc_laser: add a spawn flag to disable collision testing of the laser (laser then passes through stuff and is not blocked), should speed up rendering

10 years agoadded terencehill to credits
Rudolf Polzer [Sun, 17 Oct 2010 16:56:24 +0000 (18:56 +0200)]
added terencehill to credits

10 years agofix typo
Rudolf Polzer [Sun, 17 Oct 2010 14:34:10 +0000 (16:34 +0200)]
fix typo

10 years agobalance tuning: give only about half the pickup ammo for picking up a weapon
Rudolf Polzer [Sun, 17 Oct 2010 14:31:04 +0000 (16:31 +0200)]
balance tuning: give only about half the pickup ammo for picking up a weapon

10 years agog_pickup_<ammotype>_weapon: the amount of that ammo type you get for picking up a...
Rudolf Polzer [Sun, 17 Oct 2010 14:29:39 +0000 (16:29 +0200)]
g_pickup_<ammotype>_weapon: the amount of that ammo type you get for picking up a WEAPON

10 years agotrigger_impulse: update csqc projectiles
Rudolf Polzer [Sat, 16 Oct 2010 20:03:01 +0000 (22:03 +0200)]
trigger_impulse: update csqc projectiles

10 years agoMerge remote branch 'origin/tzork/turrets'
Rudolf Polzer [Sat, 16 Oct 2010 19:36:52 +0000 (21:36 +0200)]
Merge remote branch 'origin/tzork/turrets'

10 years agoMajor: turret.ticrate was NOT beeing correctly set, resulting in thinks EVERY FRAME...
Jakob MG [Sat, 16 Oct 2010 18:05:47 +0000 (20:05 +0200)]
Major: turret.ticrate was NOT beeing correctly set, resulting in thinks EVERY FRAME insted of the intended 10 FPS. Fixing this also means the thinks are now acctualy spread across frames. Should be a major speedup.
Minor: Cleanups and comments, adjusted configs.

10 years agofix autogeneration of mapinfo with cdtrack
Rudolf Polzer [Fri, 15 Oct 2010 17:10:13 +0000 (19:10 +0200)]
fix autogeneration of mapinfo with cdtrack

10 years agofix handling of angles of the rocket projectile
Rudolf Polzer [Fri, 15 Oct 2010 16:56:42 +0000 (18:56 +0200)]
fix handling of angles of the rocket projectile

10 years agospeed up more csqc ent drawing
Rudolf Polzer [Fri, 15 Oct 2010 16:43:20 +0000 (18:43 +0200)]
speed up more csqc ent drawing

10 years agodraw projectiles using drawmask (faster)
Rudolf Polzer [Fri, 15 Oct 2010 16:39:57 +0000 (18:39 +0200)]
draw projectiles using drawmask (faster)

10 years agoremove an unused function
Rudolf Polzer [Fri, 15 Oct 2010 16:05:51 +0000 (18:05 +0200)]
remove an unused function

10 years agofix the filtering out .dat
Rudolf Polzer [Fri, 15 Oct 2010 14:36:01 +0000 (16:36 +0200)]
fix the filtering out .dat

10 years agoproper detection of changed source files in the QC makefile
Rudolf Polzer [Fri, 15 Oct 2010 14:33:59 +0000 (16:33 +0200)]
proper detection of changed source files in the QC makefile

10 years agoMerge remote branch 'origin/master' into divVerent/crypto2
Rudolf Polzer [Fri, 15 Oct 2010 13:16:19 +0000 (15:16 +0200)]
Merge remote branch 'origin/master' into divVerent/crypto2

10 years agocheaper clientmodel draw code
Rudolf Polzer [Thu, 14 Oct 2010 11:22:21 +0000 (13:22 +0200)]
cheaper clientmodel draw code

10 years agomore typos
Rudolf Polzer [Thu, 14 Oct 2010 11:11:10 +0000 (13:11 +0200)]
more typos

10 years agofix typo
Rudolf Polzer [Thu, 14 Oct 2010 11:08:16 +0000 (13:08 +0200)]
fix typo

10 years agoLOD support for misc_clientmodel (untested)
Rudolf Polzer [Thu, 14 Oct 2010 11:06:47 +0000 (13:06 +0200)]
LOD support for misc_clientmodel (untested)

10 years agoless blur please, so characters no longer overlap
Rudolf Polzer [Thu, 14 Oct 2010 09:10:57 +0000 (11:10 +0200)]
less blur please, so characters no longer overlap

10 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Wed, 13 Oct 2010 19:35:32 +0000 (22:35 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

10 years agoI have no idea why, but this fixes the mine layer.
FruitieX [Wed, 13 Oct 2010 18:07:25 +0000 (21:07 +0300)]
I have no idea why, but this fixes the mine layer.

10 years agoMerge remote branch 'origin/fruitiex/loadblackbg'
Rudolf Polzer [Wed, 13 Oct 2010 16:49:17 +0000 (18:49 +0200)]
Merge remote branch 'origin/fruitiex/loadblackbg'

10 years agodon't run any of the nex-ring stuff if nexspeed <= minspeed
FruitieX [Wed, 13 Oct 2010 16:35:43 +0000 (19:35 +0300)]
don't run any of the nex-ring stuff if nexspeed <= minspeed

10 years agoback to black bg in the loading screen
FruitieX [Wed, 13 Oct 2010 12:02:28 +0000 (15:02 +0300)]
back to black bg in the loading screen

10 years agodon't increase the speed counter clientside if we're out of ammo
FruitieX [Wed, 13 Oct 2010 11:19:19 +0000 (14:19 +0300)]
don't increase the speed counter clientside if we're out of ammo

10 years agomake the secondary rifle sound a bit more silent
FruitieX [Wed, 13 Oct 2010 11:05:19 +0000 (14:05 +0300)]
make the secondary rifle sound a bit more silent

10 years agomake nex max damage 120 instead of 125 to prevent easy spawn kills if you have lots...
FruitieX [Wed, 13 Oct 2010 10:34:51 +0000 (13:34 +0300)]
make nex max damage 120 instead of 125 to prevent easy spawn kills if you have lots of cells

10 years agoset some sane cvars, let the client know if the balance uses the velocity dependent...
FruitieX [Wed, 13 Oct 2010 10:25:35 +0000 (13:25 +0300)]
set some sane cvars, let the client know if the balance uses the velocity dependent nex and hide the circle if this isn't the case

10 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Wed, 13 Oct 2010 10:06:16 +0000 (13:06 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

10 years agonex secondary now charges the "speed circle" :)
FruitieX [Wed, 13 Oct 2010 10:05:37 +0000 (13:05 +0300)]
nex secondary now charges the "speed circle" :)

10 years agochange the 5 tics per weapon frame to 2; expose it as a #define W_TICSPERFRAME
Rudolf Polzer [Wed, 13 Oct 2010 10:03:46 +0000 (12:03 +0200)]
change the 5 tics per weapon frame to 2; expose it as a #define W_TICSPERFRAME

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/viewoffsfix'
Rudolf Polzer [Wed, 13 Oct 2010 09:52:13 +0000 (11:52 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/viewoffsfix'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/gakarmor'
Rudolf Polzer [Wed, 13 Oct 2010 09:52:00 +0000 (11:52 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/gakarmor'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Wed, 13 Oct 2010 09:49:59 +0000 (11:49 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

10 years agooops, primary and secondary tracer checks flipped
FruitieX [Wed, 13 Oct 2010 08:52:51 +0000 (11:52 +0300)]
oops, primary and secondary tracer checks flipped

10 years agoadd forgotten cvar from the nex slow speed falloff commit
FruitieX [Wed, 13 Oct 2010 08:50:09 +0000 (11:50 +0300)]
add forgotten cvar from the nex slow speed falloff commit

10 years agocampingrifle secondary now a "stealth" version of the primary: less damage, no tracer
FruitieX [Wed, 13 Oct 2010 08:47:41 +0000 (11:47 +0300)]
campingrifle secondary now a "stealth" version of the primary: less damage, no tracer

10 years agominstanex too
FruitieX [Wed, 13 Oct 2010 08:42:14 +0000 (11:42 +0300)]
minstanex too

10 years agouse the scope reticle when +zooming with the nex or CR
FruitieX [Wed, 13 Oct 2010 08:40:03 +0000 (11:40 +0300)]
use the scope reticle when +zooming with the nex or CR

10 years agochange color of lgbeam to match the electro blobs, looked ugly before IMO
FruitieX [Wed, 13 Oct 2010 08:31:00 +0000 (11:31 +0300)]
change color of lgbeam to match the electro blobs, looked ugly before IMO

10 years agoRevert "disable secondary fire modes of nex and campingrifle, replaced with zoom...
FruitieX [Wed, 13 Oct 2010 08:30:44 +0000 (11:30 +0300)]
Revert "disable secondary fire modes of nex and campingrifle, replaced with zoom again"

This reverts commit 0592df33aa94e7bbff47193396dbd5308861d801.

10 years agodisable secondary fire modes of nex and campingrifle, replaced with zoom again
FruitieX [Wed, 13 Oct 2010 08:08:46 +0000 (11:08 +0300)]
disable secondary fire modes of nex and campingrifle, replaced with zoom again

10 years agooops, forgot to remove one part in pyria_shirt.tga
FruitieX [Wed, 13 Oct 2010 07:56:23 +0000 (10:56 +0300)]
oops, forgot to remove one part in pyria_shirt.tga

10 years ago_pants added to _shirt, remove parts already present in _glow
FruitieX [Wed, 13 Oct 2010 07:49:19 +0000 (10:49 +0300)]
_pants added to _shirt, remove parts already present in _glow

10 years agoremove reptile textures
FruitieX [Wed, 13 Oct 2010 07:39:48 +0000 (10:39 +0300)]
remove reptile textures

10 years agoMerge remote branch 'origin/master' into fruitiex/fruitbalance
FruitieX [Wed, 13 Oct 2010 07:34:36 +0000 (10:34 +0300)]
Merge remote branch 'origin/master' into fruitiex/fruitbalance

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/target_changelevel'
Rudolf Polzer [Wed, 13 Oct 2010 07:33:24 +0000 (09:33 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/target_changelevel'

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/bugfix_funcbobbing_killtargeting'
Rudolf Polzer [Wed, 13 Oct 2010 07:31:26 +0000 (09:31 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/bugfix_funcbobbing_killtargeting'

10 years agochange simple majority to 0.667 for now
Rudolf Polzer [Wed, 13 Oct 2010 07:30:13 +0000 (09:30 +0200)]
change simple majority to 0.667 for now

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/vote_simplemajority'
Rudolf Polzer [Wed, 13 Oct 2010 07:29:48 +0000 (09:29 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/vote_simplemajority'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/hudfreezefix'
Rudolf Polzer [Wed, 13 Oct 2010 07:27:54 +0000 (09:27 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/hudfreezefix'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/hudcursorfix'
Rudolf Polzer [Wed, 13 Oct 2010 07:27:27 +0000 (09:27 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/hudcursorfix'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/branding'
Rudolf Polzer [Wed, 13 Oct 2010 07:25:26 +0000 (09:25 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/branding'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/blurfont'
Rudolf Polzer [Wed, 13 Oct 2010 07:25:02 +0000 (09:25 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/blurfont'

10 years agosome more easy nexuiz logos removed
FruitieX [Wed, 13 Oct 2010 00:38:22 +0000 (03:38 +0300)]
some more easy nexuiz logos removed

10 years agoremove nexuiz logo on portals
FruitieX [Wed, 13 Oct 2010 00:27:53 +0000 (03:27 +0300)]
remove nexuiz logo on portals

10 years agoXonotic logo on the keyhunt key
FruitieX [Wed, 13 Oct 2010 00:22:52 +0000 (03:22 +0300)]
Xonotic logo on the keyhunt key

10 years agohide the CSQC mouse cursor when doubleclicking a panel
FruitieX [Wed, 13 Oct 2010 00:14:22 +0000 (03:14 +0300)]
hide the CSQC mouse cursor when doubleclicking a panel

10 years agodon't freeze the vieworigin/angles in hud_configure mode if spectating someone
FruitieX [Wed, 13 Oct 2010 00:08:18 +0000 (03:08 +0300)]
don't freeze the vieworigin/angles in hud_configure mode if spectating someone

10 years agosome vote changes
FruitieX [Tue, 12 Oct 2010 23:39:21 +0000 (02:39 +0300)]
some vote changes

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 agobetter font settings
FruitieX [Tue, 12 Oct 2010 20:31:31 +0000 (23:31 +0300)]
better font settings

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