]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
FruitieX [Sun, 27 Jun 2010 13:24:16 +0000 (16:24 +0300)]
minimalistic wickedhud layout/config :)
FruitieX [Fri, 25 Jun 2010 18:19:27 +0000 (21:19 +0300)]
no more DrawXNum
FruitieX [Thu, 24 Jun 2010 19:15:34 +0000 (22:15 +0300)]
also disable dock if hud_dock is set to "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
PlasmaSheep [Wed, 23 Jun 2010 23:34:55 +0000 (16:34 -0700)]
Added teamkill icon
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.
FruitieX [Sun, 20 Jun 2010 09:57:34 +0000 (12:57 +0300)]
make score panel aspect independent... this can still be improved
FruitieX [Sat, 19 Jun 2010 19:48:58 +0000 (22:48 +0300)]
update hudsetup map path in menu code
FruitieX [Sat, 19 Jun 2010 17:30:03 +0000 (20:30 +0300)]
fix small typo, remove dead code
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
FruitieX [Fri, 18 Jun 2010 21:32:50 +0000 (00:32 +0300)]
woops fix silly bug with grid
FruitieX [Fri, 18 Jun 2010 21:20:16 +0000 (00:20 +0300)]
aspect-independent pressedkeys panel
FruitieX [Fri, 18 Jun 2010 20:41:18 +0000 (23:41 +0300)]
fix aspect on timer
FruitieX [Fri, 18 Jun 2010 20:11:59 +0000 (23:11 +0300)]
aspect fixing on engineinfo panel, broken_panel_cnt -= 1; :D
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)
FruitieX [Thu, 17 Jun 2010 16:23:17 +0000 (19:23 +0300)]
no aspect ratio forcing on dock
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
FruitieX [Thu, 17 Jun 2010 16:10:09 +0000 (19:10 +0300)]
drawpic_aspect wrapper for drawpic
FruitieX [Thu, 17 Jun 2010 15:40:08 +0000 (18:40 +0300)]
notify message fixes
FruitieX [Thu, 17 Jun 2010 13:16:48 +0000 (16:16 +0300)]
"ghost weapons" on the hud ;)
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
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
FruitieX [Thu, 17 Jun 2010 12:09:19 +0000 (15:09 +0300)]
update wickedhud_big, add new borders to wickedhud_default
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
FruitieX [Thu, 17 Jun 2010 11:04:47 +0000 (14:04 +0300)]
relative coordinates on grid
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!!!
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
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
FruitieX [Thu, 17 Jun 2010 10:05:34 +0000 (13:05 +0300)]
fix size capping to screen edges
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)
FruitieX [Thu, 17 Jun 2010 08:48:35 +0000 (11:48 +0300)]
Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/newpanelhud
Rudolf Polzer [Thu, 17 Jun 2010 07:40:34 +0000 (09:40 +0200)]
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
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
Rudolf Polzer [Thu, 17 Jun 2010 07:37:41 +0000 (09:37 +0200)]
auto-super.pl run
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.
Rudolf Polzer [Thu, 17 Jun 2010 07:17:39 +0000 (09:17 +0200)]
do not call destroy methods on the vtbls ;)
Rudolf Polzer [Thu, 17 Jun 2010 07:14:23 +0000 (09:14 +0200)]
also rename vtblClass to Class_vtbl
Rudolf Polzer [Thu, 17 Jun 2010 07:12:14 +0000 (09:12 +0200)]
make method names more standard: now Classname_method
Rudolf Polzer [Thu, 17 Jun 2010 07:02:51 +0000 (09:02 +0200)]
let's USE the super keyword! yay!
Rudolf Polzer [Thu, 17 Jun 2010 06:15:35 +0000 (08:15 +0200)]
let's add a super keyword
Rudolf Polzer [Thu, 17 Jun 2010 07:01:38 +0000 (09:01 +0200)]
another fix for wrong ENDCLASS
Rudolf Polzer [Thu, 17 Jun 2010 06:55:26 +0000 (08:55 +0200)]
minor ENDCLASS fixes
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.
terencehill [Wed, 16 Jun 2010 23:45:57 +0000 (01:45 +0200)]
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
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 .
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
FruitieX [Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)]
Merge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
FruitieX [Wed, 16 Jun 2010 21:29:45 +0000 (00:29 +0300)]
fix notify size limits hopefully
FruitieX [Wed, 16 Jun 2010 20:44:32 +0000 (23:44 +0300)]
fix dumb mistake, fix hurttrigger notification
FruitieX [Wed, 16 Jun 2010 20:32:55 +0000 (23:32 +0300)]
remove icon dupe
FruitieX [Wed, 16 Jun 2010 20:30:28 +0000 (23:30 +0300)]
code for the new icons, add some new placeholders too
Rudolf Polzer [Wed, 16 Jun 2010 18:58:04 +0000 (20:58 +0200)]
weaponpriority vs HUD fixes (a lot of them)
FruitieX [Wed, 16 Jun 2010 17:15:45 +0000 (20:15 +0300)]
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
FruitieX [Wed, 16 Jun 2010 17:09:13 +0000 (20:09 +0300)]
add Samual's beloved sv_fragmessages
FruitieX [Wed, 16 Jun 2010 13:28:19 +0000 (16:28 +0300)]
wickedhud beta4 gfx files
FruitieX [Tue, 15 Jun 2010 11:17:45 +0000 (14:17 +0300)]
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
FruitieX [Tue, 15 Jun 2010 11:17:16 +0000 (14:17 +0300)]
fix info message printing, branch should now be good for merge!
FruitieX [Tue, 15 Jun 2010 11:00:57 +0000 (14:00 +0300)]
Merge branch 'master' into fruitiex/newpanelhud_stable
Rudolf Polzer [Tue, 15 Jun 2010 10:05:40 +0000 (12:05 +0200)]
fix morphed's tree model
Rudolf Polzer [Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)]
Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'
Rudolf Polzer [Tue, 15 Jun 2010 09:05:17 +0000 (11:05 +0200)]
Merge remote branch 'refs/remotes/origin/morphed/uzi_texture'
Rudolf Polzer [Tue, 15 Jun 2010 09:01:45 +0000 (11:01 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fix_votemsg_decimals'
Morphed [Mon, 14 Jun 2010 23:46:56 +0000 (01:46 +0200)]
higher res texture for uzi
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
FruitieX [Mon, 14 Jun 2010 21:27:57 +0000 (00:27 +0300)]
initial work on messaging system through notify panel, THIS is not ready even for testing yet (known to be borked, need to see how the old hud did this)
FruitieX [Mon, 14 Jun 2010 20:28:31 +0000 (23:28 +0300)]
enable the quick update fps method by default, make it update even faster :P
FruitieX [Mon, 14 Jun 2010 20:04:09 +0000 (23:04 +0300)]
oh and disable it by default.
FruitieX [Mon, 14 Jun 2010 20:03:19 +0000 (23:03 +0300)]
new toys, new toys! CSQC-based FPS counter with way too many (and long) cvars!
Sahil Singhal [Mon, 14 Jun 2010 18:42:41 +0000 (14:42 -0400)]
Merge commit 'origin/master' into diabolik/erebusnyxplayermodel
FruitieX [Mon, 14 Jun 2010 18:08:44 +0000 (21:08 +0300)]
remix the wickedhud_small layout a bit, and make it default. Rename old default to "big". Also make some minor changes to the exporter that I noticed when copying the cvars over
FruitieX [Mon, 14 Jun 2010 17:10:20 +0000 (20:10 +0300)]
enable collision testing by default again, please test!
FruitieX [Mon, 14 Jun 2010 17:06:08 +0000 (20:06 +0300)]
fix bug mentioned in previous commit, now the only case where i see resizing fail is when you try to stretch a panel way past a point where it already collides
FruitieX [Mon, 14 Jun 2010 12:40:21 +0000 (15:40 +0300)]
resize mostly works in a sane way now, can almost enable by default. If bottom of panel A touches the top of panel B, and you try to resize panel A upwards it'll still fail a lot
FruitieX [Mon, 14 Jun 2010 07:22:48 +0000 (10:22 +0300)]
make some fixes to the race time and race modicon panels
FruitieX [Sun, 13 Jun 2010 22:06:03 +0000 (01:06 +0300)]
similar thing for chat panel (time slider)
FruitieX [Sun, 13 Jun 2010 21:27:11 +0000 (00:27 +0300)]
add (fade)time settings to notify dialog
FruitieX [Sun, 13 Jun 2010 21:06:20 +0000 (00:06 +0300)]
set smaller minalpha now
FruitieX [Sun, 13 Jun 2010 21:05:51 +0000 (00:05 +0300)]
do not force a minalpha on panels when the config dialog is up
FruitieX [Sun, 13 Jun 2010 20:35:49 +0000 (23:35 +0300)]
Merge remote branch 'origin/master' into fruitiex/newpanelhud
FruitieX [Sun, 13 Jun 2010 19:17:34 +0000 (22:17 +0300)]
update chat cvars to match new dp code
Rudolf Polzer [Sun, 13 Jun 2010 18:08:23 +0000 (20:08 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/seraphinaplayermodel'
Rudolf Polzer [Sun, 13 Jun 2010 18:02:45 +0000 (20:02 +0200)]
Merge remote branch 'refs/remotes/origin/diabolik/ignisplayermodel'
Rudolf Polzer [Sun, 13 Jun 2010 17:59:39 +0000 (19:59 +0200)]
the trivial movetypes do not have to match the server's ticrate as they are ticrate independent, saving some CPU cycles on csqc
NOTE: this assumption is only true if MOVETYPE_FLY projectiles detonate on impact. If they continue moving, we might still be ticrate dependent.
FruitieX [Sun, 13 Jun 2010 10:59:58 +0000 (13:59 +0300)]
fix a typo
FruitieX [Sun, 13 Jun 2010 10:55:08 +0000 (13:55 +0300)]
update minimum size on the chat panel so the simulated text never overlaps the panel boundaries - there's no wrapping around for drawcolorcodedstring
FruitieX [Sun, 13 Jun 2010 10:53:07 +0000 (13:53 +0300)]
fix div by zero
FruitieX [Sun, 13 Jun 2010 10:49:55 +0000 (13:49 +0300)]
fake the chat messages with drawcolorcodedstring() when in hud_configure mode so we dont have to spam the console (and can see the chat text if the menu is up)
FruitieX [Sun, 13 Jun 2010 10:41:57 +0000 (13:41 +0300)]
allow resizing the healtharmor panel in combined mode on x-axis as much as user wants to, add fuel bar to healtharmor panel in combined mode
FruitieX [Sun, 13 Jun 2010 10:33:33 +0000 (13:33 +0300)]
move/resize panels so they are always visible in panel the panel config dialog :)
FruitieX [Sun, 13 Jun 2010 09:20:30 +0000 (12:20 +0300)]
add progressbar to combined health/armor mode and do various other tweaks to it...
FruitieX [Sun, 13 Jun 2010 08:34:38 +0000 (11:34 +0300)]
fix fuel on healtharmor panel when mirror mode is on
Sahil Singhal [Sun, 13 Jun 2010 05:36:05 +0000 (01:36 -0400)]
Screenshots and txt. Ready for merge.
Sahil Singhal [Sun, 13 Jun 2010 05:35:44 +0000 (01:35 -0400)]
Merge commit 'origin/master' into diabolik/seraphinaplayermodel
Sahil Singhal [Sun, 13 Jun 2010 05:29:02 +0000 (01:29 -0400)]
Seraphinamasked completed as well.
Sahil Singhal [Sun, 13 Jun 2010 05:18:55 +0000 (01:18 -0400)]
Seraphina complete. TODO: Finish seraphina masked.
Sahil Singhal [Sun, 13 Jun 2010 02:23:02 +0000 (22:23 -0400)]
Put ignis(all 3) on ground and better screenshots for ignis(all 3), umbra, and pyria.
Sahil Singhal [Sun, 13 Jun 2010 01:39:26 +0000 (21:39 -0400)]
Add mirror to healtharmor panel.
Sahil Singhal [Sun, 13 Jun 2010 01:10:48 +0000 (21:10 -0400)]
Some radar dialog fixes.
Sahil Singhal [Sun, 13 Jun 2010 00:49:05 +0000 (20:49 -0400)]
Forgot to #include weaponicons.
Sahil Singhal [Sun, 13 Jun 2010 00:47:10 +0000 (20:47 -0400)]
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud