xonotic/xonotic-data.pk3dir.git
11 years agoMerge branch 'master' into fruitiex/fruitbalance
Rudolf Polzer [Sun, 18 Jul 2010 14:59:44 +0000 (16:59 +0200)]
Merge branch 'master' into fruitiex/fruitbalance

11 years agoCRLF fixes
Rudolf Polzer [Sun, 18 Jul 2010 14:26:37 +0000 (16:26 +0200)]
CRLF fixes

11 years agoMerge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
Rudolf Polzer [Fri, 16 Jul 2010 21:43:11 +0000 (23:43 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

11 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/ghost_items_team_fix'
Rudolf Polzer [Fri, 16 Jul 2010 21:36:07 +0000 (23:36 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/ghost_items_team_fix'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/sevchatbubble'
Rudolf Polzer [Fri, 16 Jul 2010 21:34:38 +0000 (23:34 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/sevchatbubble'

11 years agoMerge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Fri, 16 Jul 2010 21:32:37 +0000 (23:32 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'

11 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Fri, 16 Jul 2010 09:46:15 +0000 (12:46 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

11 years agomove the definition to outside of the function; i think it's cleaner like this
FruitieX [Fri, 16 Jul 2010 09:44:06 +0000 (12:44 +0300)]
move the definition to outside of the function; i think it's cleaner like this

11 years agoMerge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud
terencehill [Fri, 16 Jul 2010 00:30:25 +0000 (02:30 +0200)]
Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud

11 years agoMerge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
terencehill [Fri, 16 Jul 2010 00:19:55 +0000 (02:19 +0200)]
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud

11 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Thu, 15 Jul 2010 16:48:42 +0000 (19:48 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

11 years agomerge in sev's skin rename/updates and move the descriptions out of the default skin...
FruitieX [Thu, 15 Jul 2010 16:29:50 +0000 (19:29 +0300)]
merge in sev's skin rename/updates and move the descriptions out of the default skin config into a separate cfg file. Delete wickedhud, it's been renamed.

11 years agoA skin called Luminos, for fruitiex/newpanelhud
sev [Thu, 15 Jul 2010 11:45:39 +0000 (13:45 +0200)]
A skin called Luminos, for fruitiex/newpanelhud

11 years agoAnother cleanup
terencehill [Thu, 15 Jul 2010 08:51:06 +0000 (10:51 +0200)]
Another cleanup
Avoid lots of checks and to initialize id (never used) for every panel.
With this change HUD_Panel_UpdateCvarsForId is not called anymore, however I left the definition there for possible future use.

11 years agoMinor cleanups
terencehill [Thu, 15 Jul 2010 08:36:34 +0000 (10:36 +0200)]
Minor cleanups
- Remove obsolete var alpha
- Remove stat_weapons and use directly its value, it's used only once
- Make weapon_number local as it actually is
- Initialize weapon_damage and weapon_hit when and where they are used
- Remove acc_colors_debug

11 years agoCustomizable colors and levels for weapons accuracy
terencehill [Wed, 14 Jul 2010 22:09:38 +0000 (00:09 +0200)]
Customizable colors and levels for weapons accuracy
cvars:
hud_weaponicons_accuracy_color_levels
hud_weaponicons_accuracy_color<X>

11 years agoMerge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
terencehill [Wed, 14 Jul 2010 20:33:14 +0000 (22:33 +0200)]
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh

11 years agorework balanceFruit from scratch (WIP)
FruitieX [Wed, 14 Jul 2010 18:28:54 +0000 (21:28 +0300)]
rework balanceFruit from scratch (WIP)

11 years agoadd cvars that allow nerfing the rockets if remote detonated
FruitieX [Wed, 14 Jul 2010 18:26:32 +0000 (21:26 +0300)]
add cvars that allow nerfing the rockets if remote detonated

11 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

11 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Wed, 14 Jul 2010 17:23:57 +0000 (20:23 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

11 years agouse already existing, proved to work functions instead of creating own ones and watch...
FruitieX [Wed, 14 Jul 2010 17:22:03 +0000 (20:22 +0300)]
use already existing, proved to work functions instead of creating own ones and watch the race timer magically start working again!

11 years agoremove the following useless icons
FruitieX [Wed, 14 Jul 2010 13:49:17 +0000 (16:49 +0300)]
remove the following useless icons

11 years agoan "easier" physics config, but not really convinced of it
Rudolf Polzer [Tue, 13 Jul 2010 20:35:04 +0000 (22:35 +0200)]
an "easier" physics config, but not really convinced of it

11 years agoallow custom colors (by cvars) on the complain bubbles
FruitieX [Tue, 13 Jul 2010 11:27:18 +0000 (14:27 +0300)]
allow custom colors (by cvars) on the complain bubbles

11 years agoattempt to make a little nicer looking complain bubble
FruitieX [Tue, 13 Jul 2010 11:01:31 +0000 (14:01 +0300)]
attempt to make a little nicer looking complain bubble

11 years agomake the two last dialogs work
FruitieX [Tue, 13 Jul 2010 09:25:23 +0000 (12:25 +0300)]
make the two last dialogs work

11 years agodialogs for most remaining panels. problem left to tackle: how to select the dialog...
FruitieX [Tue, 13 Jul 2010 00:39:37 +0000 (03:39 +0300)]
dialogs for most remaining panels. problem left to tackle: how to select the dialog background image?

11 years agoinventory panel
FruitieX [Mon, 12 Jul 2010 13:24:48 +0000 (16:24 +0300)]
inventory panel

11 years agolast updates before i apply the dialog layout on all the hud panel dialogs
FruitieX [Mon, 12 Jul 2010 13:15:23 +0000 (16:15 +0300)]
last updates before i apply the dialog layout on all the hud panel dialogs

11 years agocolorpicked_selected image, code still fails at drawing it (using very ugly hack)
FruitieX [Mon, 12 Jul 2010 10:59:53 +0000 (13:59 +0300)]
colorpicked_selected image, code still fails at drawing it (using very ugly hack)

11 years agomuch improved weapon icons panel, committing while it works :) still going to make...
FruitieX [Mon, 12 Jul 2010 10:57:20 +0000 (13:57 +0300)]
much improved weapon icons panel, committing while it works :) still going to make minor tweaks before applying the same layout on all panel dialogs

11 years agopreliminary new credits file - note: it sure has many mistakes, please correct or...
Rudolf Polzer [Mon, 12 Jul 2010 07:21:31 +0000 (09:21 +0200)]
preliminary new credits file - note: it sure has many mistakes, please correct or notify me about them. Also please tell me whether you want to appear with real name or just nickname.

11 years agouseless todo
FruitieX [Sun, 11 Jul 2010 18:23:42 +0000 (21:23 +0300)]
useless todo

11 years agoFix a bug in the ghost items code, which was causing team items to not ghost properly.
Mircea Kitsune [Sun, 11 Jul 2010 15:09:54 +0000 (18:09 +0300)]
Fix a bug in the ghost items code, which was causing team items to not ghost properly.

11 years agoCopyBody: also copy glowmod
Rudolf Polzer [Sun, 11 Jul 2010 14:13:58 +0000 (16:13 +0200)]
CopyBody: also copy glowmod

11 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Sun, 11 Jul 2010 00:19:15 +0000 (03:19 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

11 years agosome fixes to exporter, custom aspect cvar for weaponicons
FruitieX [Sun, 11 Jul 2010 00:08:04 +0000 (03:08 +0300)]
some fixes to exporter, custom aspect cvar for weaponicons

11 years agonew chatbubble icon by sev, ready for merge!
FruitieX [Sat, 10 Jul 2010 23:47:53 +0000 (02:47 +0300)]
new chatbubble icon by sev, ready for merge!

11 years agoammo status bar on the weaponicons panel, also commit some icons that i forgot
FruitieX [Sat, 10 Jul 2010 23:32:23 +0000 (02:32 +0300)]
ammo status bar on the weaponicons panel, also commit some icons that i forgot

11 years agofix the "pink accuracy" print for good
FruitieX [Sat, 10 Jul 2010 20:46:46 +0000 (23:46 +0300)]
fix the "pink accuracy" print for good

11 years agomake accuracy display turn yellow already at 20%, 20% accuracy is already ok
FruitieX [Sat, 10 Jul 2010 20:42:18 +0000 (23:42 +0300)]
make accuracy display turn yellow already at 20%, 20% accuracy is already ok

11 years agobatch of notify and pressedkeys updates
FruitieX [Sat, 10 Jul 2010 20:26:32 +0000 (23:26 +0300)]
batch of notify and pressedkeys updates

11 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'
Rudolf Polzer [Sat, 10 Jul 2010 20:17:32 +0000 (22:17 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'

11 years agoRemove a wrong and never executed piece of code within minstagib_items.
terencehill [Sat, 10 Jul 2010 13:23:46 +0000 (15:23 +0200)]
Remove a wrong and never executed piece of code within minstagib_items.
Reason: the function minstagib_items is intended to be called (and it's called I've verified) only on spawned items loading the map, never on dropped weapons.
If it wasn't so, that code would have spawned WRONGLY a nex instead of a minstanex (there is a typo).
The code that does correctly the job obviously exists and can be found in the function Item_GiveTo.

11 years agoLimit health/armor in minstagib:
terencehill [Sat, 10 Jul 2010 13:07:10 +0000 (15:07 +0200)]
Limit health/armor in minstagib:
- limit health and armor that can be given by the command give.
- do not allow to get more then 999 extralives (it could happen after u cheated with give command).

OT: add a clarifier comment.

11 years agoFix the placeholders %y, %l, %d (used in chat to find the nearest weapons/powerups...
terencehill [Sat, 10 Jul 2010 12:36:02 +0000 (14:36 +0200)]
Fix the placeholders %y, %l, %d (used in chat to find the nearest weapons/powerups) to find megahealth in minstagib (hackishly labeled IT_NAILS) and Fuel regenerator (IT_FUEL_REGEN).

11 years agoDo not precache strength_respawn.wav and shield_respawn.wav in minstagib, in this...
terencehill [Sat, 10 Jul 2010 12:23:11 +0000 (14:23 +0200)]
Do not precache strength_respawn.wav and shield_respawn.wav in minstagib, in this game mode it's used the only itemrespawn.wav.

11 years agoFix wrong messages in the console (and in the weapons panel too) playing certain...
terencehill [Sat, 10 Jul 2010 12:14:54 +0000 (14:14 +0200)]
Fix wrong messages in the console (and in the weapons panel too) playing certain game modes, telling you "You do not have the weapon X" instead of "The weapon X is NOT AVAILABLE in this map", for really not available weapons.
It can be easily noticed in minstagib.

11 years agoFix some typo.
terencehill [Sat, 10 Jul 2010 12:02:39 +0000 (14:02 +0200)]
Fix some typo.
Remove assignments of itemid and weaponid as they are unnecessary (see code).

11 years agoSeraphina, not Stephania :P Should be ready to merge again.
Mircea Kitsune [Sat, 10 Jul 2010 00:39:11 +0000 (03:39 +0300)]
Seraphina, not Stephania :P Should be ready to merge again.

11 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
FruitieX [Fri, 9 Jul 2010 19:41:59 +0000 (22:41 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance

11 years agomake the shooting star death available outside of debug
MrBougo [Fri, 9 Jul 2010 18:27:51 +0000 (20:27 +0200)]
make the shooting star death available outside of debug

new cvar: g_maxspeed, 0 default (no limits), any player who goes faster gets killed

11 years agowritespectatable for centerprints
FruitieX [Wed, 7 Jul 2010 22:58:11 +0000 (01:58 +0300)]
writespectatable for centerprints

11 years agoremove weird dummyfunctions, bug was fixed a long time ago. Also attempt a race score...
FruitieX [Wed, 7 Jul 2010 22:32:56 +0000 (01:32 +0300)]
remove weird dummyfunctions, bug was fixed a long time ago. Also attempt a race score display, which currently is completely fail. :)

11 years agoremove some useless comments from the racetimer code
FruitieX [Wed, 7 Jul 2010 19:18:35 +0000 (22:18 +0300)]
remove some useless comments from the racetimer code

11 years agodrawstring_expanding, use in race modicon panel
FruitieX [Wed, 7 Jul 2010 19:16:37 +0000 (22:16 +0300)]
drawstring_expanding, use in race modicon panel

11 years agoexpanding pic for strength/invincible
FruitieX [Wed, 7 Jul 2010 19:03:53 +0000 (22:03 +0300)]
expanding pic for strength/invincible

11 years agouse drawcolorcodedstring_aspect in the vote window
FruitieX [Wed, 7 Jul 2010 18:08:46 +0000 (21:08 +0300)]
use drawcolorcodedstring_aspect in the vote window

11 years agoremove a useless arg of drawstring_aspect, also implement drawcolorcodedstring_aspect
FruitieX [Wed, 7 Jul 2010 18:06:19 +0000 (21:06 +0300)]
remove a useless arg of drawstring_aspect, also implement drawcolorcodedstring_aspect

11 years agosend bytes instead of shorts in the vote dialog.
FruitieX [Wed, 7 Jul 2010 17:17:06 +0000 (20:17 +0300)]
send bytes instead of shorts in the vote dialog.

11 years agocl_gentle split into cl_gentle_gibs and cl_gentle_messages, cl_gentle left in as...
FruitieX [Wed, 7 Jul 2010 17:01:04 +0000 (20:01 +0300)]
cl_gentle split into cl_gentle_gibs and cl_gentle_messages, cl_gentle left in as a master switch for enabling both. Later on we could perhaps do cl_gentle_chat as well to filter out bad words

11 years agofix smooth moving/resizing to an always visible spot when dialog is open
FruitieX [Wed, 7 Jul 2010 13:12:59 +0000 (16:12 +0300)]
fix smooth moving/resizing to an always visible spot when dialog is open

11 years agomove user-preference cvars (that shouldnt be touched by skin configs) into defaultXon...
FruitieX [Wed, 7 Jul 2010 12:42:02 +0000 (15:42 +0300)]
move user-preference cvars (that shouldnt be touched by skin configs) into defaultXonotic.cfg, eg. timer showing elapsing time

11 years agoMerge branch 'master' into fruitiex/newpanelhud_stable
FruitieX [Wed, 7 Jul 2010 12:29:40 +0000 (15:29 +0300)]
Merge branch 'master' into fruitiex/newpanelhud_stable

11 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Wed, 7 Jul 2010 12:29:13 +0000 (15:29 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

11 years agoand score background. and dock. Now everything should fallback to default, so even...
FruitieX [Wed, 7 Jul 2010 12:25:24 +0000 (15:25 +0300)]
and score background. and dock. Now everything should fallback to default, so even entering hud_skin "blabla" doesn't show any notextures

11 years agosame thing for progressbars
FruitieX [Wed, 7 Jul 2010 12:20:55 +0000 (15:20 +0300)]
same thing for progressbars

11 years agofallback to a default border bg if specified one cant be found
FruitieX [Wed, 7 Jul 2010 12:14:52 +0000 (15:14 +0300)]
fallback to a default border bg if specified one cant be found

11 years agomore helpful infomessage in hud_configure mode, also dont allow any other info messag...
FruitieX [Wed, 7 Jul 2010 12:01:05 +0000 (15:01 +0300)]
more helpful infomessage in hud_configure mode, also dont allow any other info messages to show when configuring the hud (like spec)

11 years agofix onlycurrent mode of inventory panel
FruitieX [Tue, 6 Jul 2010 12:01:20 +0000 (15:01 +0300)]
fix onlycurrent mode of inventory panel

11 years agosmaller, less annoying complain bubble (also easy way to ensure it doesnt go off...
FruitieX [Tue, 6 Jul 2010 11:57:19 +0000 (14:57 +0300)]
smaller, less annoying complain bubble (also easy way to ensure it doesnt go off screen ;))

11 years agoadd some jitter to the beam length to make it look more electric :)
FruitieX [Mon, 5 Jul 2010 16:17:43 +0000 (19:17 +0300)]
add some jitter to the beam length to make it look more electric :)

11 years agonicer lightningun. Need beam to work in third person too, however :(
FruitieX [Mon, 5 Jul 2010 15:32:02 +0000 (18:32 +0300)]
nicer lightningun. Need beam to work in third person too, however :(

11 years agoUpdate models in bots.txt to use all available player models. I tried matching them...
Mircea Kitsune [Mon, 5 Jul 2010 11:21:03 +0000 (14:21 +0300)]
Update models in bots.txt to use all available player models. I tried matching them to the Nexuiz bots.txt (match Xonotic's models to the most similar models there) so their names colors and skills would still fit who they are.

11 years agochange order of layers in the vote window
FruitieX [Mon, 5 Jul 2010 11:00:57 +0000 (14:00 +0300)]
change order of layers in the vote window

11 years agouse fall.ogg name
Rudolf Polzer [Mon, 5 Jul 2010 06:14:11 +0000 (08:14 +0200)]
use fall.ogg name

11 years agoundo some buggy bugfixes - these need to be redone in a more working way:
Rudolf Polzer [Mon, 5 Jul 2010 06:08:26 +0000 (08:08 +0200)]
undo some buggy bugfixes - these need to be redone in a more working way:
- extendmatchtime: it should check for >= 0, not > 0
- QC code should not know about these aliases, as they are just that - aliases
- instead, maybe an alias-provided way should be provided for checking if a votable alias can be executed
- also fix a newly introduced spelling error

11 years agoMerge remote branch 'origin/terencehill/misc_bugfixes'
Rudolf Polzer [Mon, 5 Jul 2010 06:07:14 +0000 (08:07 +0200)]
Merge remote branch 'origin/terencehill/misc_bugfixes'

11 years agoremove and fix broken symlinks
Rudolf Polzer [Mon, 5 Jul 2010 06:05:11 +0000 (08:05 +0200)]
remove and fix broken symlinks

11 years agoCorrected typo in ignis description
PlasmaSheep [Mon, 5 Jul 2010 01:18:03 +0000 (18:18 -0700)]
Corrected typo in ignis description

11 years agoUmbra now uses radio woman voice
PlasmaSheep [Mon, 5 Jul 2010 01:08:55 +0000 (18:08 -0700)]
Umbra now uses radio woman voice

11 years agoNyx now uses radio woman voice
PlasmaSheep [Mon, 5 Jul 2010 01:08:38 +0000 (18:08 -0700)]
Nyx now uses radio woman voice

11 years agoSeraphina masked now uses radio woman voice
PlasmaSheep [Mon, 5 Jul 2010 01:07:08 +0000 (18:07 -0700)]
Seraphina masked now uses radio woman voice

11 years agoDrinking and developing don't mix, kids.
PlasmaSheep [Mon, 5 Jul 2010 01:06:14 +0000 (18:06 -0700)]
Drinking and developing don't mix, kids.

11 years agoignis masked is now using good voices that sound like he has a mask
PlasmaSheep [Mon, 5 Jul 2010 00:53:43 +0000 (17:53 -0700)]
ignis masked is now using good voices that sound like he has a mask

11 years agoWTF is with these improperly named files
PlasmaSheep [Mon, 5 Jul 2010 00:52:17 +0000 (17:52 -0700)]
WTF is with these improperly named files

11 years agotypo on ignis voices
PlasmaSheep [Mon, 5 Jul 2010 00:47:38 +0000 (17:47 -0700)]
typo on ignis voices

11 years agoAdded ignis halfmasked voices
PlasmaSheep [Mon, 5 Jul 2010 00:44:36 +0000 (17:44 -0700)]
Added ignis halfmasked voices

11 years agoAdded ignis voices - had to be old man voice for lack of an option, and because Fruti...
PlasmaSheep [Mon, 5 Jul 2010 00:41:13 +0000 (17:41 -0700)]
Added ignis voices - had to be old man voice for lack of an option, and because FrutieX said so :P

11 years agoOnly one fall...
PlasmaSheep [Mon, 5 Jul 2010 00:32:35 +0000 (17:32 -0700)]
Only one fall...

11 years agoAdded gak sounds for variations of gak (linked files)
PlasmaSheep [Sun, 4 Jul 2010 23:58:52 +0000 (16:58 -0700)]
Added gak sounds for variations of gak (linked files)

11 years agoAdded gak sounds
PlasmaSheep [Sun, 4 Jul 2010 23:49:32 +0000 (16:49 -0700)]
Added gak sounds

11 years agoOnly one fall
PlasmaSheep [Sun, 4 Jul 2010 23:48:03 +0000 (16:48 -0700)]
Only one fall

11 years agoFixed typo
PlasmaSheep [Sun, 4 Jul 2010 23:42:05 +0000 (16:42 -0700)]
Fixed typo

11 years agoAdded sounds for erebus
PlasmaSheep [Sun, 4 Jul 2010 23:35:45 +0000 (16:35 -0700)]
Added sounds for erebus

11 years agoagain, only one fall
PlasmaSheep [Sun, 4 Jul 2010 23:31:59 +0000 (16:31 -0700)]
again, only one fall

11 years agoMoved two files from ideas to coms, as they are actually being used
PlasmaSheep [Sun, 4 Jul 2010 23:26:59 +0000 (16:26 -0700)]
Moved two files from ideas to coms, as they are actually being used

11 years agoMerge branch 'master' into terencehill/misc_bugfixes
terencehill [Sun, 4 Jul 2010 23:08:29 +0000 (01:08 +0200)]
Merge branch 'master' into terencehill/misc_bugfixes

11 years agoIt's seenflag, not flagseen
PlasmaSheep [Sun, 4 Jul 2010 22:52:37 +0000 (15:52 -0700)]
It's seenflag, not flagseen