]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoPossibly fix issue with old weapon names and target_items
Mario [Sat, 31 Jan 2015 02:40:58 +0000 (13:40 +1100)]
Possibly fix issue with old weapon names and target_items

9 years agoMake Luma the default HUD and menu theme
Mario [Fri, 30 Jan 2015 10:27:59 +0000 (21:27 +1100)]
Make Luma the default HUD and menu theme

9 years agoMerge branch 'sev/luma_supplement' into 'master'
Mario [Fri, 30 Jan 2015 10:26:16 +0000 (10:26 +0000)]
Merge branch 'sev/luma_supplement' into 'master'

Luma Supplement

This branch adds Luma (!76) variants of the chatbubble and the teambubble.
The current images will be replaced, hence the separate branch.

See merge request !87

9 years agoMerge branch 'sev/luma' into 'master'
Mario [Fri, 30 Jan 2015 10:07:24 +0000 (10:07 +0000)]
Merge branch 'sev/luma' into 'master'

Luma

I think Luma is ready for a review.

This branch adds the Luma themes for the menu, HUD, and simple items.
These themes are independent, the branch does not alter existing files.

Menu
http://i.imgur.com/EfugxYq.png
http://i.imgur.com/EgOyW74.png

HUD
http://i.imgur.com/7t3O2CB.png

Simple items
http://i.imgur.com/zxCMCUZ.png

See merge request !76

9 years agoMerge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into kickban...
Mattia Basaglia [Fri, 30 Jan 2015 09:47:27 +0000 (10:47 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into kickban-unconnected-v2

9 years agoFix Uncrustify problem areas
TimePath [Fri, 30 Jan 2015 08:22:59 +0000 (19:22 +1100)]
Fix Uncrustify problem areas

9 years agoRemove for-loop workaround
TimePath [Fri, 30 Jan 2015 05:09:41 +0000 (16:09 +1100)]
Remove for-loop workaround

9 years agoUpdate uncrustify.cfg
TimePath [Fri, 30 Jan 2015 03:45:37 +0000 (14:45 +1100)]
Update uncrustify.cfg

9 years agoFix whitespace for #include
TimePath [Thu, 29 Jan 2015 23:29:58 +0000 (10:29 +1100)]
Fix whitespace for #include

9 years agoDeclare more ints as ints
TimePath [Thu, 29 Jan 2015 23:09:25 +0000 (10:09 +1100)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Thu, 29 Jan 2015 10:35:33 +0000 (21:35 +1100)]
Declare more ints as ints

9 years agoReplace more `vector_[xyz]` with `vector.[xyz]`
TimePath [Thu, 29 Jan 2015 08:47:53 +0000 (19:47 +1100)]
Replace more `vector_[xyz]` with `vector.[xyz]`

9 years agoDeclare more ints as ints
TimePath [Thu, 29 Jan 2015 07:41:08 +0000 (18:41 +1100)]
Declare more ints as ints

9 years agoClean up SVQC #includes
TimePath [Thu, 29 Jan 2015 06:17:16 +0000 (17:17 +1100)]
Clean up SVQC #includes

9 years agoClean up MENUQC #includes
TimePath [Thu, 29 Jan 2015 03:44:56 +0000 (14:44 +1100)]
Clean up MENUQC #includes

9 years agoClean up CSQC #includes
TimePath [Thu, 29 Jan 2015 03:07:19 +0000 (14:07 +1100)]
Clean up CSQC #includes

9 years agoRemove pre/post includes
TimePath [Thu, 29 Jan 2015 01:01:07 +0000 (12:01 +1100)]
Remove pre/post includes

9 years agoRemove includes from most headers
TimePath [Thu, 29 Jan 2015 00:50:34 +0000 (11:50 +1100)]
Remove includes from most headers

9 years agoRename defs to qh
TimePath [Thu, 29 Jan 2015 00:22:19 +0000 (11:22 +1100)]
Rename defs to qh

9 years ago#include this
TimePath [Thu, 29 Jan 2015 00:12:02 +0000 (11:12 +1100)]
#include this
Initial move to #include
TODO: remove unused includes

9 years agoRemove `-Wno-double-declaration`
TimePath [Wed, 28 Jan 2015 00:08:39 +0000 (11:08 +1100)]
Remove `-Wno-double-declaration`

9 years agoDeclare more ints as ints
TimePath [Tue, 27 Jan 2015 22:10:55 +0000 (09:10 +1100)]
Declare more ints as ints

9 years agoRevert a deleted `#define`
TimePath [Mon, 26 Jan 2015 09:10:42 +0000 (20:10 +1100)]
Revert a deleted `#define`

9 years agoCheck features, not compilers
TimePath [Mon, 26 Jan 2015 08:56:51 +0000 (19:56 +1100)]
Check features, not compilers

9 years agoClean up macros
TimePath [Mon, 26 Jan 2015 08:51:39 +0000 (19:51 +1100)]
Clean up macros

9 years agoRemove redundant uses of `var`
TimePath [Mon, 26 Jan 2015 07:59:39 +0000 (18:59 +1100)]
Remove redundant uses of `var`

9 years agoClean up macro hell
TimePath [Mon, 26 Jan 2015 07:41:06 +0000 (18:41 +1100)]
Clean up macro hell

9 years agoDeclare more ints as ints
TimePath [Mon, 26 Jan 2015 00:28:05 +0000 (11:28 +1100)]
Declare more ints as ints

9 years agoPut formula to calculate row count into its own function
terencehill [Sun, 25 Jan 2015 23:52:27 +0000 (00:52 +0100)]
Put formula to calculate row count into its own function

9 years agoUnify boolean constants
TimePath [Sun, 25 Jan 2015 23:48:07 +0000 (10:48 +1100)]
Unify boolean constants
TRUE -> true
FALSE -> false

9 years agoImprove distribution of the icons and therefore use of the available space in the...
terencehill [Sun, 25 Jan 2015 18:25:32 +0000 (19:25 +0100)]
Improve distribution of the icons and therefore use of the available space in the simplest way

9 years agoReplace `vector_[xyz]` with `vector.[xyz]` where possible
TimePath [Sun, 25 Jan 2015 11:27:23 +0000 (22:27 +1100)]
Replace `vector_[xyz]` with `vector.[xyz]` where possible

9 years agoAdd mod icons for instagib (will remove the old MinstaGib icons in 0.8.1)
Mario [Sun, 25 Jan 2015 07:04:01 +0000 (18:04 +1100)]
Add mod icons for instagib (will remove the old MinstaGib icons in 0.8.1)

9 years agoWork around a gmqcc bug
TimePath [Sun, 25 Jan 2015 04:26:33 +0000 (15:26 +1100)]
Work around a gmqcc bug

9 years agoRename menu files to be consistent
TimePath [Sun, 25 Jan 2015 04:02:50 +0000 (15:02 +1100)]
Rename menu files to be consistent
*.h -> *.qh
*.c -> *.qc

9 years agoDelete empty files
TimePath [Sun, 25 Jan 2015 03:44:56 +0000 (14:44 +1100)]
Delete empty files

9 years agoRemove some `#ifdef GMQCC` conditionals
TimePath [Sun, 25 Jan 2015 03:41:51 +0000 (14:41 +1100)]
Remove some `#ifdef GMQCC` conditionals

9 years agoKill uses of `local` and `noref`
TimePath [Sun, 25 Jan 2015 03:33:33 +0000 (14:33 +1100)]
Kill uses of `local` and `noref`

9 years agoDeclare more ints as ints
TimePath [Sun, 25 Jan 2015 03:19:06 +0000 (14:19 +1100)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Sun, 25 Jan 2015 01:19:14 +0000 (12:19 +1100)]
Declare more ints as ints

9 years agoMerge branch 'sev/more_crosshairs' into 'master'
Mario [Sat, 24 Jan 2015 23:47:58 +0000 (23:47 +0000)]
Merge branch 'sev/more_crosshairs' into 'master'

A few additional crosshairs

This is more a merge suggestion than a request (sorry for the recent avalanche).

Some time ago I created a few crosshairs that I feel are missing in the default set:
simple traditional design, unobtrusive, high-contrast.

Now I've noticed that the new menu has an empty row in the crosshair settings.

Add one and one together and you get this branch.

![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/14dc267bef/crosshairs.png)

See merge request !94

9 years agoReduce scope of some variables
terencehill [Sat, 24 Jan 2015 23:26:35 +0000 (00:26 +0100)]
Reduce scope of some variables

9 years agoAdd an explicative comment
terencehill [Sat, 24 Jan 2015 23:18:39 +0000 (00:18 +0100)]
Add an explicative comment

9 years agoRevert "Improve the distribution of icons in the HUD weapons panel" as the previous...
terencehill [Sat, 24 Jan 2015 21:35:17 +0000 (22:35 +0100)]
Revert "Improve the distribution of icons in the HUD weapons panel" as the previous code worked that way in order to use the same weapon icon size (and the same layout) even when hud_panel_weapons_onlyowned is set to 1

This reverts commit c4fb6d591478d37e1957d0beec6137887ef05569.

9 years agoAdd a new row of traditional, unobtrusive, high-contrast crosshairs to the crosshair...
Severin Meyer [Sat, 24 Jan 2015 18:11:56 +0000 (19:11 +0100)]
Add a new row of traditional, unobtrusive, high-contrast crosshairs to the crosshair settings

9 years agoBegin fixing the monster (only 700 more lines to go, yay)
Mario [Sat, 24 Jan 2015 11:32:53 +0000 (22:32 +1100)]
Begin fixing the monster (only 700 more lines to go, yay)

9 years agoDeclare more ints as ints
TimePath [Sat, 24 Jan 2015 11:01:58 +0000 (22:01 +1100)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Sat, 24 Jan 2015 10:51:09 +0000 (21:51 +1100)]
Declare more ints as ints

9 years agoFix some more things
Mario [Sat, 24 Jan 2015 10:42:24 +0000 (21:42 +1100)]
Fix some more things

9 years agoFix some cases of noref
Mario [Sat, 24 Jan 2015 10:20:18 +0000 (21:20 +1100)]
Fix some cases of noref

9 years agoRemove some cases of local noref
Mario [Sat, 24 Jan 2015 10:17:00 +0000 (21:17 +1100)]
Remove some cases of local noref

9 years agoWhy wasn't this done in the first place, instead of blaming the compiler...
Mario [Sat, 24 Jan 2015 10:13:34 +0000 (21:13 +1100)]
Why wasn't this done in the first place, instead of blaming the compiler...

9 years agoMake TRUE and FALSE booleans
Mario [Sat, 24 Jan 2015 08:46:03 +0000 (19:46 +1100)]
Make TRUE and FALSE booleans

9 years agoMerge remote-tracking branch 'origin/Mario/qc_updates' into Mario/qc_updates
TimePath [Sat, 24 Jan 2015 08:42:29 +0000 (19:42 +1100)]
Merge remote-tracking branch 'origin/Mario/qc_updates' into Mario/qc_updates

9 years agoDeclare ints as ints
TimePath [Sat, 24 Jan 2015 08:26:47 +0000 (19:26 +1100)]
Declare ints as ints

9 years agoFix compile and add more fun
Mario [Sat, 24 Jan 2015 08:35:38 +0000 (19:35 +1100)]
Fix compile and add more fun

9 years agoMore fun stuff
Mario [Sat, 24 Jan 2015 08:29:38 +0000 (19:29 +1100)]
More fun stuff

9 years agoFigured out why it crashed, time to fix the other leaks
Mario [Sat, 24 Jan 2015 07:47:09 +0000 (18:47 +1100)]
Figured out why it crashed, time to fix the other leaks

9 years agoFix a weird crash (hoping there aren't any more of these, looks like a very specific...
Mario [Sat, 24 Jan 2015 07:43:39 +0000 (18:43 +1100)]
Fix a weird crash (hoping there aren't any more of these, looks like a very specific function causing issues)

9 years agoTurn #define'd constants into actual constants
Mario [Sat, 24 Jan 2015 07:05:57 +0000 (18:05 +1100)]
Turn #define'd constants into actual constants

9 years agoCan only hope there's no mistakes in this
Mario [Sat, 24 Jan 2015 05:06:35 +0000 (16:06 +1100)]
Can only hope there's no mistakes in this

9 years agoNot much to do in announcer.qc
Mario [Sat, 24 Jan 2015 04:03:02 +0000 (15:03 +1100)]
Not much to do in announcer.qc

9 years agoClient projectiles
Mario [Sat, 24 Jan 2015 04:01:19 +0000 (15:01 +1100)]
Client projectiles

9 years agoFix compile
Mario [Sat, 24 Jan 2015 03:57:58 +0000 (14:57 +1100)]
Fix compile

9 years agoIntegerize client's vehicles.qc
Mario [Sat, 24 Jan 2015 03:57:15 +0000 (14:57 +1100)]
Integerize client's vehicles.qc

9 years agoAlso do functions
Mario [Sat, 24 Jan 2015 03:49:57 +0000 (14:49 +1100)]
Also do functions

9 years agocl_cmd.qc
Mario [Sat, 24 Jan 2015 03:48:41 +0000 (14:48 +1100)]
cl_cmd.qc

9 years agoOne file down, a few hundred to go
Mario [Sat, 24 Jan 2015 03:37:51 +0000 (14:37 +1100)]
One file down, a few hundred to go

9 years agoMerge branch 'sev/menu_sounds_reimplementation' into 'master'
Mario [Sat, 24 Jan 2015 03:24:04 +0000 (03:24 +0000)]
Merge branch 'sev/menu_sounds_reimplementation' into 'master'

Menu sounds reimplementation

This branch reimplements the menu sounds. It now plays different soundfiles for the following events:

OPEN: opening dialog
CLOSE: closing dialog
FOCUS: moving focus to new item
EXECUTE: pressing button, enter key, or double click
SELECT: using checkbox, radiobutton, or similar
SLIDE: using slider or colorpicker
CLEAR: clearing inputbox or keybind
WINNER: winning single player campaign

The soundfiles are moved into the dedicated directory *data/sound/menu*.

Unfortunately, I can't provide new soundfiles, since I have no experience with sound production,
so I've reused the legacy sounds or added placeholders.
However, I still think it is useful to merge this branch now,
because it improves the way that the sounds are played:

- It greatly reduces the "Geiger counter" effect of the focus sound when the cursor quickly moves across several items
- The focus sound plays for all interactive elements, e.g. also for the inputbox
- The execute (button) sound also plays for double clicks, e.g. in the gametypelist
- The audio settings tab gets a second checkbox to independently toggle focus sounds

See merge request !93

9 years agoRemove newlines from menu sounds README file
Severin Meyer [Sat, 24 Jan 2015 02:06:50 +0000 (03:06 +0100)]
Remove newlines from menu sounds README file

9 years agoMerge branch 'Mario/wep_settemp_fix'
Mario [Sat, 24 Jan 2015 01:55:46 +0000 (12:55 +1100)]
Merge branch 'Mario/wep_settemp_fix'

9 years agoAdd a hack to fix mapinfo weaponstart settemps not working
Mario [Sat, 24 Jan 2015 01:38:09 +0000 (12:38 +1100)]
Add a hack to fix mapinfo weaponstart settemps not working

9 years agoUpdates
Mirio [Sat, 24 Jan 2015 00:52:01 +0000 (01:52 +0100)]
Updates

9 years agoMerge branch 'master' into terencehill/menu_optimizations
terencehill [Sat, 24 Jan 2015 00:27:31 +0000 (01:27 +0100)]
Merge branch 'master' into terencehill/menu_optimizations

9 years agoRename legacy menu soundfiles and add placeholder files
Severin Meyer [Sat, 24 Jan 2015 00:00:53 +0000 (01:00 +0100)]
Rename legacy menu soundfiles and add placeholder files

9 years agoAdd focus sound to menu sound constants
Severin Meyer [Fri, 23 Jan 2015 23:55:25 +0000 (00:55 +0100)]
Add focus sound to menu sound constants

9 years agoDisable focus sound for the playerlist, because it is not an interactive item
Severin Meyer [Fri, 23 Jan 2015 21:38:57 +0000 (22:38 +0100)]
Disable focus sound for the playerlist, because it is not an interactive item

9 years agoAdd a checkbox to the audio settings to toggle focus sounds
Severin Meyer [Fri, 23 Jan 2015 21:36:10 +0000 (22:36 +0100)]
Add a checkbox to the audio settings to toggle focus sounds

9 years agoPlay bonus sound when the winner dialog is opened
Severin Meyer [Fri, 23 Jan 2015 21:22:16 +0000 (22:22 +0100)]
Play bonus sound when the winner dialog is opened

9 years agoPlay OPEN/CLOSE sound when opening/closing dialog
Severin Meyer [Fri, 23 Jan 2015 21:19:01 +0000 (22:19 +0100)]
Play OPEN/CLOSE sound when opening/closing dialog

9 years agoPlay sounds when chosing or executing a listbox item changes the menu state
Severin Meyer [Fri, 23 Jan 2015 20:05:11 +0000 (21:05 +0100)]
Play sounds when chosing or executing a listbox item changes the menu state

9 years agoPlay CLEAR sound when using inputbox clearbutton, also remove unnecessary InputBox_Cl...
Severin Meyer [Fri, 23 Jan 2015 19:31:59 +0000 (20:31 +0100)]
Play CLEAR sound when using inputbox clearbutton, also remove unnecessary InputBox_Clear_Click function

9 years agoPlay SLIDE sound when using slider or colorpicker
Severin Meyer [Fri, 23 Jan 2015 19:27:47 +0000 (20:27 +0100)]
Play SLIDE sound when using slider or colorpicker

9 years agoPlay SELECT sound when using checkbox or its subtypes
Severin Meyer [Fri, 23 Jan 2015 19:20:32 +0000 (20:20 +0100)]
Play SELECT sound when using checkbox or its subtypes

9 years agoRevise button sound
Severin Meyer [Fri, 23 Jan 2015 19:18:10 +0000 (20:18 +0100)]
Revise button sound

9 years agoRevise focus sound, use a time guard to prevent "Geiger counter" effect
Severin Meyer [Fri, 23 Jan 2015 18:05:11 +0000 (19:05 +0100)]
Revise focus sound, use a time guard to prevent "Geiger counter" effect

9 years agoUse loop macro in Ban_Enforce 83/head 91/head
Mattia Basaglia [Fri, 23 Jan 2015 15:15:28 +0000 (16:15 +0100)]
Use loop macro in Ban_Enforce

9 years agoLet's not make them macros
Mario [Fri, 23 Jan 2015 05:11:20 +0000 (16:11 +1100)]
Let's not make them macros

9 years agoMove TRUE and FALSE definitions to util-pre.qh and hide them under a definition check...
Mario [Fri, 23 Jan 2015 05:08:11 +0000 (16:08 +1100)]
Move TRUE and FALSE definitions to util-pre.qh and hide them under a definition check for bool support

9 years agoMerge branch 'sev/hud_weapon_panel' into 'master'
Mario [Fri, 23 Jan 2015 01:44:17 +0000 (01:44 +0000)]
Merge branch 'sev/hud_weapon_panel' into 'master'

A few HUD weapon panel improvements

Currently, the HUD weapon panel distributes the weapon icons very akwardly. The scaling is especially off when arranged vertically, sometimes leaving a gap on either side. So I've made to following changes:

- Reimplemented the distribution of the icons to better use the available space, and to be more predictable.
- Added a new cvar *hud_panel_weapons_label_scale*, to change the label size.
- Lastly, I've tightened up the HUD editor selection border for all panels, to more closely resemble the selection border in editors like GIMP or Inkscape.

![hud_weapons_v](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/0c951a653d/hud_weapons_v.png)

![hud_weapons_h](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/e494180790/hud_weapons_h.png)

See merge request !85

9 years agoMerge branch 'sev/menu_play_char' into 'master'
Mario [Fri, 23 Jan 2015 01:42:09 +0000 (01:42 +0000)]
Merge branch 'sev/menu_play_char' into 'master'

Two small menu fixes

Use Unicode character for the playlist play symbol.
Same character as used for the >>> downloading sign on the scoreboard.

*Edit*
I've added another small bugfix to this MR.

See merge request !86

9 years agoMerge branch 'terencehill/cvar_updates' into 'master'
Mario [Fri, 23 Jan 2015 01:37:37 +0000 (01:37 +0000)]
Merge branch 'terencehill/cvar_updates' into 'master'

Terencehill/cvar updates

cvar updates

See merge request !82

9 years agoMerge branch 'terencehill/ready_restart_tweaks' into 'master'
Mario [Fri, 23 Jan 2015 01:34:35 +0000 (01:34 +0000)]
Merge branch 'terencehill/ready_restart_tweaks' into 'master'

Terencehill/ready restart tweaks

Improve behaviour when sv_ready_restart and sv_ready_restart_after_countdown are enabled:

* Don't play "Prepare for battle" announcement twice in games made of rounds

* Block players while the countdown to game start is going even if sv_ready_restart_after_countdown is enabled
This is to avoid that a player roaming in the map gets confused by the sudden respawn when the game begins; it also helps to more clearly separate pre-game time from pre-round time (in the latter players are allowed to move depending on the game mode, e.g. CA allows it, FT doesn't)

See merge request !88

9 years agoMerge branch 'sev/menu_listbox_doubleclick'
Mario [Fri, 23 Jan 2015 01:31:09 +0000 (12:31 +1100)]
Merge branch 'sev/menu_listbox_doubleclick'

9 years agoFix minus key bug in the weaponslist
Severin Meyer [Thu, 22 Jan 2015 22:11:53 +0000 (23:11 +0100)]
Fix minus key bug in the weaponslist

9 years agoMove double click detection from listbox subtypes to the superclass
Severin Meyer [Thu, 22 Jan 2015 17:33:50 +0000 (18:33 +0100)]
Move double click detection from listbox subtypes to the superclass

9 years agoMerge branch 'sev/hud_kh' into 'master'
Mario [Thu, 22 Jan 2015 08:13:18 +0000 (08:13 +0000)]
Merge branch 'sev/hud_kh' into 'master'

Reimplemented Keyhunt HUD modicon panel

The current Keyhunt HUD modicon panel is overly complicated and inconsistent with other gametypes:

- It uses most of the available space to show the original key color, which is irrelevant for the gameplay
- Teams are not grouped
- Ownership is conveyed with different alpha values, which is difficult to understand
- As a result, you get an "RGBA salad"

This branch reimplements the panel:

- Each key is shown in the color of its current owning team
- Keys are grouped by team
- The icons use the same taken/carrying/dropped pattern used for CTF
- The icons blink if RUN HERE is shown
- The icons are more evenly distributed in the available space, esp. in the case of fewer than 4 teams

---

![kh](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/b8cb9585fd/kh.png)

See merge request !75

9 years agoMerge branch 'master' into sev/hud_kh
Mario [Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)]
Merge branch 'master' into sev/hud_kh

9 years agoReplace the chatbubble and teambubble with luma versions
Severin Meyer [Thu, 22 Jan 2015 00:41:35 +0000 (01:41 +0100)]
Replace the chatbubble and teambubble with luma versions

9 years agoBlock players while the countdown to game start is going even if sv_ready_restart_aft...
terencehill [Wed, 21 Jan 2015 23:22:00 +0000 (00:22 +0100)]
Block players while the countdown to game start is going even if sv_ready_restart_after_countdown is enabled