]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
14 years agoremove useless todo comment
FruitieX [Tue, 29 Jun 2010 01:12:59 +0000 (04:12 +0300)]
remove useless todo comment

14 years agocenter the icons/counts in powerups and h/a panels, and fix hud_healtharmor 2
FruitieX [Tue, 29 Jun 2010 01:11:59 +0000 (04:11 +0300)]
center the icons/counts in powerups and h/a panels, and fix hud_healtharmor 2

14 years agowow, why was there two GiveFrags() calls? No wonder you got -2 points when suiciding...
FruitieX [Tue, 29 Jun 2010 00:18:39 +0000 (03:18 +0300)]
wow, why was there two GiveFrags() calls? No wonder you got -2 points when suiciding...

14 years agoMerge branch 'master' into fruitiex/newpanelhud
FruitieX [Tue, 29 Jun 2010 00:13:40 +0000 (03:13 +0300)]
Merge branch 'master' into fruitiex/newpanelhud

14 years agosame thing for healtharmor. Current item aligning looks a bit ugly, should implement...
FruitieX [Tue, 29 Jun 2010 00:12:29 +0000 (03:12 +0300)]
same thing for healtharmor. Current item aligning looks a bit ugly, should implement something similar as in inventory panel.

14 years agouse drawstring in the powerup panel, do some cleanups
FruitieX [Mon, 28 Jun 2010 23:47:44 +0000 (02:47 +0300)]
use drawstring in the powerup panel, do some cleanups

14 years agomake the inventory panel aspect independent (and DrawXNum independent), comment all...
FruitieX [Mon, 28 Jun 2010 17:35:05 +0000 (20:35 +0300)]
make the inventory panel aspect independent (and DrawXNum independent), comment all other DrawXNum calls out to allow code to compile again (fix for these coming soon)

14 years agominimalistic wickedhud layout/config :)
FruitieX [Sun, 27 Jun 2010 13:24:16 +0000 (16:24 +0300)]
minimalistic wickedhud layout/config :)

14 years agono more DrawXNum
FruitieX [Fri, 25 Jun 2010 18:19:27 +0000 (21:19 +0300)]
no more DrawXNum

14 years agofix endless loops in Nex shots through recursive warpzones
Rudolf Polzer [Fri, 25 Jun 2010 11:00:57 +0000 (13:00 +0200)]
fix endless loops in Nex shots through recursive warpzones

14 years agomake trigger_warpzone_reconnect work, and give it the alias target_warpzone_reconnect
Rudolf Polzer [Fri, 25 Jun 2010 10:36:26 +0000 (12:36 +0200)]
make trigger_warpzone_reconnect work, and give it the alias target_warpzone_reconnect

14 years agofix a warpzone connection bug when using random warpzone arrangement
Rudolf Polzer [Fri, 25 Jun 2010 10:11:59 +0000 (12:11 +0200)]
fix a warpzone connection bug when using random warpzone arrangement

14 years agoalso disable dock if hud_dock is set to "0"
FruitieX [Thu, 24 Jun 2010 19:15:34 +0000 (22:15 +0300)]
also disable dock if hud_dock is set to "0"

14 years agoskip drawing progressbar (or any calculations belonging to that) if alpha is 0
FruitieX [Thu, 24 Jun 2010 19:14:23 +0000 (22:14 +0300)]
skip drawing progressbar (or any calculations belonging to that) if alpha is 0

14 years agomove shaderlist.txt into the individual dirs again now that we can
Rudolf Polzer [Thu, 24 Jun 2010 15:42:29 +0000 (17:42 +0200)]
move shaderlist.txt into the individual dirs again now that we can

14 years agowe no longer need loadfonts.cfg, just forgot to remove it from quake.rc too
Rudolf Polzer [Thu, 24 Jun 2010 12:43:26 +0000 (14:43 +0200)]
we no longer need loadfonts.cfg, just forgot to remove it from quake.rc too

14 years agoattempt at a camera fix
Rudolf Polzer [Thu, 24 Jun 2010 11:23:02 +0000 (13:23 +0200)]
attempt at a camera fix

14 years agoMerge remote branch 'refs/remotes/origin/diabolik/nexmodel'
Rudolf Polzer [Thu, 24 Jun 2010 08:10:12 +0000 (10:10 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/nexmodel'

14 years agonow PROPERLY apply draw_fontscale in TextWidth
Rudolf Polzer [Thu, 24 Jun 2010 08:04:33 +0000 (10:04 +0200)]
now PROPERLY apply draw_fontscale in TextWidth

14 years agoMerge commit 'origin/master' into diabolik/nexmodel
Sahil Singhal [Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)]
Merge commit 'origin/master' into diabolik/nexmodel

14 years agoAdded teamkill icon
PlasmaSheep [Wed, 23 Jun 2010 23:34:55 +0000 (16:34 -0700)]
Added teamkill icon

14 years agofix unban via rcon_restricted
Stephan Stahl [Wed, 23 Jun 2010 19:06:43 +0000 (21:06 +0200)]
fix unban via rcon_restricted

14 years agofix weapon count when sorting
Rudolf Polzer [Wed, 23 Jun 2010 13:07:02 +0000 (15:07 +0200)]
fix weapon count when sorting

14 years agomenu: fix lots of issues with font rendering
Rudolf Polzer [Wed, 23 Jun 2010 13:01:42 +0000 (15:01 +0200)]
menu: fix lots of issues with font rendering

14 years agolet's use a free font for now, even though it doesn't look totally good
Rudolf Polzer [Wed, 23 Jun 2010 10:57:35 +0000 (12:57 +0200)]
let's use a free font for now, even though it doesn't look totally good

14 years agoMerge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
Rudolf Polzer [Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'

14 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
Rudolf Polzer [Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'

14 years agoMerge remote branch 'refs/remotes/origin/diabolik/iqmmodelfix'
Rudolf Polzer [Wed, 23 Jun 2010 08:21:59 +0000 (10:21 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/iqmmodelfix'

14 years agoAdded icons for actions that are yet to be coded. Also changed all icons to my simple...
PlasmaSheep [Tue, 22 Jun 2010 23:34:51 +0000 (16:34 -0700)]
Added icons for actions that are yet to be coded. Also changed all icons to my simple icons.

14 years agoget rid of md5sum dependency
Rudolf Polzer [Tue, 22 Jun 2010 15:04:14 +0000 (17:04 +0200)]
get rid of md5sum dependency

14 years agoRevert most of the balance changes vs nexuiz 2.5 balance. Feel free to revert parts...
Rudolf Polzer [Tue, 22 Jun 2010 15:00:00 +0000 (17:00 +0200)]
Revert most of the balance changes vs nexuiz 2.5 balance. Feel free to revert parts of this commit, or to improve balance based on this - this is just to get rid of the worst problems.

14 years agofix text overlap issue in menu key binder
magorian [Tue, 22 Jun 2010 14:53:02 +0000 (16:53 +0200)]
fix text overlap issue in menu key binder

14 years agoadd autocvars.qh
Rudolf Polzer [Tue, 22 Jun 2010 13:28:31 +0000 (15:28 +0200)]
add autocvars.qh

14 years agotry to reduce calls to ArrayGet*weaponorder
Rudolf Polzer [Tue, 22 Jun 2010 12:34:28 +0000 (14:34 +0200)]
try to reduce calls to ArrayGet*weaponorder

14 years agomake score panel aspect independent... this can still be improved
FruitieX [Sun, 20 Jun 2010 09:57:34 +0000 (12:57 +0300)]
make score panel aspect independent... this can still be improved

14 years agoMerge remote branch 'origin/fruitiex/newpanelhud_stable'
Rudolf Polzer [Sat, 19 Jun 2010 19:51:27 +0000 (21:51 +0200)]
Merge remote branch 'origin/fruitiex/newpanelhud_stable'

14 years agoupdate hudsetup map path in menu code
FruitieX [Sat, 19 Jun 2010 19:48:58 +0000 (22:48 +0300)]
update hudsetup map path in menu code

14 years agoMerge branch 'fruitiex/newpanelhud_stable'
Rudolf Polzer [Sat, 19 Jun 2010 19:08:41 +0000 (21:08 +0200)]
Merge branch 'fruitiex/newpanelhud_stable'

14 years agofix small typo, remove dead code
FruitieX [Sat, 19 Jun 2010 17:30:03 +0000 (20:30 +0300)]
fix small typo, remove dead code

14 years agoremove unneccessary resize check, not needed anymore when there are no more aspect...
FruitieX [Fri, 18 Jun 2010 21:35:43 +0000 (00:35 +0300)]
remove unneccessary resize check, not needed anymore when there are no more aspect forced panels

14 years agowoops fix silly bug with grid
FruitieX [Fri, 18 Jun 2010 21:32:50 +0000 (00:32 +0300)]
woops fix silly bug with grid

14 years agoaspect-independent pressedkeys panel
FruitieX [Fri, 18 Jun 2010 21:20:16 +0000 (00:20 +0300)]
aspect-independent pressedkeys panel

14 years agofix aspect on timer
FruitieX [Fri, 18 Jun 2010 20:41:18 +0000 (23:41 +0300)]
fix aspect on timer

14 years agoaspect fixing on engineinfo panel, broken_panel_cnt -= 1; :D
FruitieX [Fri, 18 Jun 2010 20:11:59 +0000 (23:11 +0300)]
aspect fixing on engineinfo panel, broken_panel_cnt -= 1; :D

14 years agodrawpic_aspect wrapper function to always keep aspect, use this in most mods on modic...
FruitieX [Fri, 18 Jun 2010 20:07:42 +0000 (23:07 +0300)]
drawpic_aspect wrapper function to always keep aspect, use this in most mods on modicon panel (race is still WIP, since it needs that kind of stuff for drawstring/drawstring_expanding etc)

14 years agonumbered bots FIX
terencehill [Thu, 17 Jun 2010 18:34:50 +0000 (20:34 +0200)]
numbered bots FIX
- Bots were created already numbered (1) when the previous map ended cause of expired time.
- In the algorithm that determines the priority of bot name creation, check the field 'cleanname' instead of 'prefix + name + suffix', as the latter changes when the bot name gets numbered.

---
(Sorry, I meant include this (old) fix too in the previous commit, but I didn't realize I didn't...)

14 years agono aspect ratio forcing on dock
FruitieX [Thu, 17 Jun 2010 16:23:17 +0000 (19:23 +0300)]
no aspect ratio forcing on dock

14 years agoremove all aspect ratio forcing stuff from the resizing code. next step is to make...
FruitieX [Thu, 17 Jun 2010 16:18:24 +0000 (19:18 +0300)]
remove all aspect ratio forcing stuff from the resizing code. next step is to make all panels work at any aspect

14 years agodrawpic_aspect wrapper for drawpic
FruitieX [Thu, 17 Jun 2010 16:10:09 +0000 (19:10 +0300)]
drawpic_aspect wrapper for drawpic

14 years agonotify message fixes
FruitieX [Thu, 17 Jun 2010 15:40:08 +0000 (18:40 +0300)]
notify message fixes

14 years ago"ghost weapons" on the hud ;)
FruitieX [Thu, 17 Jun 2010 13:16:48 +0000 (16:16 +0300)]
"ghost weapons" on the hud ;)

14 years agojust draw the fps into full panel size on the engineinfo panel until we might get...
FruitieX [Thu, 17 Jun 2010 13:01:16 +0000 (16:01 +0300)]
just draw the fps into full panel size on the engineinfo panel until we might get more info there :P, make configs reflect this

14 years agoupdate the old hud to look even more like the old hud ;), also draw radar before...
FruitieX [Thu, 17 Jun 2010 12:53:18 +0000 (15:53 +0300)]
update the old hud to look even more like the old hud ;), also draw radar before all other panels as it makes sense to put it under other panels

14 years agoupdate wickedhud_big, add new borders to wickedhud_default
FruitieX [Thu, 17 Jun 2010 12:09:19 +0000 (15:09 +0300)]
update wickedhud_big, add new borders to wickedhud_default

14 years agoedit wickedhud_default to match grid, rearrange layout a bit to make the notify panel...
FruitieX [Thu, 17 Jun 2010 11:56:32 +0000 (14:56 +0300)]
edit wickedhud_default to match grid, rearrange layout a bit to make the notify panel bigger

14 years agorelative coordinates on grid
FruitieX [Thu, 17 Jun 2010 11:04:47 +0000 (14:04 +0300)]
relative coordinates on grid

14 years agoremove the "feature" which made coordinates bigger than "0.5 0.5" negative from lower...
FruitieX [Thu, 17 Jun 2010 10:45:39 +0000 (13:45 +0300)]
remove the "feature" which made coordinates bigger than "0.5 0.5" negative from lower right corner, not needed anymore now that we have relative coordinates. WARNING: THIS WILL BREAK _ALL_ CONFIGS, PLEASE RE-EXEC hud_wickedhud_default.cfg!!!

14 years agodon't even check for collisions against target panel if our resizerorigin is within it
FruitieX [Thu, 17 Jun 2010 10:16:12 +0000 (13:16 +0300)]
don't even check for collisions against target panel if our resizerorigin is within it

14 years agoadd a failsafe to resizing so that panels can NEVER be resized to a negative size...
FruitieX [Thu, 17 Jun 2010 10:09:30 +0000 (13:09 +0300)]
add a failsafe to resizing so that panels can NEVER be resized to a negative size by code, happens if panel is inside another panel, and resizeorigin is also inside that panel

14 years agofix size capping to screen edges
FruitieX [Thu, 17 Jun 2010 10:05:34 +0000 (13:05 +0300)]
fix size capping to screen edges

14 years agoterencehill's resizecheck algoritihm. This makes resizing a lot smoother. Fix resizin...
FruitieX [Thu, 17 Jun 2010 08:54:59 +0000 (11:54 +0300)]
terencehill's resizecheck algoritihm. This makes resizing a lot smoother. Fix resizing when panel touches another panel and you resize from that panel's other side. This still fails when the grid is on, but that probably means the grid fails (moves the panel slightly inside another panel for some reason)

14 years agoMerge remote branch 'origin/terencehill/newpanelhud' into fruitiex/newpanelhud
FruitieX [Thu, 17 Jun 2010 08:48:35 +0000 (11:48 +0300)]
Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/newpanelhud

14 years agoMerge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
Rudolf Polzer [Thu, 17 Jun 2010 07:40:34 +0000 (09:40 +0200)]
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud

14 years agoMerge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_s...
Rudolf Polzer [Thu, 17 Jun 2010 07:38:43 +0000 (09:38 +0200)]
Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_stable

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c

14 years agoauto-super.pl run
Rudolf Polzer [Thu, 17 Jun 2010 07:37:41 +0000 (09:37 +0200)]
auto-super.pl run

14 years agoa tiny fix for auto-super.pl
Rudolf Polzer [Thu, 17 Jun 2010 07:35:10 +0000 (09:35 +0200)]
a tiny fix for auto-super.pl

Procedure to merge this branch into a branch with menuqc changes:

git fetch
git merge origin/master
git checkout origin/divVerent/menu-imprOOvements -- auto-super.pl
find . -type f -print0 | xargs -0 perl auto-super.pl
git commit -a
git merge origin/divVerent/menu-imprOOvements

The intermediate commit and auto-super.pl run is to prepare the menu code for the merge to reduce merge conflicts or compile errors in newly added files.

14 years agodo not call destroy methods on the vtbls ;)
Rudolf Polzer [Thu, 17 Jun 2010 07:17:39 +0000 (09:17 +0200)]
do not call destroy methods on the vtbls ;)

14 years agoalso rename vtblClass to Class_vtbl
Rudolf Polzer [Thu, 17 Jun 2010 07:14:23 +0000 (09:14 +0200)]
also rename vtblClass to Class_vtbl

14 years agomake method names more standard: now Classname_method
Rudolf Polzer [Thu, 17 Jun 2010 07:12:14 +0000 (09:12 +0200)]
make method names more standard: now Classname_method

14 years agolet's USE the super keyword! yay!
Rudolf Polzer [Thu, 17 Jun 2010 07:02:51 +0000 (09:02 +0200)]
let's USE the super keyword! yay!

14 years agolet's add a super keyword
Rudolf Polzer [Thu, 17 Jun 2010 06:15:35 +0000 (08:15 +0200)]
let's add a super keyword

14 years agoanother fix for wrong ENDCLASS
Rudolf Polzer [Thu, 17 Jun 2010 07:01:38 +0000 (09:01 +0200)]
another fix for wrong ENDCLASS

14 years agominor ENDCLASS fixes
Rudolf Polzer [Thu, 17 Jun 2010 06:55:26 +0000 (08:55 +0200)]
minor ENDCLASS fixes

14 years agoImplemented new collisions check algorithm when resizing, it seems working well on...
terencehill [Thu, 17 Jun 2010 00:22:40 +0000 (02:22 +0200)]
Implemented new collisions check algorithm when resizing, it seems working well on every situation.
Modified the panel aspect ratio handling too, it was causing troubles.

Added a temporary debug mode hud_configure_checkcollisions_debug only to highlight bad behavior during the execution, there could be minor bugs to fix.

14 years agoMerge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
terencehill [Wed, 16 Jun 2010 23:45:57 +0000 (01:45 +0200)]
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud

14 years agoRevert "Snap panel to the central vertical/horizontal axis if enough close"
terencehill [Wed, 16 Jun 2010 23:09:12 +0000 (01:09 +0200)]
Revert "Snap panel to the central vertical/horizontal axis if enough close"

This reverts commit d75681bd6b453b17da410aaeea66213af2c5ce1b.

14 years agoreally fix notify resizing now, also move the default skin cvars from defaultXonotic...
FruitieX [Wed, 16 Jun 2010 21:46:55 +0000 (00:46 +0300)]
really fix notify resizing now, also move the default skin cvars from defaultXonotic.cfg into hud_wickedhud_default.cfg

14 years agoMerge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
FruitieX [Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)]
Merge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud

14 years agofix notify size limits hopefully
FruitieX [Wed, 16 Jun 2010 21:29:45 +0000 (00:29 +0300)]
fix notify size limits hopefully

14 years agofix dumb mistake, fix hurttrigger notification
FruitieX [Wed, 16 Jun 2010 20:44:32 +0000 (23:44 +0300)]
fix dumb mistake, fix hurttrigger notification

14 years agoremove icon dupe
FruitieX [Wed, 16 Jun 2010 20:32:55 +0000 (23:32 +0300)]
remove icon dupe

14 years agocode for the new icons, add some new placeholders too
FruitieX [Wed, 16 Jun 2010 20:30:28 +0000 (23:30 +0300)]
code for the new icons, add some new placeholders too

14 years agoIQMs fixed with latest exporter.
Sahil Singhal [Wed, 16 Jun 2010 19:53:43 +0000 (15:53 -0400)]
IQMs fixed with latest exporter.

14 years agoFix alpha and consistent quality/position for screenshots.
Sahil Singhal [Wed, 16 Jun 2010 19:22:23 +0000 (15:22 -0400)]
Fix alpha and consistent quality/position for screenshots.

14 years agoweaponpriority vs HUD fixes (a lot of them)
Rudolf Polzer [Wed, 16 Jun 2010 18:58:04 +0000 (20:58 +0200)]
weaponpriority vs HUD fixes (a lot of them)

14 years agoMerge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
FruitieX [Wed, 16 Jun 2010 17:15:45 +0000 (20:15 +0300)]
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud

14 years agoadd Samual's beloved sv_fragmessages
FruitieX [Wed, 16 Jun 2010 17:09:13 +0000 (20:09 +0300)]
add Samual's beloved sv_fragmessages

14 years agowickedhud beta4 gfx files
FruitieX [Wed, 16 Jun 2010 13:28:19 +0000 (16:28 +0300)]
wickedhud beta4 gfx files

14 years agoNex ready for merge. g_ model may be positioned badly. Hard to tell.
Sahil Singhal [Tue, 15 Jun 2010 20:32:55 +0000 (16:32 -0400)]
Nex ready for merge. g_ model may be positioned badly. Hard to tell.

14 years agoMerge commit 'origin/master' into diabolik/nexmodel
Sahil Singhal [Tue, 15 Jun 2010 19:04:36 +0000 (15:04 -0400)]
Merge commit 'origin/master' into diabolik/nexmodel

14 years agoMerge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Tue, 15 Jun 2010 11:17:45 +0000 (14:17 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable

14 years agofix info message printing, branch should now be good for merge!
FruitieX [Tue, 15 Jun 2010 11:17:16 +0000 (14:17 +0300)]
fix info message printing, branch should now be good for merge!

14 years agoMerge branch 'master' into fruitiex/newpanelhud_stable
FruitieX [Tue, 15 Jun 2010 11:00:57 +0000 (14:00 +0300)]
Merge branch 'master' into fruitiex/newpanelhud_stable

14 years agofix morphed's tree model
Rudolf Polzer [Tue, 15 Jun 2010 10:05:40 +0000 (12:05 +0200)]
fix morphed's tree model

14 years agoMerge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'
Rudolf Polzer [Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'

14 years agoMerge remote branch 'refs/remotes/origin/morphed/uzi_texture'
Rudolf Polzer [Tue, 15 Jun 2010 09:05:17 +0000 (11:05 +0200)]
Merge remote branch 'refs/remotes/origin/morphed/uzi_texture'

14 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fix_votemsg_decimals'
Rudolf Polzer [Tue, 15 Jun 2010 09:01:45 +0000 (11:01 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fix_votemsg_decimals'

14 years agohigher res texture for uzi
Morphed [Mon, 14 Jun 2010 23:46:56 +0000 (01:46 +0200)]
higher res texture for uzi

14 years agoceil() the number of the "you have to wait X seconds before you can again call a...
FruitieX [Mon, 14 Jun 2010 21:36:57 +0000 (00:36 +0300)]
ceil() the number of the "you have to wait X seconds before you can again call a vote" message, looked silly with that many decimals

14 years agoAdd the old high-res weapons skins back, after a discussion on IRC where several...
Mircea Kitsune [Mon, 14 Jun 2010 21:28:21 +0000 (00:28 +0300)]
Add the old high-res weapons skins back, after a discussion on IRC where several people agreed to this. Looks much better, and I'm not seeing any noticeable increase in loading time.