]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoAdd weapons
TimePath [Fri, 21 Aug 2015 09:12:48 +0000 (19:12 +1000)]
Add weapons

9 years agoMerge branch 'master' into TimePath/guide
TimePath [Fri, 21 Aug 2015 08:57:07 +0000 (18:57 +1000)]
Merge branch 'master' into TimePath/guide

# Conflicts:
# qcsrc/Makefile
# qcsrc/common/items/item/ammo.qc
# qcsrc/common/items/item/jetpack.qc
# qcsrc/common/items/item/powerup.qc

9 years agoHook cl_cmd instead of all commands
TimePath [Fri, 21 Aug 2015 08:30:52 +0000 (18:30 +1000)]
Hook cl_cmd instead of all commands

9 years agoCSQC_ConsoleCommand event hook
TimePath [Fri, 21 Aug 2015 07:59:28 +0000 (17:59 +1000)]
CSQC_ConsoleCommand event hook

9 years agoMerge branches 'TimePath/weaponsys' and 'Mario/modpack'
TimePath [Fri, 21 Aug 2015 06:47:39 +0000 (16:47 +1000)]
Merge branches 'TimePath/weaponsys' and 'Mario/modpack'

9 years agoMerge branch 'TimePath/issues/1490'
TimePath [Fri, 21 Aug 2015 06:24:34 +0000 (16:24 +1000)]
Merge branch 'TimePath/issues/1490'

# Conflicts:
# qcsrc/common/monsters/monster/mage.qc

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

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

9 years agoMerge branch 'master' into Mario/is_macro
Mario [Fri, 21 Aug 2015 05:54:22 +0000 (15:54 +1000)]
Merge branch 'master' into Mario/is_macro

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

9 years agoMake TimePath happy
Mario [Fri, 21 Aug 2015 05:50:15 +0000 (15:50 +1000)]
Make TimePath happy

9 years agoBoolinterize
Mario [Fri, 21 Aug 2015 05:45:53 +0000 (15:45 +1000)]
Boolinterize

9 years agoSend effects to client, allows mismatching effectinfo.txt
Mario [Fri, 21 Aug 2015 05:31:38 +0000 (15:31 +1000)]
Send effects to client, allows mismatching effectinfo.txt

9 years agoMerge branch 'maint'
Rudolf Polzer [Thu, 20 Aug 2015 17:19:07 +0000 (19:19 +0200)]
Merge branch 'maint'

9 years agoMerge branch 'maint' (early part)
Rudolf Polzer [Thu, 20 Aug 2015 17:19:03 +0000 (19:19 +0200)]
Merge branch 'maint' (early part)

9 years agoTransifex sync (maint only). xonotic-v0.8.1
Rudolf Polzer [Thu, 20 Aug 2015 17:18:47 +0000 (19:18 +0200)]
Transifex sync (maint only).

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

9 years agoMerge branch 'maint'
Rudolf Polzer [Wed, 19 Aug 2015 23:31:23 +0000 (01:31 +0200)]
Merge branch 'maint'

9 years agoMerge branch 'maint' (early part before Transifex)
Rudolf Polzer [Wed, 19 Aug 2015 23:31:01 +0000 (01:31 +0200)]
Merge branch 'maint' (early part before Transifex)

9 years agoTransifex sync (maint stuff).
Rudolf Polzer [Wed, 19 Aug 2015 23:29:55 +0000 (01:29 +0200)]
Transifex sync (maint stuff).

9 years agoTransifex sync.
Rudolf Polzer [Wed, 19 Aug 2015 23:27:03 +0000 (01:27 +0200)]
Transifex sync.

9 years agoFix Large Armor and Mega Health detection in Quake / Quake 3 maps. Fixes issues in...
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.

9 years agoMenu support
TimePath [Wed, 19 Aug 2015 11:38:52 +0000 (21:38 +1000)]
Menu support

9 years agoMutator registry
TimePath [Wed, 19 Aug 2015 10:55:21 +0000 (20:55 +1000)]
Mutator registry

9 years agoMove mutator system to common
TimePath [Wed, 19 Aug 2015 00:04:12 +0000 (10:04 +1000)]
Move mutator system to common

9 years agoThis is not a commit
Mario [Tue, 18 Aug 2015 23:51:48 +0000 (09:51 +1000)]
This is not a commit

9 years agoAdd IS_MACRO macro for matthiaskrgr
Mario [Tue, 18 Aug 2015 23:47:19 +0000 (09:47 +1000)]
Add IS_MACRO macro for matthiaskrgr

9 years agoAdd IS_MONSTER, IS_TURRET & IS_VEHICLE macros
Mario [Tue, 18 Aug 2015 23:42:25 +0000 (09:42 +1000)]
Add IS_MONSTER, IS_TURRET & IS_VEHICLE macros

9 years agoMerge branch 'master' into Mario/modpack
TimePath [Tue, 18 Aug 2015 09:41:17 +0000 (19:41 +1000)]
Merge branch 'master' into Mario/modpack

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

9 years agoSupport varying aspect ratios
TimePath [Mon, 17 Aug 2015 08:48:47 +0000 (18:48 +1000)]
Support varying aspect ratios

9 years agoImprove wrapping
TimePath [Mon, 17 Aug 2015 07:51:47 +0000 (17:51 +1000)]
Improve wrapping

9 years agoAdd nades topic
TimePath [Mon, 17 Aug 2015 07:21:38 +0000 (17:21 +1000)]
Add nades topic

9 years agoAdd buffs topic
TimePath [Mon, 17 Aug 2015 07:18:00 +0000 (17:18 +1000)]
Add buffs topic

9 years agoAdd items topic
TimePath [Mon, 17 Aug 2015 07:13:19 +0000 (17:13 +1000)]
Add items topic

9 years agoReflectively list entity fields as description for unknown entities in developer...
TimePath [Mon, 17 Aug 2015 06:38:53 +0000 (16:38 +1000)]
Reflectively list entity fields as description for unknown entities in developer mode

9 years agoFix handling of unknown entities
TimePath [Mon, 17 Aug 2015 06:27:16 +0000 (16:27 +1000)]
Fix handling of unknown entities

9 years agoWrap the description
TimePath [Mon, 17 Aug 2015 06:16:37 +0000 (16:16 +1000)]
Wrap the description

9 years agoDon't derive from XonoticCreditsList
TimePath [Mon, 17 Aug 2015 04:58:04 +0000 (14:58 +1000)]
Don't derive from XonoticCreditsList

9 years agoEnable any entity to control how it looks in the menu
TimePath [Mon, 17 Aug 2015 04:46:34 +0000 (14:46 +1000)]
Enable any entity to control how it looks in the menu

9 years agoCleanup
TimePath [Mon, 17 Aug 2015 04:13:09 +0000 (14:13 +1000)]
Cleanup

9 years agoAdd description pane
TimePath [Sun, 16 Aug 2015 12:12:23 +0000 (22:12 +1000)]
Add description pane

9 years agoFix division by 0
TimePath [Sun, 16 Aug 2015 11:04:22 +0000 (21:04 +1000)]
Fix division by 0

9 years agoSupport filtering
TimePath [Sun, 16 Aug 2015 10:38:47 +0000 (20:38 +1000)]
Support filtering

9 years agoAdd a debug menu
TimePath [Sun, 16 Aug 2015 10:29:17 +0000 (20:29 +1000)]
Add a debug menu

9 years agoSupport switching between data sources
TimePath [Sun, 16 Aug 2015 10:05:39 +0000 (20:05 +1000)]
Support switching between data sources

9 years agoCreate a DataSource class
TimePath [Sun, 16 Aug 2015 08:37:52 +0000 (18:37 +1000)]
Create a DataSource class

9 years agoActually use this.entryIcon and this.entryName
TimePath [Sun, 16 Aug 2015 08:08:10 +0000 (18:08 +1000)]
Actually use this.entryIcon and this.entryName

9 years agoInitial guide menu
TimePath [Sun, 16 Aug 2015 04:32:29 +0000 (14:32 +1000)]
Initial guide menu

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

9 years agoUpdate notifications.cfg
Mario [Sat, 15 Aug 2015 21:03:12 +0000 (07:03 +1000)]
Update notifications.cfg

9 years agoMerge branch 'TimePath/div0monsters' into 'maint'
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

9 years agoFix division by zero in sv_monsters.qc
TimePath [Sat, 15 Aug 2015 11:15:01 +0000 (21:15 +1000)]
Fix division by zero in sv_monsters.qc

9 years agoConvert remaining calls
TimePath [Sat, 15 Aug 2015 10:00:31 +0000 (20:00 +1000)]
Convert remaining calls

9 years agoConvert more calls
TimePath [Sat, 15 Aug 2015 09:40:46 +0000 (19:40 +1000)]
Convert more calls

9 years agoConvert more calls
TimePath [Sat, 15 Aug 2015 08:01:42 +0000 (18:01 +1000)]
Convert more calls

9 years agoWork around `SZ_GetSpace: overflow`
TimePath [Sat, 15 Aug 2015 07:25:53 +0000 (17:25 +1000)]
Work around `SZ_GetSpace: overflow`

9 years agoConvert more calls
TimePath [Sat, 15 Aug 2015 07:15:57 +0000 (17:15 +1000)]
Convert more calls

9 years agoConvert more calls
TimePath [Sat, 15 Aug 2015 06:58:25 +0000 (16:58 +1000)]
Convert more calls

9 years agoConvert some calls
TimePath [Sat, 15 Aug 2015 06:38:11 +0000 (16:38 +1000)]
Convert some calls

9 years agoEnable mutator calls to take parameters
TimePath [Sat, 15 Aug 2015 05:54:30 +0000 (15:54 +1000)]
Enable mutator calls to take parameters

9 years agoCleanup mutators
TimePath [Fri, 15 May 2015 03:28:11 +0000 (13:28 +1000)]
Cleanup mutators

9 years agoMake clean gamecode expansion possible
TimePath [Sat, 15 Aug 2015 01:59:54 +0000 (11:59 +1000)]
Make clean gamecode expansion possible

9 years agoUse ATTRIB
TimePath [Fri, 14 Aug 2015 10:27:33 +0000 (20:27 +1000)]
Use ATTRIB

9 years agoRemove redundant get_weaponinfo calls
TimePath [Fri, 14 Aug 2015 10:11:52 +0000 (20:11 +1000)]
Remove redundant get_weaponinfo calls

9 years agos/WEP_(ID)/WEP_$1.m_id/
TimePath [Fri, 14 Aug 2015 09:50:48 +0000 (19:50 +1000)]
s/WEP_(ID)/WEP_$1.m_id/

9 years agoMigrate REGISTER_WEAPON to registry system
TimePath [Fri, 14 Aug 2015 08:14:46 +0000 (18:14 +1000)]
Migrate REGISTER_WEAPON to registry system

9 years agoUse explicit IMPLEMENTATION guard
TimePath [Fri, 14 Aug 2015 06:18:05 +0000 (16:18 +1000)]
Use explicit IMPLEMENTATION guard

9 years agoUpdate iterators
TimePath [Fri, 14 Aug 2015 04:40:42 +0000 (14:40 +1000)]
Update iterators

9 years agoMerge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'
TimePath [Fri, 14 Aug 2015 03:53:32 +0000 (13:53 +1000)]
Merge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'

9 years agoObjectify buffs
TimePath [Fri, 14 Aug 2015 00:30:33 +0000 (10:30 +1000)]
Objectify buffs

9 years agoAllow custom construction of registered objects
TimePath [Fri, 14 Aug 2015 00:25:57 +0000 (10:25 +1000)]
Allow custom construction of registered objects

9 years agoObjectify gametypes
TimePath [Fri, 14 Aug 2015 00:11:36 +0000 (10:11 +1000)]
Objectify gametypes

9 years agoAdd CONSTRUCT for super-initialization
TimePath [Fri, 14 Aug 2015 00:10:51 +0000 (10:10 +1000)]
Add CONSTRUCT for super-initialization

9 years agoImplement CONSTRUCTOR
TimePath [Thu, 13 Aug 2015 23:01:14 +0000 (09:01 +1000)]
Implement CONSTRUCTOR

9 years agoCleanup OO macros
TimePath [Thu, 13 Aug 2015 08:13:53 +0000 (18:13 +1000)]
Cleanup OO macros

9 years agoAdd an explanation, resolving a FIXME.
Rudolf Polzer [Wed, 12 Aug 2015 23:48:44 +0000 (01:48 +0200)]
Add an explanation, resolving a FIXME.

9 years agoWe are now in code freeze. Any merge requests for issues to be fixed before release...
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

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

9 years agoObjectify nades
TimePath [Wed, 12 Aug 2015 10:48:16 +0000 (20:48 +1000)]
Objectify nades

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

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

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

9 years agoRefer to item flags from item definitions
TimePath [Tue, 11 Aug 2015 10:07:55 +0000 (20:07 +1000)]
Refer to item flags from item definitions

9 years agoAdd ammoPic attribute
TimePath [Tue, 11 Aug 2015 08:52:22 +0000 (18:52 +1000)]
Add ammoPic attribute

9 years agoRe-use generic registry code for monsters
TimePath [Wed, 12 Aug 2015 08:17:57 +0000 (18:17 +1000)]
Re-use generic registry code for monsters

9 years agoNamespace registry functions
TimePath [Wed, 12 Aug 2015 08:17:43 +0000 (18:17 +1000)]
Namespace registry functions

9 years agoIncrease the alpha value of loading itemstime icons
Severin Meyer [Wed, 12 Aug 2015 00:46:13 +0000 (02:46 +0200)]
Increase the alpha value of loading itemstime icons

9 years agoAdd Luma itemstime icons and update Luma simple items
Severin Meyer [Wed, 12 Aug 2015 00:38:32 +0000 (02:38 +0200)]
Add Luma itemstime icons and update Luma simple items

9 years agoUpdate buff and powerup icons to match the rest of the theme
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

9 years agoFor the itemstime panel, use existing strength and shield icons instead of adding...
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

9 years agoIcons are inherited from the default HUD theme, therefore it is unnecessary to add...
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

9 years agoMutators --> Mutators...
terencehill [Tue, 11 Aug 2015 19:55:32 +0000 (21:55 +0200)]
Mutators --> Mutators...

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

9 years agoRename a variable
terencehill [Tue, 11 Aug 2015 18:34:00 +0000 (20:34 +0200)]
Rename a variable

9 years agoUse the formula with exp, as it's more mathematically correct
terencehill [Tue, 11 Aug 2015 18:31:34 +0000 (20:31 +0200)]
Use the formula with exp, as it's more mathematically correct

9 years agoMerge branch 'master' into terencehill/menu_listbox_changes
terencehill [Tue, 11 Aug 2015 17:48:06 +0000 (19:48 +0200)]
Merge branch 'master' into terencehill/menu_listbox_changes

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

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

9 years agoExtract registry functionality
TimePath [Tue, 11 Aug 2015 03:04:45 +0000 (13:04 +1000)]
Extract registry functionality