]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Matthias Krüger [Mon, 17 Aug 2015 09:53:30 +0000 (11:53 +0200)]
gametypes: change/add gametype (ctf, dm, cts...) descriptions.
TimePath [Sat, 22 Aug 2015 05:40:30 +0000 (15:40 +1000)]
Require semicolon or definition following `METHOD`
Mario [Fri, 21 Aug 2015 10:31:19 +0000 (10:31 +0000)]
Merge branch 'Mario/vehicles' into 'master'
Merge branch Mario/vehicles (XXL merge request)
Good luck, TimePath.
See merge request !189
Mario [Fri, 21 Aug 2015 10:01:52 +0000 (20:01 +1000)]
Fix a couple of leftovers from bad merges
Mario [Fri, 21 Aug 2015 08:55:37 +0000 (18:55 +1000)]
Merge branch 'master' into Mario/vehicles
# Conflicts:
# qcsrc/client/autocvars.qh
# qcsrc/client/main.qc
# qcsrc/client/tturrets.qc
# qcsrc/client/vehicles/all.qc
# qcsrc/server/g_world.qc
# qcsrc/server/vehicles/bumblebee.qc
# qcsrc/server/vehicles/racer.qc
# qcsrc/server/vehicles/raptor.qc
# qcsrc/server/vehicles/spiderbot.qc
# qcsrc/server/vehicles/vehicle.qc
# qcsrc/server/vehicles/vehicle.qh
TimePath [Fri, 21 Aug 2015 08:30:52 +0000 (18:30 +1000)]
Hook cl_cmd instead of all commands
TimePath [Fri, 21 Aug 2015 07:59:28 +0000 (17:59 +1000)]
CSQC_ConsoleCommand event hook
TimePath [Fri, 21 Aug 2015 06:47:39 +0000 (16:47 +1000)]
Merge branches 'TimePath/weaponsys' and 'Mario/modpack'
TimePath [Fri, 21 Aug 2015 06:24:34 +0000 (16:24 +1000)]
Merge branch 'TimePath/issues/1490'
# Conflicts:
# qcsrc/common/monsters/monster/mage.qc
Mario [Fri, 21 Aug 2015 06:16:08 +0000 (06:16 +0000)]
Merge branch 'Mario/is_macro' into 'master'
Merge branch Mario/is_macro (M merge request)
Adds IS_MONSTER, IS_TURRET & IS_VEHICLE macros.
See merge request !188
Mario [Fri, 21 Aug 2015 06:00:56 +0000 (16:00 +1000)]
Merge branch 'master' into TimePath/issues/1490
# Conflicts:
# qcsrc/server/mutators/mutator_instagib.qc
# qcsrc/server/t_items.qc
Mario [Fri, 21 Aug 2015 05:54:22 +0000 (15:54 +1000)]
Merge branch 'master' into Mario/is_macro
Mario [Fri, 21 Aug 2015 05:53:33 +0000 (05:53 +0000)]
Merge branch 'Mario/send_effects' into 'master'
Merge branch Mario/send_effects (M merge request)
Networks particle effects with CSQC, to allow mismatching effectinfo.txt (potentially fixes issues with changing effects around during testing on a server).
See merge request !187
Mario [Fri, 21 Aug 2015 05:50:15 +0000 (15:50 +1000)]
Make TimePath happy
Mario [Fri, 21 Aug 2015 05:45:53 +0000 (15:45 +1000)]
Boolinterize
Mario [Fri, 21 Aug 2015 05:31:38 +0000 (15:31 +1000)]
Send effects to client, allows mismatching effectinfo.txt
Rudolf Polzer [Thu, 20 Aug 2015 17:19:07 +0000 (19:19 +0200)]
Merge branch 'maint'
Rudolf Polzer [Thu, 20 Aug 2015 17:19:03 +0000 (19:19 +0200)]
Merge branch 'maint' (early part)
Rudolf Polzer [Thu, 20 Aug 2015 17:18:47 +0000 (19:18 +0200)]
Transifex sync (maint only).
Mario [Wed, 19 Aug 2015 23:51:14 +0000 (23:51 +0000)]
Merge branch 'terencehill/quake_items_fix' into 'maint'
Fix Large Armor and Mega Health detection in Quake / Quake 3 maps
Fixes issues in itemstime, superspec, instagib and lms.
Fixes #1505
See merge request !185
Rudolf Polzer [Wed, 19 Aug 2015 23:31:23 +0000 (01:31 +0200)]
Merge branch 'maint'
Rudolf Polzer [Wed, 19 Aug 2015 23:31:01 +0000 (01:31 +0200)]
Merge branch 'maint' (early part before Transifex)
Rudolf Polzer [Wed, 19 Aug 2015 23:29:55 +0000 (01:29 +0200)]
Transifex sync (maint stuff).
Rudolf Polzer [Wed, 19 Aug 2015 23:27:03 +0000 (01:27 +0200)]
Transifex sync.
terencehill [Wed, 19 Aug 2015 12:44:42 +0000 (14:44 +0200)]
Fix Large Armor and Mega Health detection in Quake / Quake 3 maps. Fixes issues in itemstime, superspec, instagib and lms.
TimePath [Wed, 19 Aug 2015 11:38:52 +0000 (21:38 +1000)]
Menu support
TimePath [Wed, 19 Aug 2015 10:55:21 +0000 (20:55 +1000)]
Mutator registry
TimePath [Wed, 19 Aug 2015 00:04:12 +0000 (10:04 +1000)]
Move mutator system to common
Mario [Tue, 18 Aug 2015 23:51:48 +0000 (09:51 +1000)]
This is not a commit
Mario [Tue, 18 Aug 2015 23:47:19 +0000 (09:47 +1000)]
Add IS_MACRO macro for matthiaskrgr
Mario [Tue, 18 Aug 2015 23:42:25 +0000 (09:42 +1000)]
Add IS_MONSTER, IS_TURRET & IS_VEHICLE macros
TimePath [Tue, 18 Aug 2015 09:41:17 +0000 (19:41 +1000)]
Merge branch 'master' into Mario/modpack
Mario [Tue, 18 Aug 2015 09:28:11 +0000 (09:28 +0000)]
Merge branch 'TimePath/mutator_cleanup' into 'master'
Encapsulate mutator globals
See merge request !135
Mario [Sat, 15 Aug 2015 21:04:18 +0000 (07:04 +1000)]
Merge branch 'maint' of https://gitlab.com/xonotic/xonotic-data.pk3dir into maint
Mario [Sat, 15 Aug 2015 21:03:12 +0000 (07:03 +1000)]
Update notifications.cfg
Mario [Sat, 15 Aug 2015 20:58:07 +0000 (20:58 +0000)]
Merge branch 'TimePath/div0monsters' into 'maint'
Fix division by zero in sv_monsters.qc
See merge request !180
TimePath [Sat, 15 Aug 2015 11:15:01 +0000 (21:15 +1000)]
Fix division by zero in sv_monsters.qc
TimePath [Sat, 15 Aug 2015 10:00:31 +0000 (20:00 +1000)]
Convert remaining calls
TimePath [Sat, 15 Aug 2015 09:40:46 +0000 (19:40 +1000)]
Convert more calls
TimePath [Sat, 15 Aug 2015 08:01:42 +0000 (18:01 +1000)]
Convert more calls
TimePath [Sat, 15 Aug 2015 07:25:53 +0000 (17:25 +1000)]
Work around `SZ_GetSpace: overflow`
TimePath [Sat, 15 Aug 2015 07:15:57 +0000 (17:15 +1000)]
Convert more calls
TimePath [Sat, 15 Aug 2015 06:58:25 +0000 (16:58 +1000)]
Convert more calls
TimePath [Sat, 15 Aug 2015 06:38:11 +0000 (16:38 +1000)]
Convert some calls
TimePath [Sat, 15 Aug 2015 05:54:30 +0000 (15:54 +1000)]
Enable mutator calls to take parameters
TimePath [Fri, 15 May 2015 03:28:11 +0000 (13:28 +1000)]
Cleanup mutators
TimePath [Sat, 15 Aug 2015 01:59:54 +0000 (11:59 +1000)]
Make clean gamecode expansion possible
TimePath [Fri, 14 Aug 2015 10:27:33 +0000 (20:27 +1000)]
Use ATTRIB
TimePath [Fri, 14 Aug 2015 10:11:52 +0000 (20:11 +1000)]
Remove redundant get_weaponinfo calls
TimePath [Fri, 14 Aug 2015 09:50:48 +0000 (19:50 +1000)]
s/WEP_(ID)/WEP_$1.m_id/
TimePath [Fri, 14 Aug 2015 08:14:46 +0000 (18:14 +1000)]
Migrate REGISTER_WEAPON to registry system
TimePath [Fri, 14 Aug 2015 06:18:05 +0000 (16:18 +1000)]
Use explicit IMPLEMENTATION guard
TimePath [Fri, 14 Aug 2015 04:40:42 +0000 (14:40 +1000)]
Update iterators
TimePath [Fri, 14 Aug 2015 03:53:32 +0000 (13:53 +1000)]
Merge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'
TimePath [Fri, 14 Aug 2015 00:30:33 +0000 (10:30 +1000)]
Objectify buffs
TimePath [Fri, 14 Aug 2015 00:25:57 +0000 (10:25 +1000)]
Allow custom construction of registered objects
TimePath [Fri, 14 Aug 2015 00:11:36 +0000 (10:11 +1000)]
Objectify gametypes
TimePath [Fri, 14 Aug 2015 00:10:51 +0000 (10:10 +1000)]
Add CONSTRUCT for super-initialization
TimePath [Thu, 13 Aug 2015 23:01:14 +0000 (09:01 +1000)]
Implement CONSTRUCTOR
TimePath [Thu, 13 Aug 2015 08:13:53 +0000 (18:13 +1000)]
Cleanup OO macros
Rudolf Polzer [Wed, 12 Aug 2015 23:48:44 +0000 (01:48 +0200)]
Add an explanation, resolving a FIXME.
Mario [Wed, 12 Aug 2015 14:17:13 +0000 (00:17 +1000)]
We are now in code freeze. Any merge requests for issues to be fixed before release should be directed to the maint branch
Mario [Wed, 12 Aug 2015 11:44:51 +0000 (11:44 +0000)]
Merge branch 'TimePath/nadesys' into 'master'
Objectify nades
Also fixes translocate grenade facing direction
See merge request !170
TimePath [Wed, 12 Aug 2015 10:48:16 +0000 (20:48 +1000)]
Objectify nades
Mario [Wed, 12 Aug 2015 10:09:52 +0000 (10:09 +0000)]
Merge branch 'sev/luma_itemstime' into 'master'
Small icon updates for itemstime panel
I made a few revisions after the merge of the itemstime panel:
- Because HUD icons are inherited from the default theme, it is unnecessary to add identical icons to the luminos theme.
So I removed them to save some space.
- There already are icons for the strength and shield powerups, it is redundant to add second versions.
However, the quality of the new icons is a lot better than the old ones, so I moved
`default/item_shield` and `default/item_strength` to `default/shield` and `default/strength`.
- To match these new powerup icons, I updated the buff and superweapons icons.
- I added new icons to the Luma theme.
See merge request !169
Mario [Wed, 12 Aug 2015 10:04:39 +0000 (10:04 +0000)]
Merge branch 'TimePath/monstersys' into 'master'
Re-use generic registry code for monsters
float MON_id --> entity MON_id, .monsterid used to get floats back where currently needed
Classes to be defined in a future merge request
See merge request !167
Mario [Wed, 12 Aug 2015 09:53:35 +0000 (09:53 +0000)]
Merge branch 'terencehill/mutator_button_rename' into 'master'
Mutators --> Mutators...
Fixes #1493
See merge request !168
TimePath [Tue, 11 Aug 2015 10:07:55 +0000 (20:07 +1000)]
Refer to item flags from item definitions
TimePath [Tue, 11 Aug 2015 08:52:22 +0000 (18:52 +1000)]
Add ammoPic attribute
TimePath [Wed, 12 Aug 2015 08:17:57 +0000 (18:17 +1000)]
Re-use generic registry code for monsters
TimePath [Wed, 12 Aug 2015 08:17:43 +0000 (18:17 +1000)]
Namespace registry functions
Severin Meyer [Wed, 12 Aug 2015 00:46:13 +0000 (02:46 +0200)]
Increase the alpha value of loading itemstime icons
Severin Meyer [Wed, 12 Aug 2015 00:38:32 +0000 (02:38 +0200)]
Add Luma itemstime icons and update Luma simple items
Severin Meyer [Wed, 12 Aug 2015 00:37:19 +0000 (02:37 +0200)]
Update buff and powerup icons to match the rest of the theme
Severin Meyer [Wed, 12 Aug 2015 00:28:55 +0000 (02:28 +0200)]
For the itemstime panel, use existing strength and shield icons instead of adding new ones
Severin Meyer [Wed, 12 Aug 2015 00:25:23 +0000 (02:25 +0200)]
Icons are inherited from the default HUD theme, therefore it is unnecessary to add identical icons twice
terencehill [Tue, 11 Aug 2015 19:55:32 +0000 (21:55 +0200)]
Mutators --> Mutators...
Mario [Tue, 11 Aug 2015 18:42:59 +0000 (18:42 +0000)]
Merge branch 'terencehill/menu_listbox_changes' into 'master'
Menu listbox changes
Menu listbox changes:
* scrolling with mouse wheel / scrollbar no longer changes the current selection
* scrolling and selection changes are now smooth
* FIX: remove highlighting from the focused item when the cursor is moved to the scrollbar area
* FIX: Highlight the focused item even while scrolling
* stats list no longer shows a selected item as it's useless
* servers list no longer automatically scroll at the beginning following the first seen server
See merge request !150
terencehill [Tue, 11 Aug 2015 18:34:00 +0000 (20:34 +0200)]
Rename a variable
terencehill [Tue, 11 Aug 2015 18:31:34 +0000 (20:31 +0200)]
Use the formula with exp, as it's more mathematically correct
terencehill [Tue, 11 Aug 2015 17:48:06 +0000 (19:48 +0200)]
Merge branch 'master' into terencehill/menu_listbox_changes
Mario [Tue, 11 Aug 2015 16:30:30 +0000 (16:30 +0000)]
Merge branch 'terencehill/itemstime' into 'master'
Items Time
Features:
* Panel that displays left time until important items respawn in the map: mega health, large armor, powerups (strenght, invincible, jetpack, fuel regenerator) and superweapons.
* Waypoints for mega health and large armor, displayed just like the existing powerup waypoints, obviously visible only to spectators
Panel and waypoints can be enabled when spectating (g_waypointsprite_itemstime 1, hud_panel_itemstime 1) or also when playing in warmup stage (g_waypointsprite_itemstime 2, hud_panel_itemstime 2).
In order to prevent cheating, server can completely disable this feature by setting sv_itemstime to 0 (1 by default).
See merge request !133
Mario [Tue, 11 Aug 2015 16:28:36 +0000 (02:28 +1000)]
Merge branch 'master' into terencehill/itemstime
# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/client/hud_config.qc
# qcsrc/common/stats.qh
# qcsrc/menu/xonotic/mainwindow.qc
# qcsrc/server/autocvars.qh
TimePath [Tue, 11 Aug 2015 03:04:45 +0000 (13:04 +1000)]
Extract registry functionality
TimePath [Tue, 11 Aug 2015 02:28:51 +0000 (12:28 +1000)]
Simplify item definitions
TimePath [Tue, 11 Aug 2015 01:27:31 +0000 (11:27 +1000)]
Adjust item definition syntax
terencehill [Mon, 10 Aug 2015 23:50:02 +0000 (01:50 +0200)]
Center icon when item has no time
terencehill [Mon, 10 Aug 2015 22:58:09 +0000 (00:58 +0200)]
seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again"
Mario [Mon, 10 Aug 2015 18:11:18 +0000 (18:11 +0000)]
Merge branch 'terencehill/kh_fix' into 'master'
Fix and improve not working notification about missing teams in KeyHunt
Fix not working notification about missing teams in KeyHunt (outdated notification parameters) and use the improved system used in CA and FT to detect changes of missing teams
See merge request !164
Mario [Mon, 10 Aug 2015 18:01:45 +0000 (18:01 +0000)]
Merge branch 'terencehill/g_chat_nospectators_fix' into 'master'
Fix condition for displaying g_chat_nospectators warning
Fix condition for displaying g_chat_nospectators warning (warmup_stage is initially cvar("g_warmup") but can be turned off by a mod)
See merge request !165
Mario [Mon, 10 Aug 2015 17:58:19 +0000 (17:58 +0000)]
Merge branch 'Mario/buff_updates' into 'master'
Merge branch Mario/buff_updates (XL merge request)
Includes many changes & fixes to the buffs mutator, along with sev's work on their graphical side (HUD & model icons).
See merge request !162
terencehill [Sun, 9 Aug 2015 15:16:33 +0000 (17:16 +0200)]
Always draw the icon at full alpha when hud_panel_itemstime_hidespawned is enabled
terencehill [Sun, 9 Aug 2015 15:14:31 +0000 (17:14 +0200)]
Apply the icon expanding effect when an item is available again
terencehill [Sun, 9 Aug 2015 09:30:17 +0000 (11:30 +0200)]
Fix condition for displaying g_chat_nospectators warning (warmup_stage is initially cvar("g_warmup") but can be turned off by a mod)
Rudolf Polzer [Sat, 8 Aug 2015 10:43:34 +0000 (12:43 +0200)]
Transifex Sync
terencehill [Fri, 7 Aug 2015 15:01:31 +0000 (17:01 +0200)]
Fix not working notification about missing teams in KeyHunt (outdated notification parameters) and use the improved system used in CA and FT to detect changes of missing teams
terencehill [Fri, 7 Aug 2015 13:59:53 +0000 (15:59 +0200)]
Initialize autocvar_hud_panel_itemstime_progressbar_maxtime too
terencehill [Thu, 6 Aug 2015 22:27:15 +0000 (00:27 +0200)]
Rename hud_panel_itemstime_showspawned to hud_panel_itemstime_hidespawned, and make it an user cvar
terencehill [Thu, 6 Aug 2015 21:53:56 +0000 (23:53 +0200)]
Rename 2 functions
terencehill [Thu, 6 Aug 2015 21:12:28 +0000 (23:12 +0200)]
Remove some code that now is useless