]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Sun, 23 Aug 2015 11:15:29 +0000 (21:15 +1000)]
Fix menu compile
Mario [Sun, 23 Aug 2015 11:05:11 +0000 (11:05 +0000)]
Merge branch 'Mario/format_message' into 'master'
Merge branch Mario/format_message (S merge request)
More fun for chat replacement hacks
See merge request !196
Mario [Sun, 23 Aug 2015 11:02:02 +0000 (21:02 +1000)]
Use new item stuff
Mario [Sun, 23 Aug 2015 10:54:14 +0000 (20:54 +1000)]
Clean up chat replacement handling, add a mutator hook for extra fun
Mario [Sun, 23 Aug 2015 10:43:54 +0000 (10:43 +0000)]
Merge branch 'Mario/ons_updates' into 'master'
Merge branch Mario/ons_updates (L merge request)
Greatly improves the onslaught gamemode
See merge request !195
Mario [Sun, 23 Aug 2015 10:42:33 +0000 (20:42 +1000)]
Merge branch 'master' into Mario/ons_updates
# Conflicts:
# qcsrc/common/mapinfo.qh
Mario [Sun, 23 Aug 2015 10:37:34 +0000 (10:37 +0000)]
Merge branch 'matthiaskrgr/stuff_descriptions' into 'master'
gametypes: change/add gametype (ctf, dm, cts...) descriptions.
Changes some gametype descriptions, inspired by TimePath/guide branch.
See merge request !182
Mario [Sun, 23 Aug 2015 10:28:54 +0000 (20:28 +1000)]
Make it run
Mario [Sun, 23 Aug 2015 10:20:26 +0000 (20:20 +1000)]
Merge branch 'master' into Mario/ons_updates
# Conflicts:
# qcsrc/client/view.qc
# qcsrc/common/constants.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/mutators/gamemode_onslaught.qc
TimePath [Sun, 23 Aug 2015 09:52:55 +0000 (09:52 +0000)]
Merge branch 'Mario/turrets' into 'master'
Mario/turrets
See merge request !194
TimePath [Sun, 23 Aug 2015 08:56:02 +0000 (18:56 +1000)]
Merge branch 'master' into Mario/turrets
# Conflicts:
# qcsrc/client/progs.src
# qcsrc/common/monsters/sv_monsters.qc
# qcsrc/common/triggers/teleporters.qc
# qcsrc/common/vehicles/sv_vehicles.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/g_damage.qh
# qcsrc/server/mutators/mutators_include.qc
TimePath [Sun, 23 Aug 2015 08:15:19 +0000 (18:15 +1000)]
Fix duplicate weapons/all.qc inclusion
TimePath [Sun, 23 Aug 2015 08:07:27 +0000 (18:07 +1000)]
Merge branch 'master' into Mario/turrets
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/client/tturrets.qc
# qcsrc/client/tturrets.qh
# qcsrc/common/command/generic.qc
# qcsrc/common/monsters/sv_monsters.qc
# qcsrc/common/nades.qc
# qcsrc/common/triggers/teleporters.qc
# qcsrc/server/autocvars.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/g_damage.qh
# qcsrc/server/g_world.qc
# qcsrc/server/miscfunctions.qc
# qcsrc/server/mutators/mutators_include.qc
# qcsrc/server/progs.src
# qcsrc/server/tturrets/include/turrets_early.qh
# qcsrc/server/tturrets/system/system_damage.qc
# qcsrc/server/tturrets/system/system_main.qc
# qcsrc/server/tturrets/system/system_misc.qc
# qcsrc/server/tturrets/units/unit_ewheel.qc
# qcsrc/server/tturrets/units/unit_flac.qc
# qcsrc/server/tturrets/units/unit_machinegun.qc
# qcsrc/server/tturrets/units/unit_phaser.qc
# qcsrc/server/tturrets/units/unit_plasma.qc
# qcsrc/server/tturrets/units/unit_tessla.qc
# qcsrc/server/tturrets/units/unit_walker.qc
# qcsrc/server/vehicles/bumblebee.qc
# qcsrc/server/vehicles/racer.qc
# qcsrc/server/vehicles/vehicles.qc
# qcsrc/server/vehicles/vehicles_def.qh
TimePath [Sun, 23 Aug 2015 07:29:11 +0000 (07:29 +0000)]
Merge branch 'TimePath/vehicles_cleanup' into 'master'
Vehicles cleanup
* Simplifies headers
* Uses the common registration system
* Makes vehicle definitions available to the menu for the [guide](https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/181)
See merge request !190
TimePath [Sun, 23 Aug 2015 07:13:46 +0000 (17:13 +1000)]
Merge branch 'master' into TimePath/vehicles_cleanup
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/server/progs.src
TimePath [Sun, 23 Aug 2015 06:43:02 +0000 (06:43 +0000)]
Merge branch 'TimePath/damagetext' into 'master'
Damage text
Nice little feature to display a running total of damage. ~~Should this be on by default? Should servers be able to disable it? Are the default settings good enough?~~ done done and done.
![](https://dl.dropboxusercontent.com/u/
42745598 /screenshots/2015-08-23_13-24-33.png)
See merge request !192
TimePath [Sun, 23 Aug 2015 06:23:06 +0000 (16:23 +1000)]
Describe damagetext cvars
Mario [Sun, 23 Aug 2015 06:19:32 +0000 (16:19 +1000)]
Add hit sound hooks for onslaught and assault objectives
TimePath [Sun, 23 Aug 2015 05:37:22 +0000 (15:37 +1000)]
Allow damagetext to be disabled at varying levels
TimePath [Sun, 23 Aug 2015 05:09:23 +0000 (15:09 +1000)]
Tweak accumulate range
TimePath [Sun, 23 Aug 2015 05:09:04 +0000 (15:09 +1000)]
Allow color coded format string
TimePath [Sun, 23 Aug 2015 04:29:50 +0000 (14:29 +1000)]
Allow custom string format
TimePath [Sun, 23 Aug 2015 04:05:55 +0000 (14:05 +1000)]
Show damage text for spectators
TimePath [Sun, 23 Aug 2015 03:41:09 +0000 (13:41 +1000)]
Don't combine indicators from different players
TimePath [Sun, 23 Aug 2015 03:18:05 +0000 (13:18 +1000)]
Damage text
Mario [Sun, 23 Aug 2015 01:20:38 +0000 (11:20 +1000)]
Add another hook, also reserve some stat slots for the mod
Mario [Sun, 23 Aug 2015 00:11:01 +0000 (10:11 +1000)]
Add a hook to allow hit sounds from custom entities
TimePath [Sat, 22 Aug 2015 11:45:07 +0000 (21:45 +1000)]
Fix auxiliary crosshairs
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`
TimePath [Sat, 22 Aug 2015 04:47:43 +0000 (14:47 +1000)]
Move common vehicle entity fields into the vehicle class
TimePath [Sat, 22 Aug 2015 04:31:25 +0000 (14:31 +1000)]
Remove vehicleid globals
TimePath [Sat, 22 Aug 2015 04:02:49 +0000 (14:02 +1000)]
Load vehicles in the menu with the registry system
TimePath [Sat, 22 Aug 2015 03:28:46 +0000 (13:28 +1000)]
Simplify headers
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
Mario [Tue, 18 Aug 2015 23:22:43 +0000 (09:22 +1000)]
Fix a cvar
Mario [Tue, 18 Aug 2015 23:18:14 +0000 (09:18 +1000)]
Merge branch 'master' into Mario/ons_updates
# Conflicts:
# qcsrc/client/waypointsprites.qc
# qcsrc/common/constants.qh
# qcsrc/common/stats.qh
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