]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoRe-arrange gametypes in the menu
Mario [Sat, 11 Jul 2015 12:28:24 +0000 (22:28 +1000)]
Re-arrange gametypes in the menu

9 years agoMerge branch 'TimePath/itemsys_fix'
Mario [Sat, 11 Jul 2015 04:56:40 +0000 (14:56 +1000)]
Merge branch 'TimePath/itemsys_fix'

9 years agoFix an oversight in the item system
TimePath [Fri, 10 Jul 2015 10:12:45 +0000 (20:12 +1000)]
Fix an oversight in the item system

9 years agoUpdate credits
Mirio [Thu, 9 Jul 2015 19:23:22 +0000 (21:23 +0200)]
Update credits

9 years agoMerge branch 'terencehill/shuffleteams_fix' into 'master'
Mario [Thu, 9 Jul 2015 08:27:12 +0000 (08:27 +0000)]
Merge branch 'terencehill/shuffleteams_fix' into 'master'

shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"

See merge request !136

9 years agoMerge branch 'Mario/physics' into 'master'
Mario [Thu, 9 Jul 2015 08:23:27 +0000 (08:23 +0000)]
Merge branch 'Mario/physics' into 'master'

Merge branch Mario/physics (M merge request)

Adds an option to allow clients to change their physics set (e.g. defrag, nexuiz, xonotic etc).
Handling is fully server side and client predicted, so no exploits here...

See merge request !143

9 years agoBoolerize Physics_Valid
Mario [Thu, 9 Jul 2015 07:39:37 +0000 (17:39 +1000)]
Boolerize Physics_Valid

9 years agoFix hardcoded constant values for cvar_type
Mario [Thu, 9 Jul 2015 07:39:06 +0000 (17:39 +1000)]
Fix hardcoded constant values for cvar_type

9 years agoAdd bones physics and increase jump velocity for Xonotic physics
Mario [Thu, 9 Jul 2015 07:35:04 +0000 (17:35 +1000)]
Add bones physics and increase jump velocity for Xonotic physics

9 years agoMerge branch 'master' into Mario/physics
Mario [Thu, 9 Jul 2015 07:19:29 +0000 (17:19 +1000)]
Merge branch 'master' into Mario/physics

Conflicts:
qcsrc/server/autocvars.qh

9 years agoStart with most weapons & ammo in freeze tag
Mario [Thu, 9 Jul 2015 03:38:08 +0000 (13:38 +1000)]
Start with most weapons & ammo in freeze tag

9 years agoHide g_invasion_teams from the impurity checks
Mario [Thu, 9 Jul 2015 01:49:32 +0000 (11:49 +1000)]
Hide g_invasion_teams from the impurity checks

9 years agoMerge branch 'packer-/impure_team_cvars' into 'master'
Mario [Thu, 9 Jul 2015 01:38:50 +0000 (01:38 +0000)]
Merge branch 'packer-/impure_team_cvars' into 'master'

add g_tdm_teams_override and g_domination_teams_override to cvar whitelist

Modifying default team number for gametype tdm or dom makes server impure

g_tdm_teams_override "3" // "0"
g_domination_teams_override "3" // "0"

ca, freezetag and keyhunt are already whitelisted
grep teams_override g_world.qc
BADCVAR("g_ca_teams_override");
BADCVAR("g_freezetag_teams_override");
BADCVAR("g_keyhunt_teams_override");

See merge request !139

9 years agoMerge branch 'terencehill/accelerometer_fix' into 'master'
Mario [Thu, 9 Jul 2015 01:36:23 +0000 (01:36 +0000)]
Merge branch 'terencehill/accelerometer_fix' into 'master'

Minor fixes / improvements to the accelerometer

Fixes / improvements aiming to smooth acceleration values and to make them more readable

See merge request !140

9 years agoadd g_tdm_teams_override and g_domination_teams_override to cvar whitelist
packer [Sun, 5 Jul 2015 15:59:17 +0000 (17:59 +0200)]
add g_tdm_teams_override and g_domination_teams_override to cvar whitelist

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 branch 'master' into terencehill/accelerometer_fix
terencehill [Fri, 3 Jul 2015 13:49:33 +0000 (15:49 +0200)]
Merge branch 'master' into terencehill/accelerometer_fix

9 years agoMake numeric values of speed and acceleration more readable by limiting the refresh...
terencehill [Fri, 3 Jul 2015 13:24:28 +0000 (15:24 +0200)]
Make numeric values of speed and acceleration more readable by limiting the refresh rate (cvar hud_panel_physics_update_interval)

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 agoOptimize code by anticipating hud_panel_physics_text check
terencehill [Mon, 29 Jun 2015 16:08:22 +0000 (18:08 +0200)]
Optimize code by anticipating hud_panel_physics_text check

9 years agoDon't show negative 0 values in the accelerometer
terencehill [Mon, 29 Jun 2015 15:59:31 +0000 (17:59 +0200)]
Don't show negative 0 values in the accelerometer

9 years agoAdd a cvar to allow disabling the averaging method used for calculating acceleration
terencehill [Fri, 19 Jun 2015 20:47:07 +0000 (22:47 +0200)]
Add a cvar to allow disabling the averaging method used for calculating acceleration

9 years agoFix a small mathematical issue
terencehill [Fri, 19 Jun 2015 20:32:49 +0000 (22:32 +0200)]
Fix a small mathematical issue

9 years agoFix accelerometer displaying the real acceleration value (not very stable) instead...
terencehill [Thu, 18 Jun 2015 13:47:47 +0000 (15:47 +0200)]
Fix accelerometer displaying the real acceleration value (not very stable) instead of the average value

9 years agoshuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in...
terencehill [Thu, 11 Jun 2015 22:57:24 +0000 (00:57 +0200)]
shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"

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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

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

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

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

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

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

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

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

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

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

9 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

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

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

9 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

9 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)

9 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

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

9 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())

9 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

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

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

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

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

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

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

9 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

9 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

9 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

9 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

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

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

9 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

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

9 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).

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

9 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

9 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

9 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