xonotic/xonotic-data.pk3dir.git
9 years agoAdd a default bind for minigames in the binds config
Mario [Wed, 8 Jul 2015 15:12:04 +0000 (01:12 +1000)]
Add a default bind for minigames in the binds config

9 years agoTargarize some other game's pieces
Mario [Wed, 8 Jul 2015 15:07:33 +0000 (01:07 +1000)]
Targarize some other game's pieces

9 years agoUse .tga for pieces of c4
Mario [Wed, 8 Jul 2015 15:05:59 +0000 (01:05 +1000)]
Use .tga for pieces of c4

9 years agoAdd the new minigames
Mario [Wed, 8 Jul 2015 15:02:49 +0000 (01:02 +1000)]
Add the new minigames

9 years agoMerge branch 'master' into Mario/minigames_merge
Mario [Wed, 8 Jul 2015 14:25:06 +0000 (00:25 +1000)]
Merge branch 'master' into Mario/minigames_merge

Conflicts:
qcsrc/client/hud.qh
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/g_tetris.qc

9 years agoMerge branch 'TimePath/itemsys' into 'master'
Mario [Sat, 4 Jul 2015 03:06:12 +0000 (03:06 +0000)]
Merge branch 'TimePath/itemsys' into 'master'

TimePath/itemsys: an item and inventory system

This system and the weapon system seem to overlap quite a bit and would benefit from being combined, currently this one ignores weapons completely.

Current state:
 * All items except weapons are spawned using this system
 * Tracks item pickups from clients and networks their inventories to them
 * Items can define their own behaviour to actions without conditional logic throughout the code

See merge request !128

9 years agoMerge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys
TimePath [Fri, 3 Jul 2015 06:29:25 +0000 (16:29 +1000)]
Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/menu/menu.qc
# qcsrc/menu/progs.src
# qcsrc/server/g_world.qc

9 years agoMerge branch 'terencehill/menu_remove_tab_title' into 'master'
Mario [Fri, 3 Jul 2015 05:43:39 +0000 (05:43 +0000)]
Merge branch 'terencehill/menu_remove_tab_title' into 'master'

Menu: Remove tab title attribute

* Don't set the title for tabs since it's the tab button that holds and displays the tab title
* Don't spawn dialog borders (including title) for each tab contained in a dialog

I started this branch when I noticed that a few tab titles didn't match the corresponding tab button text, thus adding unused strings for translation (e.g. "Join" vs "Servers", "Demo" vs "Demos", etc...)

See merge request !126

9 years agoMerge branch 'terencehill/listbox_item_highlight' into 'master'
Mario [Fri, 3 Jul 2015 05:36:13 +0000 (05:36 +0000)]
Merge branch 'terencehill/listbox_item_highlight' into 'master'

Listbox: highlight item under the cursor

* Highlight listbox focused items with a customizable (by skin attributes) fade effect; the same effect is applied to the crosshair picker and to the charmap too

* Crosshair picker now has customizable (by skin attributes) color and alpha, similarly to the charmap ones

* The dot crosshair now appears always white in the crosshair picker

* The crosshair preview is no longer highlighted, nor clickable as it's no longer a button (made no sense)

About the implementation:
Changed the crosshair picker and the crosshair preview from a set of special radio buttons to 2 new different items: a picker with code based on the charmap code and a preview. More precisely the crosshair picker extends the new Picker superclass (same for the charmap).

See merge request !122

9 years agoMerge branch 'TimePath/issues/1472' into 'master'
Mario [Fri, 3 Jul 2015 00:20:40 +0000 (00:20 +0000)]
Merge branch 'TimePath/issues/1472' into 'master'

Ignore sv_mapformat_is_quake3 when checking cvar purity. Fixes #1472

See merge request !138

9 years agoMerge branch 'TimePath/module_roots' into 'master'
Mario [Fri, 3 Jul 2015 00:19:53 +0000 (00:19 +0000)]
Merge branch 'TimePath/module_roots' into 'master'

Light refactoring: rename module roots to `all` for consistency

See merge request !131

9 years agoMerge branch 'terencehill/hud_configure' into 'master'
Mario [Thu, 2 Jul 2015 10:37:25 +0000 (10:37 +0000)]
Merge branch 'terencehill/hud_configure' into 'master'

HUD editor changes

A few changes to the hud editor

See merge request !120

9 years agoMerge branch 'Melanosuchus/vote_caller' into 'master'
Mario [Thu, 2 Jul 2015 09:13:50 +0000 (09:13 +0000)]
Merge branch 'Melanosuchus/vote_caller' into 'master'

Store the name of the vote caller

If only the entity of the caller is stored, there can be some inconsistencies.

Example: If a player leaves the server after calling the vote, the result will show an empty name.

This branch fixes such inconsistencies, while the normal flow isn't affected.

(ie: Votes from the server still show the correct name and if a player changes their name, messages will show the new name)

See merge request !127

9 years agoIgnore sv_mapformat_is_quake2 too
TimePath [Tue, 30 Jun 2015 04:27:27 +0000 (14:27 +1000)]
Ignore sv_mapformat_is_quake2 too

9 years agoIgnore sv_mapformat_is_quake3 when checking cvar purity. Fixes #1472
TimePath [Tue, 30 Jun 2015 04:20:57 +0000 (14:20 +1000)]
Ignore sv_mapformat_is_quake3 when checking cvar purity. Fixes #1472

9 years agoBump gameversion.
Rudolf Polzer [Mon, 1 Jun 2015 09:15:31 +0000 (11:15 +0200)]
Bump gameversion.

9 years agoReplace `MAP(IDENTITY)` with `UNWORDS`
TimePath [Wed, 13 May 2015 23:32:50 +0000 (09:32 +1000)]
Replace `MAP(IDENTITY)` with `UNWORDS`

9 years agoReplace `IF(ALL,` with `APPLY(`
TimePath [Wed, 13 May 2015 23:27:58 +0000 (09:27 +1000)]
Replace `IF(ALL,` with `APPLY(`

9 years agoTidy up
TimePath [Wed, 13 May 2015 05:54:31 +0000 (15:54 +1000)]
Tidy up

9 years agoInventory system
TimePath [Wed, 13 May 2015 05:46:07 +0000 (15:46 +1000)]
Inventory system
Counts collected items and sends them with delta compression

9 years agoAdd an item dumping command
TimePath [Wed, 13 May 2015 00:54:31 +0000 (10:54 +1000)]
Add an item dumping command

9 years agoCleanup
TimePath [Wed, 13 May 2015 00:34:15 +0000 (10:34 +1000)]
Cleanup

9 years agoAdd instagib items
TimePath [Tue, 12 May 2015 10:27:11 +0000 (20:27 +1000)]
Add instagib items

9 years agoAdd jetpack
TimePath [Tue, 12 May 2015 10:09:44 +0000 (20:09 +1000)]
Add jetpack
Fix incorrect ammo from ammo pickups

9 years agoFix items not respawning
TimePath [Tue, 12 May 2015 09:35:15 +0000 (19:35 +1000)]
Fix items not respawning
LMS mutator anyone?

9 years agoAdd powerups
TimePath [Tue, 12 May 2015 09:15:29 +0000 (19:15 +1000)]
Add powerups

9 years agoLight refactoring: rename module roots to `all` for consistency
TimePath [Tue, 12 May 2015 07:58:00 +0000 (17:58 +1000)]
Light refactoring: rename module roots to `all` for consistency

9 years agoMove LAMBDA
TimePath [Tue, 12 May 2015 07:07:27 +0000 (17:07 +1000)]
Move LAMBDA

9 years agoRemove SPAWNTIMES enum
TimePath [Tue, 12 May 2015 07:02:16 +0000 (17:02 +1000)]
Remove SPAWNTIMES enum

9 years agoSupport #ifdef in item declarations
TimePath [Tue, 12 May 2015 06:42:36 +0000 (16:42 +1000)]
Support #ifdef in item declarations

9 years agoBranchless BITSET
TimePath [Tue, 12 May 2015 04:03:37 +0000 (14:03 +1000)]
Branchless BITSET
Kudos to graphitemaster

9 years agoDo something awesome with macros
TimePath [Tue, 12 May 2015 03:26:25 +0000 (13:26 +1000)]
Do something awesome with macros

10 years agoPicker: apply the fade effect even focusing another cell through the keyboard; contex...
terencehill [Mon, 11 May 2015 17:47:02 +0000 (19:47 +0200)]
Picker: apply the fade effect even focusing another cell through the keyboard; contextually, improve HOME/END key functions so that they skip invalid cells

10 years agoMerge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic...
terencehill [Sun, 10 May 2015 23:09:24 +0000 (01:09 +0200)]
Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into terencehill/menu_remove_tab_title

Conflicts:
qcsrc/menu/item/dialog.qc

10 years agoDon't spawn dialog borders (including title) for each tab contained in a dialog
terencehill [Sun, 10 May 2015 22:57:24 +0000 (00:57 +0200)]
Don't spawn dialog borders (including title) for each tab contained in a dialog

10 years agoRevert previous change of item/tab.qc: title must be empty otherwise the default...
terencehill [Sun, 10 May 2015 19:52:07 +0000 (21:52 +0200)]
Revert previous change of item/tab.qc: title must be empty otherwise the default title ("Form1") gets inherited from the dialog superclass

10 years agoUse the new item system for health and armor
TimePath [Sun, 10 May 2015 12:15:27 +0000 (22:15 +1000)]
Use the new item system for health and armor

10 years agoUse the new item system for ammo
TimePath [Sun, 10 May 2015 11:12:47 +0000 (21:12 +1000)]
Use the new item system for ammo

10 years agoInitial item system setup
TimePath [Sun, 10 May 2015 09:19:51 +0000 (19:19 +1000)]
Initial item system setup

10 years agoStore the name of the vote caller
Mattia Basaglia [Sun, 10 May 2015 09:10:08 +0000 (11:10 +0200)]
Store the name of the vote caller

10 years agoMerge remote-tracking branch 'origin/master' into terencehill/listbox_item_highlight
TimePath [Sun, 10 May 2015 03:56:21 +0000 (13:56 +1000)]
Merge remote-tracking branch 'origin/master' into terencehill/listbox_item_highlight

10 years agoMerge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title
TimePath [Sun, 10 May 2015 03:41:57 +0000 (13:41 +1000)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

# Conflicts:
# qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
# qcsrc/menu/xonotic/dialog_settings_game_hud.qc
# qcsrc/menu/xonotic/dialog_settings_game_messages.qc
# qcsrc/menu/xonotic/dialog_settings_game_model.qc
# qcsrc/menu/xonotic/dialog_settings_game_view.qc
# qcsrc/menu/xonotic/dialog_settings_game_weapons.qc

10 years agoMerge remote-tracking branch 'origin/master' into terencehill/hud_configure
TimePath [Sun, 10 May 2015 03:39:24 +0000 (13:39 +1000)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_configure

# Conflicts:
# qcsrc/menu/xonotic/mainwindow.qc

10 years agoMerge branch 'TimePath/qc_updates' into 'master'
Mario [Sun, 10 May 2015 03:15:51 +0000 (03:15 +0000)]
Merge branch 'TimePath/qc_updates' into 'master'

Merge branch TimePath/qc_updates (XXL merge request, but no functional changes or file relocations)

Major:
* Stops relying on the progs.src order by fixing all the `#include` lists, prerequisite for removing `-Wno-field-redeclared`. Test script included at `test/compilationunit.sh`

Minor:
* `float` -> `int`
* `var .float fld; ent.fld` -> `var .float fld; ent.(fld)`, less magic
* menu `spawnXXX()` -> `NEW(XXX)`, allows for overloaded constructors to replace `makeXXX(..)`
* some entity class annotations to serve as documentation, and later type checking

See merge request !124

10 years agoRemove useless title attribute (and related attributes) from the tab class, the tab...
terencehill [Fri, 8 May 2015 22:27:52 +0000 (00:27 +0200)]
Remove useless title attribute (and related attributes) from the tab class, the tab button already holds the tab title

10 years agoFix crosshair picker indentation
terencehill [Fri, 8 May 2015 00:00:49 +0000 (02:00 +0200)]
Fix crosshair picker indentation

10 years agoAdd two useful macros
TimePath [Wed, 6 May 2015 09:30:38 +0000 (19:30 +1000)]
Add two useful macros

10 years agoRename the underscore headers
TimePath [Wed, 6 May 2015 09:10:40 +0000 (19:10 +1000)]
Rename the underscore headers

10 years agoExplain `CLASS` and `NEW` macros
TimePath [Wed, 6 May 2015 08:38:18 +0000 (08:38 +0000)]
Explain `CLASS` and `NEW` macros

10 years agoFix typedefs
TimePath [Wed, 6 May 2015 06:31:46 +0000 (16:31 +1000)]
Fix typedefs

10 years agoUse stock dpdefs
TimePath [Wed, 6 May 2015 06:12:05 +0000 (16:12 +1000)]
Use stock dpdefs

10 years agoMake menu includes order insensitive
TimePath [Sun, 3 May 2015 23:24:19 +0000 (09:24 +1000)]
Make menu includes order insensitive

10 years ago#include base classes
TimePath [Sun, 3 May 2015 23:04:29 +0000 (09:04 +1000)]
#include base classes

10 years ago#include base classes
TimePath [Sun, 3 May 2015 22:50:36 +0000 (08:50 +1000)]
#include base classes

10 years agoDon't accumulate the beginning of the constructor
TimePath [Sun, 3 May 2015 22:25:19 +0000 (08:25 +1000)]
Don't accumulate the beginning of the constructor

10 years agoSort menu classes
TimePath [Sun, 3 May 2015 22:22:35 +0000 (08:22 +1000)]
Sort menu classes

10 years agoTidy up OO helpers
TimePath [Sun, 3 May 2015 21:54:22 +0000 (07:54 +1000)]
Tidy up OO helpers

10 years agoForgot to patch this file in the previous commit
terencehill [Sun, 3 May 2015 16:15:35 +0000 (18:15 +0200)]
Forgot to patch this file in the previous commit

10 years agoAllow custom color and alpha values for the crosshair picker (like it is for the...
terencehill [Sun, 3 May 2015 16:11:03 +0000 (18:11 +0200)]
Allow custom color and alpha values for the crosshair picker (like it is for the charmap)

10 years agoListbox / Picker: Implement item fading in a different way so that it gets influenced...
terencehill [Sun, 3 May 2015 14:39:44 +0000 (16:39 +0200)]
Listbox / Picker: Implement item fading in a different way so that it gets influenced by menu_slowmo

10 years agoOptimize cellToCrosshair function
terencehill [Sun, 3 May 2015 11:39:49 +0000 (13:39 +0200)]
Optimize cellToCrosshair function

10 years agoMerge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())
TimePath [Sun, 3 May 2015 11:39:11 +0000 (21:39 +1000)]
Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

10 years agoHighlight the selected cell in the picker
terencehill [Sun, 3 May 2015 11:38:12 +0000 (13:38 +0200)]
Highlight the selected cell in the picker

10 years agoCleanup server progs.src
TimePath [Sun, 3 May 2015 06:34:58 +0000 (16:34 +1000)]
Cleanup server progs.src

10 years agoCleanup weapons #includes
TimePath [Sun, 3 May 2015 06:16:26 +0000 (16:16 +1000)]
Cleanup weapons #includes

10 years agoFix client compile
TimePath [Sun, 3 May 2015 05:09:20 +0000 (15:09 +1000)]
Fix client compile

10 years agoCleanup vehicle #includes
TimePath [Sun, 3 May 2015 05:00:21 +0000 (15:00 +1000)]
Cleanup vehicle #includes

10 years agoFix more server #includes
TimePath [Sun, 3 May 2015 03:19:14 +0000 (13:19 +1000)]
Fix more server #includes

10 years agoModularise commands
TimePath [Sun, 3 May 2015 02:06:55 +0000 (12:06 +1000)]
Modularise commands

10 years agoRemove crosshair images from the skins
terencehill [Sat, 2 May 2015 22:54:23 +0000 (00:54 +0200)]
Remove crosshair images from the skins

10 years agoDon't color the dot in the crosshair preview
terencehill [Sat, 2 May 2015 22:43:31 +0000 (00:43 +0200)]
Don't color the dot in the crosshair preview

10 years agoMake Charmap and CrosshairPicker subclasses of the class Picker
terencehill [Sat, 2 May 2015 22:30:57 +0000 (00:30 +0200)]
Make Charmap and CrosshairPicker subclasses of the class Picker

10 years agoMake most server includes order insensitive
TimePath [Sat, 2 May 2015 12:28:02 +0000 (22:28 +1000)]
Make most server includes order insensitive

10 years agoCreate common client header
TimePath [Sat, 2 May 2015 05:15:44 +0000 (15:15 +1000)]
Create common client header

10 years agoFix MCU client compile
TimePath [Sat, 2 May 2015 04:48:31 +0000 (14:48 +1000)]
Fix MCU client compile
(multiple compilation units)

10 years agoRemove direct server #includes from client
TimePath [Sat, 2 May 2015 04:40:48 +0000 (14:40 +1000)]
Remove direct server #includes from client

10 years agoSort #includes
TimePath [Sat, 2 May 2015 03:14:27 +0000 (13:14 +1000)]
Sort #includes

10 years agoMake crosshair picker code similar to the charmap's in order to simplify cell highlig...
terencehill [Fri, 1 May 2015 21:08:10 +0000 (23:08 +0200)]
Make crosshair picker code similar to the charmap's in order to simplify cell highlighting (each single crosshair was a special button). Add a custom simplified class for the crosshair preview too (it's not a button anymore).

10 years agoMake client includes order insensitive
TimePath [Fri, 1 May 2015 13:46:42 +0000 (23:46 +1000)]
Make client includes order insensitive

10 years agoAvoid including the same file twice in progs.src
TimePath [Fri, 1 May 2015 08:57:44 +0000 (18:57 +1000)]
Avoid including the same file twice in progs.src

10 years agoAdd the fade effect in the charmap too
terencehill [Thu, 30 Apr 2015 20:21:22 +0000 (22:21 +0200)]
Add the fade effect in the charmap too

10 years agoMake work menu_showboxes with the charmap
terencehill [Tue, 28 Apr 2015 18:34:48 +0000 (20:34 +0200)]
Make work menu_showboxes with the charmap

10 years agoBetter names for 3 fields
terencehill [Mon, 27 Apr 2015 19:11:16 +0000 (21:11 +0200)]
Better names for 3 fields

10 years agoAdd skin attributes for listbox focused items and allow customization of the fade...
terencehill [Mon, 27 Apr 2015 17:45:25 +0000 (19:45 +0200)]
Add skin attributes for listbox focused items and allow customization of the fade effect

10 years agoListbox: highlight item under the cursor
terencehill [Sun, 26 Apr 2015 12:33:56 +0000 (14:33 +0200)]
Listbox: highlight item under the cursor

10 years agoDefine client entity classes
TimePath [Sun, 26 Apr 2015 07:32:03 +0000 (17:32 +1000)]
Define client entity classes

10 years agoReclaim the `new` keyword for entity classes
TimePath [Sun, 26 Apr 2015 06:46:37 +0000 (16:46 +1000)]
Reclaim the `new` keyword for entity classes

10 years agoMake pointer to member usage explicit
TimePath [Sun, 26 Apr 2015 06:07:49 +0000 (16:07 +1000)]
Make pointer to member usage explicit

10 years agoDeclare more ints as ints
TimePath [Sat, 25 Apr 2015 06:32:36 +0000 (16:32 +1000)]
Declare more ints as ints

10 years agoDeclare more ints as ints
TimePath [Sat, 25 Apr 2015 06:17:02 +0000 (16:17 +1000)]
Declare more ints as ints

10 years agoDeclare more ints as ints
TimePath [Sat, 25 Apr 2015 06:00:13 +0000 (16:00 +1000)]
Declare more ints as ints

10 years agoRevert spawn_furthest to 0.5 (half random, half furthest, works better for small...
Mario [Sun, 26 Apr 2015 04:21:16 +0000 (14:21 +1000)]
Revert spawn_furthest to 0.5 (half random, half furthest, works better for small maps)

10 years agoMerge branch 'master' into Melanosuchus/minigames
Mario [Sat, 25 Apr 2015 15:25:39 +0000 (01:25 +1000)]
Merge branch 'master' into Melanosuchus/minigames

Conflicts:
qcsrc/server/autocvars.qh

10 years agoFix a few more floats
Mario [Sat, 25 Apr 2015 04:23:53 +0000 (14:23 +1000)]
Fix a few more floats

10 years agoFix copy of ammo_none in defs.qh
Mario [Sat, 25 Apr 2015 04:21:18 +0000 (14:21 +1000)]
Fix copy of ammo_none in defs.qh

10 years agoFew more floats to ints/bools
Mario [Sat, 25 Apr 2015 04:18:57 +0000 (14:18 +1000)]
Few more floats to ints/bools

10 years agoFix a few more floats in arrays
Mario [Sat, 25 Apr 2015 04:16:22 +0000 (14:16 +1000)]
Fix a few more floats in arrays

10 years agoBoolinterize hud.qc
Mario [Sat, 25 Apr 2015 04:03:18 +0000 (14:03 +1000)]
Boolinterize hud.qc

10 years agoFix some more floats in arrays
Mario [Sat, 25 Apr 2015 02:52:46 +0000 (12:52 +1000)]
Fix some more floats in arrays

10 years agoMerge branch 'TimePath/lint' into 'master'
Mario [Sat, 25 Apr 2015 02:15:22 +0000 (02:15 +0000)]
Merge branch 'TimePath/lint' into 'master'

TimePath/lint

A few changes to get my static analysis tool working

See merge request !121