]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Rudolf Polzer [Mon, 9 Feb 2015 12:15:20 +0000 (13:15 +0100)]
COMPAT_XON080_BGMVOLUME should be the name.
Rudolf Polzer [Mon, 9 Feb 2015 12:14:41 +0000 (13:14 +0100)]
Merge branch 'master' into divVerent/musicvolume
Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qc
qcsrc/client/target_music.qc
qcsrc/common/util-pre.qh
Rudolf Polzer [Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)]
Merge remote-tracking branch 'origin/divVerent/crypto-fixes'
Mirio [Sun, 8 Feb 2015 17:23:48 +0000 (18:23 +0100)]
Add Melano to extended, add translators
Mario [Sun, 8 Feb 2015 15:22:12 +0000 (15:22 +0000)]
Merge branch 'terencehill/menu_fix' into 'master'
Terencehill/menu fix
Fix for bug #1453 "Advanced settings dialog does not close after pressing OK"
See merge request !107
Mario [Sat, 7 Feb 2015 12:57:37 +0000 (12:57 +0000)]
Merge branch 'TimePath/issues/1455' into 'master'
"volume must be in range 0-1" warnings when playing the tuba
Closes xonotic/xonotic-data.pk3dir#1455
See merge request !108
Mario [Sat, 7 Feb 2015 08:54:45 +0000 (08:54 +0000)]
Merge branch 'TimePath/issues/1454' into 'master'
Menu VM crash when g_invasion is set to 1
See merge request !109
TimePath [Sat, 7 Feb 2015 08:45:19 +0000 (19:45 +1100)]
Don't call gameTypeChangeNotify() without a parent
Closes #1454
TimePath [Sat, 7 Feb 2015 08:34:23 +0000 (19:34 +1100)]
Cleanup
TimePath [Sat, 7 Feb 2015 07:03:54 +0000 (18:03 +1100)]
Fix the tuba with pythonic modulo
Closes #1455
TimePath [Sat, 7 Feb 2015 05:54:02 +0000 (16:54 +1100)]
Cleanup
Mario [Thu, 5 Feb 2015 18:30:23 +0000 (05:30 +1100)]
Fix TDM slider not changing point limit
terencehill [Thu, 5 Feb 2015 14:52:06 +0000 (15:52 +0100)]
Revert
855007679 as it caused bug #1453 "Advanced settings dialog does not close after pressing OK"
Mario [Wed, 4 Feb 2015 03:20:10 +0000 (03:20 +0000)]
Merge branch 'sev/crosshairs_size' into 'master'
Crosshair size
I've noticed that the default scale of the crosshairs is quite small. This causes aliasing issues, even at a resolution of 1920x1080, esp. for the per-weapon crosshairs.
With this branch I propose to slightly increase the default scale of all crosshairs from 0.3 to 0.4, as well as to increase some of the per-weapon crosshair scales,
to improve the first impression.
Before/After (1920x1080):
![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
15a0b111db /crosshairs.png)
See merge request !104
Severin Meyer [Tue, 3 Feb 2015 16:21:36 +0000 (17:21 +0100)]
Slightly increase the default scale of the crosshairs
Mario [Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)]
Merge branch 'sev/new_crosshairs'
Severin Meyer [Tue, 3 Feb 2015 10:08:41 +0000 (11:08 +0100)]
Add new crosshairs to the menu. The old crosshairs remain accessible through the crosshair cvar.
Mario [Tue, 3 Feb 2015 05:31:40 +0000 (05:31 +0000)]
Merge branch 'Mirio/credits' into 'master'
Mirio/credits
Somehow CuBe0wL got lost
See merge request !92
Mario [Tue, 3 Feb 2015 04:40:48 +0000 (04:40 +0000)]
Merge branch 'terencehill/weapon_panel_fix' into 'master'
Terencehill/weapon panel fix
Recent weapons panel changes weren't all good so I had to revert them: weapon icons currently are too wide when owning few weapons, onlyowned enabled and the panel shape is more squared.
Then I furtherly improved the previous code to achieve the same sev's goal, that is, more compact layout and better use of the available space.
See merge request !102
Mario [Tue, 3 Feb 2015 04:40:20 +0000 (04:40 +0000)]
Merge branch 'terencehill/string_prefixes_cleanup' into 'master'
Terencehill/string prefixes cleanup
Clean up translation context prefixes
See merge request !89
Mario [Tue, 3 Feb 2015 04:38:14 +0000 (04:38 +0000)]
Merge branch 'terencehill/GetClientErrorString_fix' into 'master'
Terencehill/GetClientErrorString fix
Add color code handling to GetClientErrorString (example command where it gets called: tell ^1wrong_player_name blabla)
See merge request !101
terencehill [Tue, 3 Feb 2015 00:22:56 +0000 (01:22 +0100)]
Add color code handling to GetClientErrorString (example command where it gets called: tell ^1wrong_player_name blabla)
terencehill [Tue, 3 Feb 2015 00:41:19 +0000 (01:41 +0100)]
Merge branch 'master' into terencehill/string_prefixes_cleanup
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
terencehill [Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix
Conflicts:
qcsrc/client/hud.qc
terencehill [Mon, 2 Feb 2015 18:43:13 +0000 (19:43 +0100)]
Fix weapon count when there's a complain_weapon (add it only if you don't have it!)
terencehill [Mon, 2 Feb 2015 17:52:09 +0000 (18:52 +0100)]
Show default set of owned weapons in the hud editor even if onlyowned is disabled
terencehill [Mon, 2 Feb 2015 16:45:38 +0000 (17:45 +0100)]
Weapons panel: better way to enlarge weapon_size to match desired aspect
Mario [Mon, 2 Feb 2015 10:22:27 +0000 (21:22 +1100)]
Merge remote-tracking branch 'origin/develop'
TimePath [Mon, 2 Feb 2015 09:45:34 +0000 (20:45 +1100)]
Fix post qc_updates merge fallout
TimePath [Mon, 2 Feb 2015 09:26:21 +0000 (20:26 +1100)]
Fix post qc_updates merge fallout
Mario [Mon, 2 Feb 2015 08:42:40 +0000 (08:42 +0000)]
Merge branch 'Mario/qc_updates' into 'master'
QC Updates
Updates mainly aiding transpilation, but also nice to have if sticking with DarkPlaces
* `float` -> `int`/`bool`
* Helps the transpiler immensely
* Scope visibility reduction
* Replaces `#define` with `const`
* More readable transpiler output (constant names instead of inline values)
* Replaces `vector_[xyz]` with `vector.[xyz]` (but not `entity.vector_[xyz]` because of a compiler bug)
* Removes `-Wno-double-declaration`
* Required for compilation of transpiled source
* Removes useless uses of `var`, `noref` and `local`
* Uses `#include` instead of `progs.src`
* Will help qc_physics
Squashed preview: [
7239bacff8b7fb9fe9541d6c6dc852e78b5049ac ](https://gitlab.com/xonotic/xonotic-data.pk3dir/commit/
7239bacff8b7fb9fe9541d6c6dc852e78b5049ac ?force_show_diff=true)
See merge request !97
TimePath [Mon, 2 Feb 2015 08:23:09 +0000 (19:23 +1100)]
Merge branch 'master' into Mario/qc_updates
Conflicts:
qcsrc/menu/classes.c
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/maplist.qc
qcsrc/server/command/banning.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qc
TimePath [Mon, 2 Feb 2015 07:32:58 +0000 (18:32 +1100)]
Move functions out of headers
Mario [Mon, 2 Feb 2015 06:54:15 +0000 (17:54 +1100)]
Hide preconnect hook behind an #ifdef
Mario [Mon, 2 Feb 2015 05:11:07 +0000 (05:11 +0000)]
Merge branch 'TimePath/issues/1451' into 'master'
seta _cl_gender
Closes xonotic/xonotic-data.pk3dir#1451
See merge request !100
TimePath [Mon, 2 Feb 2015 00:39:08 +0000 (11:39 +1100)]
seta _cl_gender
TimePath [Mon, 2 Feb 2015 00:19:10 +0000 (11:19 +1100)]
Fix a regression
Rudolf Polzer [Sun, 1 Feb 2015 17:58:58 +0000 (18:58 +0100)]
Serverbench: include full scoreboard.
terencehill [Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix
Mario [Sun, 1 Feb 2015 10:54:53 +0000 (10:54 +0000)]
Merge branch 'Melanosuchus/preconnect' into 'master'
ClientPreConnect
Sends an event log on ClientPreConnect, requires xonotic/darkplaces!14
The log format is basically the same as the one used in :join.
See merge request !99
Mario [Sun, 1 Feb 2015 08:19:33 +0000 (08:19 +0000)]
Merge branch 'terencehill/menu_optimizations' into 'master'
Terencehill/menu optimizations
Optimize ModalController_draw code so that #1432 (Header labels flicker) gets partially fixed (that is, only in the tab that fades out)
More details in this comment: https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1432#note_709376
See merge request !79
Mario [Sun, 1 Feb 2015 04:31:41 +0000 (04:31 +0000)]
Merge branch 'Melanosuchus/kickban-unconnected' into 'master'
Melanosuchus/kickban unconnected
Changes:
* Unconnected clients cannot call votes
* Kickban won't discard said unconnected clients
* Bans are enforced on unconnected clients
See merge request !98
Mattia Basaglia [Sat, 31 Jan 2015 21:52:41 +0000 (22:52 +0100)]
Event log on ClientPreConnect
Mattia Basaglia [Sat, 31 Jan 2015 21:34:46 +0000 (22:34 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuchus/kickban-unconnected
Rudolf Polzer [Sat, 31 Jan 2015 19:47:23 +0000 (20:47 +0100)]
Don't use the name "binds-default.cfg"!
Names ending in "default.cfg" are magic to DarkPlaces, and lead to the
engine cvar defaults getting locked.
Fixes #1444, #1448.
TimePath [Sat, 31 Jan 2015 08:14:09 +0000 (19:14 +1100)]
Tweak the order of some #includes
TimePath [Sat, 31 Jan 2015 04:25:46 +0000 (15:25 +1100)]
Declare keycodes as ints
TimePath [Sat, 31 Jan 2015 04:25:34 +0000 (15:25 +1100)]
Bring back `TRUE` and `FALSE` as deprecated aliases
TimePath [Sat, 31 Jan 2015 04:05:34 +0000 (15:05 +1100)]
Remove client and menu sys-post and sys-pre
Mario [Sat, 31 Jan 2015 02:55:48 +0000 (02:55 +0000)]
Merge branch 'Mario/target_items_fix' into 'master'
Merge branch Mario/target_items_fix (XXS merge request)
Fixes target_items not compatible with old weapon names.
See merge request !96
Mario [Sat, 31 Jan 2015 02:40:58 +0000 (13:40 +1100)]
Possibly fix issue with old weapon names and target_items
Mario [Fri, 30 Jan 2015 10:27:59 +0000 (21:27 +1100)]
Make Luma the default HUD and menu theme
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
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
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
TimePath [Fri, 30 Jan 2015 08:22:59 +0000 (19:22 +1100)]
Fix Uncrustify problem areas
TimePath [Fri, 30 Jan 2015 05:09:41 +0000 (16:09 +1100)]
Remove for-loop workaround
TimePath [Fri, 30 Jan 2015 03:45:37 +0000 (14:45 +1100)]
Update uncrustify.cfg
TimePath [Thu, 29 Jan 2015 23:29:58 +0000 (10:29 +1100)]
Fix whitespace for #include
TimePath [Thu, 29 Jan 2015 23:09:25 +0000 (10:09 +1100)]
Declare more ints as ints
TimePath [Thu, 29 Jan 2015 10:35:33 +0000 (21:35 +1100)]
Declare more ints as ints
TimePath [Thu, 29 Jan 2015 08:47:53 +0000 (19:47 +1100)]
Replace more `vector_[xyz]` with `vector.[xyz]`
TimePath [Thu, 29 Jan 2015 07:41:08 +0000 (18:41 +1100)]
Declare more ints as ints
TimePath [Thu, 29 Jan 2015 06:17:16 +0000 (17:17 +1100)]
Clean up SVQC #includes
TimePath [Thu, 29 Jan 2015 03:44:56 +0000 (14:44 +1100)]
Clean up MENUQC #includes
TimePath [Thu, 29 Jan 2015 03:07:19 +0000 (14:07 +1100)]
Clean up CSQC #includes
TimePath [Thu, 29 Jan 2015 01:01:07 +0000 (12:01 +1100)]
Remove pre/post includes
TimePath [Thu, 29 Jan 2015 00:50:34 +0000 (11:50 +1100)]
Remove includes from most headers
TimePath [Thu, 29 Jan 2015 00:22:19 +0000 (11:22 +1100)]
Rename defs to qh
TimePath [Thu, 29 Jan 2015 00:12:02 +0000 (11:12 +1100)]
#include this
Initial move to #include
TODO: remove unused includes
TimePath [Wed, 28 Jan 2015 00:08:39 +0000 (11:08 +1100)]
Remove `-Wno-double-declaration`
TimePath [Tue, 27 Jan 2015 22:10:55 +0000 (09:10 +1100)]
Declare more ints as ints
TimePath [Mon, 26 Jan 2015 09:10:42 +0000 (20:10 +1100)]
Revert a deleted `#define`
TimePath [Mon, 26 Jan 2015 08:56:51 +0000 (19:56 +1100)]
Check features, not compilers
TimePath [Mon, 26 Jan 2015 08:51:39 +0000 (19:51 +1100)]
Clean up macros
TimePath [Mon, 26 Jan 2015 07:59:39 +0000 (18:59 +1100)]
Remove redundant uses of `var`
TimePath [Mon, 26 Jan 2015 07:41:06 +0000 (18:41 +1100)]
Clean up macro hell
TimePath [Mon, 26 Jan 2015 00:28:05 +0000 (11:28 +1100)]
Declare more ints as ints
terencehill [Sun, 25 Jan 2015 23:52:27 +0000 (00:52 +0100)]
Put formula to calculate row count into its own function
TimePath [Sun, 25 Jan 2015 23:48:07 +0000 (10:48 +1100)]
Unify boolean constants
TRUE -> true
FALSE -> false
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
TimePath [Sun, 25 Jan 2015 11:27:23 +0000 (22:27 +1100)]
Replace `vector_[xyz]` with `vector.[xyz]` where possible
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)
TimePath [Sun, 25 Jan 2015 04:26:33 +0000 (15:26 +1100)]
Work around a gmqcc bug
TimePath [Sun, 25 Jan 2015 04:02:50 +0000 (15:02 +1100)]
Rename menu files to be consistent
*.h -> *.qh
*.c -> *.qc
TimePath [Sun, 25 Jan 2015 03:44:56 +0000 (14:44 +1100)]
Delete empty files
TimePath [Sun, 25 Jan 2015 03:41:51 +0000 (14:41 +1100)]
Remove some `#ifdef GMQCC` conditionals
TimePath [Sun, 25 Jan 2015 03:33:33 +0000 (14:33 +1100)]
Kill uses of `local` and `noref`
TimePath [Sun, 25 Jan 2015 03:19:06 +0000 (14:19 +1100)]
Declare more ints as ints
TimePath [Sun, 25 Jan 2015 01:19:14 +0000 (12:19 +1100)]
Declare more ints as ints
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
terencehill [Sat, 24 Jan 2015 23:26:35 +0000 (00:26 +0100)]
Reduce scope of some variables
terencehill [Sat, 24 Jan 2015 23:18:39 +0000 (00:18 +0100)]
Add an explicative comment
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 .
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
Mario [Sat, 24 Jan 2015 11:32:53 +0000 (22:32 +1100)]
Begin fixing the monster (only 700 more lines to go, yay)
TimePath [Sat, 24 Jan 2015 11:01:58 +0000 (22:01 +1100)]
Declare more ints as ints
TimePath [Sat, 24 Jan 2015 10:51:09 +0000 (21:51 +1100)]
Declare more ints as ints
Mario [Sat, 24 Jan 2015 10:42:24 +0000 (21:42 +1100)]
Fix some more things
Mario [Sat, 24 Jan 2015 10:20:18 +0000 (21:20 +1100)]
Fix some cases of noref