]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoSwapper buff: press dropweapon to swap places with a nearby enemy. Icon by Melanosuchus
Mario [Fri, 13 Mar 2015 18:06:01 +0000 (05:06 +1100)]
Swapper buff: press dropweapon to swap places with a nearby enemy. Icon by Melanosuchus

9 years agoMerge branch 'master' into Mario/buff_updates
Mario [Fri, 13 Mar 2015 16:40:06 +0000 (03:40 +1100)]
Merge branch 'master' into Mario/buff_updates

9 years agoDisable lightning arc branching, as this can (and WILL) recurse infinitely.
Rudolf Polzer [Mon, 9 Mar 2015 13:09:09 +0000 (14:09 +0100)]
Disable lightning arc branching, as this can (and WILL) recurse infinitely.

9 years agoMake sure the number of lightning beam segments is bounded.
Rudolf Polzer [Mon, 9 Mar 2015 12:28:55 +0000 (13:28 +0100)]
Make sure the number of lightning beam segments is bounded.

Otherwise, beam list overflow and infinite loops.

9 years agoMerge branch 'terencehill/weapon_panel_retry' into 'master'
Mario [Fri, 6 Mar 2015 07:31:36 +0000 (07:31 +0000)]
Merge branch 'terencehill/weapon_panel_retry' into 'master'

Weapons panel improvements

I've taken into account sev's feedback at !106 and after lots of tests I came up with something good, I think.

To sum it up the changes:
* weapons are now sorted either vertically (more rows) or horizontally (more columns) (not just vertically as before)
* all weapons layout: more symmetrical distribution, icons are now as big as possible
* only owned layout: prefer stretched layouts (like in sev's branch) but avoid too much stretched layouts where item aspect ratio gets altered

See merge request !110

9 years agoAdd some missing "bad" cvars
Mario [Thu, 5 Mar 2015 15:08:20 +0000 (02:08 +1100)]
Add some missing "bad" cvars

9 years agoStop using model "" in func_breakable - it's unreliable when effects is
Rudolf Polzer [Wed, 25 Feb 2015 15:04:54 +0000 (16:04 +0100)]
Stop using model "" in func_breakable - it's unreliable when effects is
set.

Rather use EF_NODRAW to prevent sending.

9 years agotarget_spawn: Retokenize when needed.
Rudolf Polzer [Wed, 25 Feb 2015 14:06:28 +0000 (15:06 +0100)]
target_spawn: Retokenize when needed.

9 years agoDon't annoy bots with noise :)
Rudolf Polzer [Wed, 25 Feb 2015 10:55:31 +0000 (11:55 +0100)]
Don't annoy bots with noise :)

9 years agoFix voting with nospectators
Mario [Mon, 23 Feb 2015 23:40:53 +0000 (10:40 +1100)]
Fix voting with nospectators

9 years agoDamn. NOW it's good :)
Rudolf Polzer [Sat, 21 Feb 2015 15:04:42 +0000 (16:04 +0100)]
Damn. NOW it's good :)

9 years agoInitialize func_breakable sound on connect.
Rudolf Polzer [Sat, 21 Feb 2015 15:03:44 +0000 (16:03 +0100)]
Initialize func_breakable sound on connect.

9 years agoImprove check for vertical sorting
terencehill [Sat, 21 Feb 2015 14:56:15 +0000 (15:56 +0100)]
Improve check for vertical sorting

9 years agoUse the right sound channel.
Rudolf Polzer [Sat, 21 Feb 2015 14:17:30 +0000 (15:17 +0100)]
Use the right sound channel.

9 years agoOops. Unbreak - stopsoundto is no longer public.
Rudolf Polzer [Sat, 21 Feb 2015 14:09:14 +0000 (15:09 +0100)]
Oops. Unbreak - stopsoundto is no longer public.

9 years agoThere's smoke in the master bedroom.
Rudolf Polzer [Sat, 21 Feb 2015 12:56:07 +0000 (13:56 +0100)]
There's smoke in the master bedroom.

In other words: func_breakable.sound1 support.

9 years agoMake it compile
Mario [Tue, 17 Feb 2015 05:26:41 +0000 (16:26 +1100)]
Make it compile

9 years agoAdd a new mutator hook to handle weapon speed (projectiles etc)
Mario [Tue, 17 Feb 2015 04:46:12 +0000 (15:46 +1100)]
Add a new mutator hook to handle weapon speed (projectiles etc)

9 years agoUse a macro to make buff adding/removing a bit cleaner
Mario [Tue, 17 Feb 2015 03:32:01 +0000 (14:32 +1100)]
Use a macro to make buff adding/removing a bit cleaner

9 years agoMerge branch 'master' into terencehill/weapon_panel_retry
terencehill [Sun, 15 Feb 2015 18:55:56 +0000 (19:55 +0100)]
Merge branch 'master' into terencehill/weapon_panel_retry

9 years agoOnlyowned layout: instead of keeping original table proportions as much as possible...
terencehill [Sun, 15 Feb 2015 00:14:46 +0000 (01:14 +0100)]
Onlyowned layout: instead of keeping original table proportions as much as possible, use the previous method that prefers stretched layouts but avoid too much stretched layouts where item aspect ratio gets altered

9 years agoReimplement all-weapons table size calculation in order to make item aspect ratio...
terencehill [Sat, 14 Feb 2015 13:23:47 +0000 (14:23 +0100)]
Reimplement all-weapons table size calculation in order to make item aspect ratio as close as possible to the desired aspect ratio, which means icons as big as possible.

9 years agoRough support for buff timers
Mario [Sat, 14 Feb 2015 15:18:57 +0000 (02:18 +1100)]
Rough support for buff timers

9 years agoMerge branch 'master' into Mario/buff_updates
Mario [Sat, 14 Feb 2015 13:50:20 +0000 (00:50 +1100)]
Merge branch 'master' into Mario/buff_updates

9 years agoMerge branch 'sev/weapon_panel_retry' into 'master'
Mario [Sat, 14 Feb 2015 13:07:07 +0000 (13:07 +0000)]
Merge branch 'sev/weapon_panel_retry' into 'master'

Weapon Panel Retry

Based on the discussion at !105, I've made the following changes to @terencehill's implementation:
- The icons are distributed symmetrically, no matter if the panel is arranged vertically or horizontally
- If the bounds touch a screen edge, the panel is snapped to that edge

This merge request replaces !105.

See merge request !106

9 years agoMerge branch 'master' into sev/weapon_panel_retry
Mario [Sat, 14 Feb 2015 13:02:54 +0000 (00:02 +1100)]
Merge branch 'master' into sev/weapon_panel_retry

9 years agoDisable ammo charging by default
Mario [Thu, 12 Feb 2015 11:01:28 +0000 (22:01 +1100)]
Disable ammo charging by default

9 years agoForgot keep owner cvar in 0.8; buff SG; change back spawn furthest
Mirio [Thu, 12 Feb 2015 10:44:03 +0000 (11:44 +0100)]
Forgot keep owner cvar in 0.8; buff SG; change back spawn furthest

9 years agoTweak the Inferno burn time formula for correctness
TimePath [Tue, 10 Feb 2015 10:08:30 +0000 (21:08 +1100)]
Tweak the Inferno burn time formula for correctness

9 years agoLower damage multiplier enough for a single vortex shot to not kill spawning player
Mario [Tue, 10 Feb 2015 09:46:29 +0000 (20:46 +1100)]
Lower damage multiplier enough for a single vortex shot to not kill spawning player

9 years agoFix typo
TimePath [Tue, 10 Feb 2015 09:43:23 +0000 (20:43 +1100)]
Fix typo

9 years agoSet a minimum inferno burn time of 0.5
TimePath [Tue, 10 Feb 2015 02:29:24 +0000 (13:29 +1100)]
Set a minimum inferno burn time of 0.5

9 years agoDerive inferno buff burn time from an increasing exponential decay curve
TimePath [Tue, 10 Feb 2015 02:23:26 +0000 (13:23 +1100)]
Derive inferno buff burn time from an increasing exponential decay curve

9 years agoUse DEATH_WEAPONOF instead of DEATH_WEAPONOFWEAPONDEATH when calculating fire damage...
Mario [Tue, 10 Feb 2015 00:10:47 +0000 (11:10 +1100)]
Use DEATH_WEAPONOF instead of DEATH_WEAPONOFWEAPONDEATH when calculating fire damage accuracy (incorrectly calls checks fireball accuracy)

9 years agoInferno buff: damaged targets are inflicted with burning for a few seconds
Mario [Mon, 9 Feb 2015 23:05:27 +0000 (10:05 +1100)]
Inferno buff: damaged targets are inflicted with burning for a few seconds

9 years agoSome small updates to buffs system
Mario [Mon, 9 Feb 2015 22:09:18 +0000 (09:09 +1100)]
Some small updates to buffs system

9 years agoCenter onlyowned weapon panel if the panel bounds reach across the whole screen
Severin Meyer [Mon, 9 Feb 2015 19:16:29 +0000 (20:16 +0100)]
Center onlyowned weapon panel if the panel bounds reach across the whole screen

9 years agoCenter onlyowned panel if the original panel snaps to a whole screen side
terencehill [Mon, 9 Feb 2015 11:28:39 +0000 (12:28 +0100)]
Center onlyowned panel if the original panel snaps to a whole screen side

9 years agoUpscale icons with the previous code (AR "fix") rather then with hud_panel_weapons_on...
terencehill [Mon, 9 Feb 2015 10:49:02 +0000 (11:49 +0100)]
Upscale icons with the previous code (AR "fix") rather then with hud_panel_weapons_onlyowned_icon_maxscale (feature removed)

9 years agoMerge remote-tracking branch 'origin/divVerent/crypto-fixes'
Rudolf Polzer [Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)]
Merge remote-tracking branch 'origin/divVerent/crypto-fixes'

9 years agoWeapon panel only owned mode: reduce table trying to keep the original table proporti...
terencehill [Mon, 9 Feb 2015 10:01:47 +0000 (11:01 +0100)]
Weapon panel only owned mode: reduce table trying to keep the original table proportions as much as possible, gives a more consistent layout across different number of owned weapons. Weapons are now sorted either vertically or horizontally depending on the original table proportions

9 years agoAdd Melano to extended, add translators
Mirio [Sun, 8 Feb 2015 17:23:48 +0000 (18:23 +0100)]
Add Melano to extended, add translators

9 years agoMerge branch 'terencehill/menu_fix' into 'master'
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

9 years agoUltimate improvement of the onlyowned layout: change the automatic fix of the weapon...
terencehill [Sat, 7 Feb 2015 20:00:55 +0000 (21:00 +0100)]
Ultimate improvement of the onlyowned layout: change the automatic fix of the weapon icon aspect ratio to note scale the icon up, then scale it up (when there's enough available space) with hud_panel_weapons_onlyowned_icon_maxscale without altering aspect ratio

9 years agoImprove weapon icon distribution
terencehill [Sat, 7 Feb 2015 19:07:50 +0000 (20:07 +0100)]
Improve weapon icon distribution

9 years agoMerge branch 'TimePath/issues/1455' into 'master'
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

9 years agoMerge branch 'TimePath/issues/1454' into 'master'
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

9 years agoDon't call gameTypeChangeNotify() without a parent
TimePath [Sat, 7 Feb 2015 08:45:19 +0000 (19:45 +1100)]
Don't call gameTypeChangeNotify() without a parent
Closes #1454

9 years agoCleanup
TimePath [Sat, 7 Feb 2015 08:34:23 +0000 (19:34 +1100)]
Cleanup

9 years agoFix the tuba with pythonic modulo
TimePath [Sat, 7 Feb 2015 07:03:54 +0000 (18:03 +1100)]
Fix the tuba with pythonic modulo
Closes #1455

9 years agoCleanup
TimePath [Sat, 7 Feb 2015 05:54:02 +0000 (16:54 +1100)]
Cleanup

9 years agoMake the weapon panel snapping work with any padding value
Severin Meyer [Thu, 5 Feb 2015 20:43:33 +0000 (21:43 +0100)]
Make the weapon panel snapping work with any padding value

9 years agoBase weapon panel snap threshold on screen size
Severin Meyer [Thu, 5 Feb 2015 19:09:07 +0000 (20:09 +0100)]
Base weapon panel snap threshold on screen size

9 years agoFix TDM slider not changing point limit
Mario [Thu, 5 Feb 2015 18:30:23 +0000 (05:30 +1100)]
Fix TDM slider not changing point limit

9 years agoMake the weapon panel even more symmetrical and snappier
Severin Meyer [Thu, 5 Feb 2015 17:09:49 +0000 (18:09 +0100)]
Make the weapon panel even more symmetrical and snappier

9 years agoRevert 855007679 as it caused bug #1453 "Advanced settings dialog does not close...
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"

9 years agoDistribute the icons on the weapons panel more symmetrically and snap the panel to...
Severin Meyer [Wed, 4 Feb 2015 20:05:58 +0000 (21:05 +0100)]
Distribute the icons on the weapons panel more symmetrically and snap the panel to the screen edge

9 years agoMerge branch 'sev/crosshairs_size' into 'master'
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

9 years agoSlightly increase the default scale of the crosshairs
Severin Meyer [Tue, 3 Feb 2015 16:21:36 +0000 (17:21 +0100)]
Slightly increase the default scale of the crosshairs

9 years agoMerge branch 'sev/new_crosshairs'
Mario [Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)]
Merge branch 'sev/new_crosshairs'

9 years agoAdd new crosshairs to the menu. The old crosshairs remain accessible through the...
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.

9 years agoMerge branch 'Mirio/credits' into 'master'
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

9 years agoMerge branch 'terencehill/weapon_panel_fix' into 'master'
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

9 years agoMerge branch 'terencehill/string_prefixes_cleanup' into 'master'
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

9 years agoMerge branch 'terencehill/GetClientErrorString_fix' into 'master'
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

9 years agoAdd color code handling to GetClientErrorString (example command where it gets called...
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)

9 years agoMerge branch 'master' into terencehill/string_prefixes_cleanup
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

9 years agoMerge branch 'master' into terencehill/weapon_panel_fix
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

9 years agoFix weapon count when there's a complain_weapon (add it only if you don't have it!)
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!)

9 years agoShow default set of owned weapons in the hud editor even if onlyowned is disabled
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

9 years agoWeapons panel: better way to enlarge weapon_size to match desired aspect
terencehill [Mon, 2 Feb 2015 16:45:38 +0000 (17:45 +0100)]
Weapons panel: better way to enlarge weapon_size to match desired aspect

9 years agoMerge remote-tracking branch 'origin/develop'
Mario [Mon, 2 Feb 2015 10:22:27 +0000 (21:22 +1100)]
Merge remote-tracking branch 'origin/develop'

9 years agoFix post qc_updates merge fallout
TimePath [Mon, 2 Feb 2015 09:45:34 +0000 (20:45 +1100)]
Fix post qc_updates merge fallout

9 years agoFix post qc_updates merge fallout
TimePath [Mon, 2 Feb 2015 09:26:21 +0000 (20:26 +1100)]
Fix post qc_updates merge fallout

9 years agoMerge branch 'Mario/qc_updates' into 'master'
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

9 years agoMerge branch 'master' into Mario/qc_updates
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

9 years agoMove functions out of headers
TimePath [Mon, 2 Feb 2015 07:32:58 +0000 (18:32 +1100)]
Move functions out of headers

9 years agoHide preconnect hook behind an #ifdef
Mario [Mon, 2 Feb 2015 06:54:15 +0000 (17:54 +1100)]
Hide preconnect hook behind an #ifdef

9 years agoMerge branch 'TimePath/issues/1451' into 'master'
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

9 years agoseta _cl_gender
TimePath [Mon, 2 Feb 2015 00:39:08 +0000 (11:39 +1100)]
seta _cl_gender

9 years agoFix a regression
TimePath [Mon, 2 Feb 2015 00:19:10 +0000 (11:19 +1100)]
Fix a regression

9 years agoServerbench: include full scoreboard.
Rudolf Polzer [Sun, 1 Feb 2015 17:58:58 +0000 (18:58 +0100)]
Serverbench: include full scoreboard.

9 years agoMerge branch 'master' into terencehill/weapon_panel_fix
terencehill [Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix

9 years agoMerge branch 'Melanosuchus/preconnect' into 'master'
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

9 years agoMerge branch 'terencehill/menu_optimizations' into 'master'
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

9 years agoMerge branch 'Melanosuchus/kickban-unconnected' into 'master'
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

9 years agoEvent log on ClientPreConnect
Mattia Basaglia [Sat, 31 Jan 2015 21:52:41 +0000 (22:52 +0100)]
Event log on ClientPreConnect

9 years agoMerge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuch...
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

9 years agoDon't use the name "binds-default.cfg"!
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.

9 years agoTweak the order of some #includes
TimePath [Sat, 31 Jan 2015 08:14:09 +0000 (19:14 +1100)]
Tweak the order of some #includes

9 years agoDeclare keycodes as ints
TimePath [Sat, 31 Jan 2015 04:25:46 +0000 (15:25 +1100)]
Declare keycodes as ints

9 years agoBring back `TRUE` and `FALSE` as deprecated aliases
TimePath [Sat, 31 Jan 2015 04:25:34 +0000 (15:25 +1100)]
Bring back `TRUE` and `FALSE` as deprecated aliases

9 years agoRemove client and menu sys-post and sys-pre
TimePath [Sat, 31 Jan 2015 04:05:34 +0000 (15:05 +1100)]
Remove client and menu sys-post and sys-pre

9 years agoMerge branch 'Mario/target_items_fix' into 'master'
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

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