xonotic/xonotic-data.pk3dir.git
4 years agoMerge branch 'TimePath/cleanup'
TimePath [Sun, 11 Oct 2015 08:40:25 +0000 (19:40 +1100)]
Merge branch 'TimePath/cleanup'

4 years agocommon: move instagib and nexball as they add custom items and weapons
TimePath [Sun, 11 Oct 2015 07:10:16 +0000 (18:10 +1100)]
common: move instagib and nexball as they add custom items and weapons

4 years agolib: move csqcmodellib and warpzonelib
TimePath [Sun, 11 Oct 2015 01:08:03 +0000 (12:08 +1100)]
lib: move csqcmodellib and warpzonelib

4 years ago#includes: cleanup server
TimePath [Sat, 10 Oct 2015 08:35:02 +0000 (19:35 +1100)]
#includes: cleanup server

4 years agoString: use strhasword
TimePath [Sat, 10 Oct 2015 03:28:18 +0000 (14:28 +1100)]
String: use strhasword

4 years ago#includes: cleanup menu
TimePath [Sat, 10 Oct 2015 03:24:19 +0000 (14:24 +1100)]
#includes: cleanup menu

4 years ago#includes: cleanup client
TimePath [Sat, 10 Oct 2015 02:06:58 +0000 (13:06 +1100)]
#includes: cleanup client

4 years agoAdd a server side option to disable bunnyhopping
Mario [Fri, 9 Oct 2015 12:14:17 +0000 (22:14 +1000)]
Add a server side option to disable bunnyhopping

4 years agoCommands: move dump commands to their respective systems
TimePath [Fri, 9 Oct 2015 11:33:48 +0000 (22:33 +1100)]
Commands: move dump commands to their respective systems

4 years agoCommands: use registry
TimePath [Fri, 9 Oct 2015 11:03:03 +0000 (22:03 +1100)]
Commands: use registry

4 years ago#includes: cleanup
TimePath [Fri, 9 Oct 2015 09:32:33 +0000 (20:32 +1100)]
#includes: cleanup

4 years agoMerge branch 'Mario/multiplayer_snake' into 'master'
Mario [Fri, 9 Oct 2015 09:22:16 +0000 (09:22 +0000)]
Merge branch 'Mario/multiplayer_snake' into 'master'

Merge branch Mario/multiplayer_snake (M merge request)

Adds support for multiple players in the Snake minigame.

See merge request !238

4 years agoFix a minor issue with snake tail 238/head
Mario [Fri, 9 Oct 2015 08:58:38 +0000 (18:58 +1000)]
Fix a minor issue with snake tail

4 years agoMerge branch 'master' into Mario/multiplayer_snake
Mario [Fri, 9 Oct 2015 08:47:38 +0000 (18:47 +1000)]
Merge branch 'master' into Mario/multiplayer_snake

4 years agoDoxygen config
TimePath [Fri, 9 Oct 2015 06:19:31 +0000 (17:19 +1100)]
Doxygen config

4 years agoRaptor: fix primary friendly fire
TimePath [Thu, 8 Oct 2015 21:24:21 +0000 (08:24 +1100)]
Raptor: fix primary friendly fire

4 years agoFix compile
Mario [Thu, 8 Oct 2015 13:22:16 +0000 (23:22 +1000)]
Fix compile

4 years agoMake an unused function used
Mario [Thu, 8 Oct 2015 12:08:25 +0000 (22:08 +1000)]
Make an unused function used

4 years agoRevert "Merge branch 'TimePath/bot_api' into 'master'\r"
TimePath [Thu, 8 Oct 2015 11:35:21 +0000 (22:35 +1100)]
Revert "Merge branch 'TimePath/bot_api' into 'master'\r"

This reverts commit a39af09cb4b15ec94461af2c1f314098ffe7ce0c, reversing
changes made to 81b0f2bc5760bb652515453ac450f2822a98b725.

4 years agoGreatly improve network performance with snake movement
Mario [Thu, 8 Oct 2015 08:01:52 +0000 (18:01 +1000)]
Greatly improve network performance with snake movement

4 years agoMerge branch 'master' into Mario/multiplayer_snake
Mario [Thu, 8 Oct 2015 06:12:29 +0000 (16:12 +1000)]
Merge branch 'master' into Mario/multiplayer_snake

4 years agoIncrease the maximum number of mutators
Mario [Thu, 8 Oct 2015 06:12:13 +0000 (16:12 +1000)]
Increase the maximum number of mutators

4 years agoMerge branch 'TimePath/hudpanels_registry' into 'master'
TimePath [Thu, 8 Oct 2015 06:08:22 +0000 (06:08 +0000)]
Merge branch 'TimePath/hudpanels_registry' into 'master'

HUD: initialize with registry

See merge request !236

4 years agoMerge branch 'master' into Mario/multiplayer_snake
Mario [Thu, 8 Oct 2015 06:07:55 +0000 (16:07 +1000)]
Merge branch 'master' into Mario/multiplayer_snake

4 years agoMerge branch 'TimePath/bot_api' into 'master'
TimePath [Thu, 8 Oct 2015 06:07:02 +0000 (06:07 +0000)]
Merge branch 'TimePath/bot_api' into 'master'

Decouple bots

If we're ever going to develop a new AI, this separation will make switching implementaions trivial

See merge request !237

4 years agoFix lives to not reset when rejoining
Mario [Thu, 8 Oct 2015 06:01:25 +0000 (16:01 +1000)]
Fix lives to not reset when rejoining

4 years agoAdd an obligatory comment
Mario [Thu, 8 Oct 2015 05:30:39 +0000 (15:30 +1000)]
Add an obligatory comment

4 years agoHUD: initialize with registry 236/head
TimePath [Thu, 8 Oct 2015 04:54:42 +0000 (15:54 +1100)]
HUD: initialize with registry

4 years agoRadar icons: fix colour
TimePath [Thu, 8 Oct 2015 03:39:10 +0000 (14:39 +1100)]
Radar icons: fix colour

4 years agoent_cs: cleanup
TimePath [Thu, 8 Oct 2015 01:54:02 +0000 (12:54 +1100)]
ent_cs: cleanup

4 years agoLib: re-home functions from common/util
TimePath [Thu, 8 Oct 2015 01:37:22 +0000 (12:37 +1100)]
Lib: re-home functions from common/util

4 years agoAutocvar: use MakeConsoleSafe
TimePath [Thu, 8 Oct 2015 00:42:58 +0000 (11:42 +1100)]
Autocvar: use MakeConsoleSafe

4 years agoBots: move supporting code into bot directory 237/head
TimePath [Wed, 7 Oct 2015 23:56:13 +0000 (10:56 +1100)]
Bots: move supporting code into bot directory

4 years agoBots: define the API boundaries
TimePath [Wed, 7 Oct 2015 23:15:40 +0000 (10:15 +1100)]
Bots: define the API boundaries

4 years agoEffectinfo: temporary order fix
TimePath [Wed, 7 Oct 2015 21:28:53 +0000 (08:28 +1100)]
Effectinfo: temporary order fix

4 years agoExperimental support for multiplayer in the snake minigame
Mario [Wed, 7 Oct 2015 13:37:48 +0000 (23:37 +1000)]
Experimental support for multiplayer in the snake minigame

4 years agoFix particleeffectnum usage
Mario [Wed, 7 Oct 2015 07:37:40 +0000 (17:37 +1000)]
Fix particleeffectnum usage

4 years agoRemove usage of "frame" event (improves performance, hopefully fixes PL)
Mario [Wed, 7 Oct 2015 07:31:48 +0000 (17:31 +1000)]
Remove usage of "frame" event (improves performance, hopefully fixes PL)

4 years agoDraw: purge SELFPARAM
TimePath [Wed, 7 Oct 2015 02:51:02 +0000 (13:51 +1100)]
Draw: purge SELFPARAM

4 years agoProjectiles: fix invisible rockets
TimePath [Wed, 7 Oct 2015 02:41:23 +0000 (13:41 +1100)]
Projectiles: fix invisible rockets

4 years agoRegistry: overflow check
TimePath [Wed, 7 Oct 2015 01:43:32 +0000 (12:43 +1100)]
Registry: overflow check

4 years agoNet: purge SELFPARAM from sendfuncs
TimePath [Wed, 7 Oct 2015 00:20:20 +0000 (11:20 +1100)]
Net: purge SELFPARAM from sendfuncs

4 years agoNet: tempentity support
TimePath [Tue, 6 Oct 2015 23:38:30 +0000 (10:38 +1100)]
Net: tempentity support

4 years agoItemstime: fix regression introduced by 0c071920ffd10ccebde36092b7b91eb1673ae856
TimePath [Wed, 7 Oct 2015 00:43:57 +0000 (11:43 +1100)]
Itemstime: fix regression introduced by 0c071920ffd10ccebde36092b7b91eb1673ae856

4 years agoNades: always override dropweapon
TimePath [Tue, 6 Oct 2015 23:03:28 +0000 (10:03 +1100)]
Nades: always override dropweapon

4 years agoResolve preprocessor warnings
TimePath [Tue, 6 Oct 2015 10:59:58 +0000 (21:59 +1100)]
Resolve preprocessor warnings

4 years agoNades: rename registry globals
TimePath [Tue, 6 Oct 2015 10:50:58 +0000 (21:50 +1100)]
Nades: rename registry globals

4 years agoBuffs: rename registry globals
TimePath [Tue, 6 Oct 2015 10:37:02 +0000 (21:37 +1100)]
Buffs: rename registry globals

4 years agoModels: rename registry globals
TimePath [Tue, 6 Oct 2015 10:16:24 +0000 (21:16 +1100)]
Models: rename registry globals

4 years agoSounds: rename registry globals
TimePath [Tue, 6 Oct 2015 10:13:40 +0000 (21:13 +1100)]
Sounds: rename registry globals

4 years agoItems: rename registry globals
TimePath [Tue, 6 Oct 2015 10:08:39 +0000 (21:08 +1100)]
Items: rename registry globals

4 years agoMonsters: rename registry globals
TimePath [Tue, 6 Oct 2015 10:04:49 +0000 (21:04 +1100)]
Monsters: rename registry globals

4 years agoTurrets: rename registry globals
TimePath [Tue, 6 Oct 2015 09:57:58 +0000 (20:57 +1100)]
Turrets: rename registry globals

4 years agoVehicles: rename registry globals
TimePath [Tue, 6 Oct 2015 09:50:37 +0000 (20:50 +1100)]
Vehicles: rename registry globals

4 years agoWeapons: rename registry globals
TimePath [Tue, 6 Oct 2015 09:41:12 +0000 (20:41 +1100)]
Weapons: rename registry globals

4 years agoMerge branch 'TimePath/unified_weapons' into 'master'
TimePath [Tue, 6 Oct 2015 08:04:53 +0000 (08:04 +0000)]
Merge branch 'TimePath/unified_weapons' into 'master'

Unified weapons (L merge request)

Internally converts every attack to behave as a weapon, this will be useful for playable monsters later.

Nades and hook are now proper offhand weapons. This capability can be used for vehicles and monsters to override the hook button for other abilities.

The nexball ball stealer is now its own weapon.

Turrets and vehicles also use weapons in preparation for future AI development.

See merge request !232

4 years agoBring back weapons.cfg; needed for playing on 0.8.1 servers
TimePath [Tue, 6 Oct 2015 07:51:36 +0000 (18:51 +1100)]
Bring back weapons.cfg; needed for playing on 0.8.1 servers

4 years agoMerge branch 'master' into TimePath/unified_weapons
TimePath [Tue, 6 Oct 2015 01:41:18 +0000 (12:41 +1100)]
Merge branch 'master' into TimePath/unified_weapons

# Conflicts:
# qcsrc/common/nades.qc
# qcsrc/common/vehicles/sv_vehicles.qc
# qcsrc/common/vehicles/vehicle/bumblebee.qc
# qcsrc/common/vehicles/vehicle/spiderbot.qc

4 years agoHook: infinite ammo in mutator
TimePath [Tue, 6 Oct 2015 01:28:32 +0000 (12:28 +1100)]
Hook: infinite ammo in mutator

4 years agoNades: check if player has hook for priming with weapon throw bind
TimePath [Tue, 6 Oct 2015 01:06:29 +0000 (12:06 +1100)]
Nades: check if player has hook for priming with weapon throw bind

4 years agoNades: always throw with weapon drop in case offhand is occupied
TimePath [Tue, 6 Oct 2015 00:56:00 +0000 (11:56 +1100)]
Nades: always throw with weapon drop in case offhand is occupied

4 years agoHook: don't give weapon when offhand is active
TimePath [Tue, 6 Oct 2015 00:07:24 +0000 (11:07 +1100)]
Hook: don't give weapon when offhand is active

4 years agoHook: merge offhand and weapon behaviour
TimePath [Tue, 6 Oct 2015 00:00:09 +0000 (11:00 +1100)]
Hook: merge offhand and weapon behaviour

Fixes offhand with nades
Fixes ammo

4 years agoHook: fix server cfg
TimePath [Mon, 5 Oct 2015 11:27:46 +0000 (22:27 +1100)]
Hook: fix server cfg

4 years agoMerge branch 'Mario/trailparticles' into 'master'
Mario [Mon, 5 Oct 2015 09:54:32 +0000 (09:54 +0000)]
Merge branch 'Mario/trailparticles' into 'master'

Merge branch Mario/trailparticles (M merge request)

Adds support for traileffect to CSQC models, so things like players can have tails (and eventually proper support for the nade trails).

See merge request !233

4 years agoMatch master 233/head
Mario [Mon, 5 Oct 2015 09:44:48 +0000 (19:44 +1000)]
Match master

4 years agoAdd support for traileffect on CSQC models
Mario [Mon, 5 Oct 2015 09:39:25 +0000 (19:39 +1000)]
Add support for traileffect on CSQC models

4 years agoHook: fix hookbomb ownership
TimePath [Mon, 5 Oct 2015 09:07:44 +0000 (20:07 +1100)]
Hook: fix hookbomb ownership

4 years agoWeapons: Don't take mutator blocked weapons into account when sizing the weapons...
TimePath [Mon, 5 Oct 2015 08:10:52 +0000 (19:10 +1100)]
Weapons: Don't take mutator blocked weapons into account when sizing the weapons panel, unless they are held

4 years agoNexball: mutator lock ballstealer
TimePath [Mon, 5 Oct 2015 07:26:29 +0000 (18:26 +1100)]
Nexball: mutator lock ballstealer

4 years agoLinked entities: simplify registration
TimePath [Mon, 5 Oct 2015 05:44:12 +0000 (16:44 +1100)]
Linked entities: simplify registration

4 years agoNades: check return of Nade_TrailEffect
TimePath [Mon, 5 Oct 2015 01:27:14 +0000 (12:27 +1100)]
Nades: check return of Nade_TrailEffect

4 years agoRemove no longer needed no-op mod folder
TimePath [Sun, 4 Oct 2015 08:51:53 +0000 (19:51 +1100)]
Remove no longer needed no-op mod folder

4 years agoMake sure racer is set to non-solid after exploding
Mario [Sun, 4 Oct 2015 03:17:27 +0000 (13:17 +1000)]
Make sure racer is set to non-solid after exploding

4 years agoEffectinfo: fix blood colour
TimePath [Sat, 3 Oct 2015 23:23:59 +0000 (10:23 +1100)]
Effectinfo: fix blood colour

4 years agoClear up a warning
TimePath [Sat, 3 Oct 2015 09:52:47 +0000 (19:52 +1000)]
Clear up a warning

4 years agoDataSource: pass context
TimePath [Sat, 3 Oct 2015 09:41:39 +0000 (19:41 +1000)]
DataSource: pass context

4 years agoSpawnfuncs: whitelist more fields
TimePath [Sat, 3 Oct 2015 09:02:24 +0000 (19:02 +1000)]
Spawnfuncs: whitelist more fields

4 years agoSpawnfuncs: don't check field types, increases compile time too much
TimePath [Sat, 3 Oct 2015 08:46:22 +0000 (18:46 +1000)]
Spawnfuncs: don't check field types, increases compile time too much

4 years agoMerge branch 'master' into TimePath/unified_weapons
TimePath [Sat, 3 Oct 2015 08:29:19 +0000 (18:29 +1000)]
Merge branch 'master' into TimePath/unified_weapons

# Conflicts:
# qcsrc/common/turrets/turret/ewheel.qc
# qcsrc/common/turrets/turret/hk_weapon.qc
# qcsrc/common/turrets/turret/walker.qc
# qcsrc/common/turrets/unit/flac.qc
# qcsrc/common/turrets/unit/fusionreactor.qc
# qcsrc/common/turrets/unit/hellion.qc
# qcsrc/common/turrets/unit/machinegun.qc
# qcsrc/common/turrets/unit/mlrs.qc
# qcsrc/common/turrets/unit/phaser.qc
# qcsrc/common/turrets/unit/plasma.qc
# qcsrc/common/turrets/unit/plasma_dual.qc
# qcsrc/common/turrets/unit/tesla.qc
# qcsrc/common/vehicles/vehicle/bumblebee.qc
# qcsrc/common/weapons/weapon/hook.qc
# qcsrc/common/weapons/weapon/vortex.qc
# qcsrc/server/mutators/mutator_overkill.qc

4 years agoSlow down minigame frame (potentially fixes PL when playing games that run stuff...
Mario [Sat, 3 Oct 2015 08:23:29 +0000 (18:23 +1000)]
Slow down minigame frame (potentially fixes PL when playing games that run stuff every frame)

4 years agoMerge branch 'TimePath/spawnfunc' into 'master'
TimePath [Sat, 3 Oct 2015 08:10:34 +0000 (08:10 +0000)]
Merge branch 'TimePath/spawnfunc' into 'master'

spawnfunc whitelist

So we know which entity fields are actually being used that we can't remove or rename.

When a field not listed is used, a warning is displayed. No official maps produce warnings. After enough community maps have been tested, can be changed to error instead.

For convenience, a cvar will be added as an additional whitelist.

See merge request !227

4 years agoMerge branch 'TimePath/effectinfo' into 'master'
TimePath [Sat, 3 Oct 2015 08:10:08 +0000 (08:10 +0000)]
Merge branch 'TimePath/effectinfo' into 'master'

QC generated effectinfo.txt

Has the major benefit of being able to template effects for teams

Is foundation for an in-game effects editor

See merge request !228

4 years agoEven invincible monsters should be weak against hurt triggers and lava
Mario [Sat, 3 Oct 2015 07:47:04 +0000 (17:47 +1000)]
Even invincible monsters should be weak against hurt triggers and lava

4 years agoMerge branch 'terencehill/itemstime_checkmark2' into 'master'
Mario [Sat, 3 Oct 2015 07:20:03 +0000 (07:20 +0000)]
Merge branch 'terencehill/itemstime_checkmark2' into 'master'

Itemstime: draw a checkmark for available items

Itemstime: draw a checkmark instead of centering the item icon when an item is a vailable again (only when the client has the checkmark image)

See merge request !213

4 years agoMerge branch 'master' into TimePath/spawnfunc 227/head
TimePath [Sat, 3 Oct 2015 07:17:49 +0000 (17:17 +1000)]
Merge branch 'master' into TimePath/spawnfunc

# Conflicts:
# qcsrc/common/turrets/unit/ewheel.qc
# qcsrc/common/turrets/unit/flac.qc
# qcsrc/common/turrets/unit/fusionreactor.qc
# qcsrc/common/turrets/unit/hellion.qc
# qcsrc/common/turrets/unit/hk.qc
# qcsrc/common/turrets/unit/machinegun.qc
# qcsrc/common/turrets/unit/mlrs.qc
# qcsrc/common/turrets/unit/phaser.qc
# qcsrc/common/turrets/unit/plasma.qc
# qcsrc/common/turrets/unit/plasma_dual.qc
# qcsrc/common/turrets/unit/tesla.qc
# qcsrc/common/turrets/unit/walker.qc
# qcsrc/server/t_items.qc

4 years agoMerge branch 'terencehill/slider_anim_improvements' into 'master'
Mario [Sat, 3 Oct 2015 06:55:28 +0000 (06:55 +0000)]
Merge branch 'terencehill/slider_anim_improvements' into 'master'

Slider anim improvements

1. Fix sliders handle getting stuck in the initial position when dragging outside the handle

2. Make sliders animation work much better on quick repeated changes (e.g. with mouse wheel). Default animation is now easingQuadOut and lasts 0.5 s (instead of easingQuadInOut, 1 s), more similar to the list scrolling animation

3. Don't play any animation when loading the initial value of a slider since the animation can't be seen anyway (the menu takes 2-3 seconds to load); also the high number (200) of animations played at once on menu start caused a bug where slider's handles couldn't be moved for a while (up to 12 seconds with 30 fps)

Additional note about point 3: before the change of point 2 500+ animation were played at once on menu start, as 300+ animation updates counted as new animations!

See merge request !221

4 years agoMerge branch 'terencehill/bot_fixes' into 'master'
Mario [Sat, 3 Oct 2015 06:52:42 +0000 (06:52 +0000)]
Merge branch 'terencehill/bot_fixes' into 'master'

Bot fixes

* Make misc_breakablemodel entities secondary target for bots so they never prefer shooting at barrels over players
* While shooting at breakable objects, don't focus on them, be ready to choose another enemy
* Properly set bot_attack field in a few more situations (reset bot_attack field when going observer, and set/reset it properly when freezing/unfreezing somebody)

See merge request !197

4 years agoMerge branch 'terencehill/radiobutton_fix' into 'master'
Mario [Sat, 3 Oct 2015 06:42:24 +0000 (06:42 +0000)]
Merge branch 'terencehill/radiobutton_fix' into 'master'

Radiobuttons fix

Fix radiobuttons: they are displayed as checked and can't be changed

See merge request !229

4 years agoMerge branch 'master' into TimePath/effectinfo
TimePath [Sat, 3 Oct 2015 06:11:23 +0000 (16:11 +1000)]
Merge branch 'master' into TimePath/effectinfo

4 years agoMenu: check for division by 0
TimePath [Fri, 2 Oct 2015 23:40:17 +0000 (09:40 +1000)]
Menu: check for division by 0

4 years agoMonsters: remove MON_ACTION
TimePath [Fri, 2 Oct 2015 23:03:20 +0000 (09:03 +1000)]
Monsters: remove MON_ACTION

4 years agoWeapons: fix accuracy panel and hide the internal weapons
TimePath [Fri, 2 Oct 2015 22:29:14 +0000 (08:29 +1000)]
Weapons: fix accuracy panel and hide the internal weapons

4 years agoWeapons: fix impulses
TimePath [Fri, 2 Oct 2015 01:48:25 +0000 (11:48 +1000)]
Weapons: fix impulses

4 years agoWeapons: remove many direct references to `self`
TimePath [Thu, 1 Oct 2015 23:57:06 +0000 (09:57 +1000)]
Weapons: remove many direct references to `self`

4 years agoMake time work after ready restart, also fix time being off by 1
Mario [Thu, 1 Oct 2015 13:08:34 +0000 (23:08 +1000)]
Make time work after ready restart, also fix time being off by 1

4 years agoWeapons: remove useless weapon return values and implementations
TimePath [Thu, 1 Oct 2015 10:37:41 +0000 (20:37 +1000)]
Weapons: remove useless weapon return values and implementations

4 years agoWeapons: remove WEP_ACTION
TimePath [Thu, 1 Oct 2015 10:08:53 +0000 (20:08 +1000)]
Weapons: remove WEP_ACTION

4 years agoWeapons: hide from menu
TimePath [Thu, 1 Oct 2015 09:20:01 +0000 (19:20 +1000)]
Weapons: hide from menu

4 years agoWeapons: split registration and base weapon definitions
TimePath [Thu, 1 Oct 2015 09:05:02 +0000 (19:05 +1000)]
Weapons: split registration and base weapon definitions