]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoMerge branch 'master' into TimePath/guide
TimePath [Sun, 27 Sep 2015 04:36:52 +0000 (14:36 +1000)]
Merge branch 'master' into TimePath/guide

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

9 years agoMerge branch 'Mario/snake' into 'master'
Mario [Sun, 27 Sep 2015 03:40:11 +0000 (03:40 +0000)]
Merge branch 'Mario/snake' into 'master'

Merge branch Mario/snake (Snake? Snake! SNAAAAKE!!)

Title says it all, soldier.

See merge request !231

9 years agoFix the message 231/head
Mario [Sun, 27 Sep 2015 03:37:53 +0000 (13:37 +1000)]
Fix the message

9 years agoClient: Bring back 'unused' movelib, -Werror didn't break the build...
TimePath [Sun, 27 Sep 2015 03:28:09 +0000 (13:28 +1000)]
Client: Bring back 'unused' movelib, -Werror didn't break the build...

9 years agoMerge branch 'master' into Mario/snake
Mario [Sun, 27 Sep 2015 03:24:01 +0000 (13:24 +1000)]
Merge branch 'master' into Mario/snake

9 years agoRemove Quinto minigame (only 1 strategy, pointless as a puzzle game)
Mario [Sun, 27 Sep 2015 03:23:44 +0000 (13:23 +1000)]
Remove Quinto minigame (only 1 strategy, pointless as a puzzle game)

9 years agoItems: Use model registry
TimePath [Sun, 27 Sep 2015 03:14:37 +0000 (13:14 +1000)]
Items: Use model registry

9 years agoMerge branch 'master' into Mario/snake
Mario [Sun, 27 Sep 2015 03:12:35 +0000 (13:12 +1000)]
Merge branch 'master' into Mario/snake

9 years agoClient: Remove unused movelib
TimePath [Sun, 27 Sep 2015 02:27:32 +0000 (12:27 +1000)]
Client: Remove unused movelib

9 years agoRemove server/pathlib.qc.
TimePath [Sun, 27 Sep 2015 01:49:07 +0000 (11:49 +1000)]
Remove server/pathlib.qc.
It was never used, seems to be superseded by server/pathlib/*.qc

9 years agoEffects: prefer team suffixes
TimePath [Sat, 26 Sep 2015 12:13:19 +0000 (22:13 +1000)]
Effects: prefer team suffixes

9 years agoRemove uses of Static_Team_ColorName
TimePath [Sat, 26 Sep 2015 11:59:35 +0000 (21:59 +1000)]
Remove uses of Static_Team_ColorName

9 years agoMerge branch 'TimePath/soundregistry' into 'master'
TimePath [Sat, 26 Sep 2015 11:12:45 +0000 (11:12 +0000)]
Merge branch 'TimePath/soundregistry' into 'master'

Sound registry

Destringified sounds in favor of constants

Automated precaching

Closes #1303

See merge request !226

9 years agoFlip icon on its side
Mario [Sat, 26 Sep 2015 09:11:47 +0000 (19:11 +1000)]
Flip icon on its side

9 years agoAdd an icon for snake
Mario [Sat, 26 Sep 2015 09:09:46 +0000 (19:09 +1000)]
Add an icon for snake

9 years agoMinor optimization
Mario [Sat, 26 Sep 2015 08:56:55 +0000 (18:56 +1000)]
Minor optimization

9 years agoAdd an option for classic style wrapping around the screen, rather than instant death...
Mario [Sat, 26 Sep 2015 08:50:43 +0000 (18:50 +1000)]
Add an option for classic style wrapping around the screen, rather than instant death on the touch of a wall

9 years agoUpdate artwork, make fastest delay configurable
Mario [Sat, 26 Sep 2015 08:12:35 +0000 (18:12 +1000)]
Update artwork, make fastest delay configurable

9 years agoFix overkill superweapon waypoints
TimePath [Sat, 26 Sep 2015 01:31:10 +0000 (11:31 +1000)]
Fix overkill superweapon waypoints
Closes #1553

9 years agoMake debug messages less spammy
Mario [Fri, 25 Sep 2015 07:37:51 +0000 (17:37 +1000)]
Make debug messages less spammy

9 years agoMake the speed values customizable via cvars, and set default values to be faster...
Mario [Fri, 25 Sep 2015 07:36:47 +0000 (17:36 +1000)]
Make the speed values customizable via cvars, and set default values to be faster (and crazier)

9 years agoUse j instead of t (field issues)
Mario [Fri, 25 Sep 2015 05:16:59 +0000 (15:16 +1000)]
Use j instead of t (field issues)

9 years agoMerge branch 'terencehill/obsolete_cvars_removal' into 'master'
TimePath [Thu, 24 Sep 2015 22:37:41 +0000 (22:37 +0000)]
Merge branch 'terencehill/obsolete_cvars_removal' into 'master'

Remove obsolete sv_fraginfo* cvars

See merge request !176

9 years agoMerge branch 'Mario/vaporizer_damage' into 'master'
TimePath [Thu, 24 Sep 2015 22:31:33 +0000 (22:31 +0000)]
Merge branch 'Mario/vaporizer_damage' into 'master'

Merge branch Mario/vaporizer_damage (S merge request)

Adds a damage option to the vaporizer, fixes support for bonus nades

See merge request !215

9 years agoMerge branch 'terencehill/translation_system_improvements_2' into 'master'
TimePath [Thu, 24 Sep 2015 22:27:29 +0000 (22:27 +0000)]
Merge branch 'terencehill/translation_system_improvements_2' into 'master'

Translation system improvements

Ported key binds definitions and tooltips from files (keybind.txt and tooltips.db) to qc code so they can be translated just like any other qc string.

See merge request !214

9 years agoReplicateVars, a more flexible GetCvars
TimePath [Thu, 24 Sep 2015 11:59:05 +0000 (21:59 +1000)]
ReplicateVars, a more flexible GetCvars

9 years agoAdd the missing icons
Mario [Thu, 24 Sep 2015 04:38:42 +0000 (14:38 +1000)]
Add the missing icons

9 years agoSnake: the game (ladders not included)
Mario [Thu, 24 Sep 2015 04:37:05 +0000 (14:37 +1000)]
Snake: the game (ladders not included)

9 years agoDon't use timeout if it's not set (fixes quickmenu not opening)
Mario [Wed, 23 Sep 2015 23:19:47 +0000 (09:19 +1000)]
Don't use timeout if it's not set (fixes quickmenu not opening)

9 years agoTweak verbosity
TimePath [Wed, 23 Sep 2015 10:04:20 +0000 (20:04 +1000)]
Tweak verbosity

9 years agoUse the sound list 226/head
TimePath [Wed, 23 Sep 2015 07:06:49 +0000 (17:06 +1000)]
Use the sound list

9 years agoCreate a sound list
TimePath [Wed, 23 Sep 2015 02:31:49 +0000 (12:31 +1000)]
Create a sound list

9 years agoMerge branch 'TimePath/modelregistry' into 'master'
TimePath [Wed, 23 Sep 2015 00:16:43 +0000 (00:16 +0000)]
Merge branch 'TimePath/modelregistry' into 'master'

Model registry

Destringified models in favor of constants

Automated precaching

See merge request !225

9 years agoCreate a model list 225/head
TimePath [Tue, 22 Sep 2015 11:36:18 +0000 (21:36 +1000)]
Create a model list

9 years agoMerge branch 'master' into 'master'
Mario [Mon, 21 Sep 2015 21:46:46 +0000 (21:46 +0000)]
Merge branch 'master' into 'master'

New hook chain textures

Hook chain textures remade in HD

See merge request !224

9 years agoGroup effects in a folder
TimePath [Mon, 21 Sep 2015 10:41:02 +0000 (20:41 +1000)]
Group effects in a folder

9 years agoMerge branch 'TimePath/lint' into 'master'
TimePath [Mon, 21 Sep 2015 07:27:10 +0000 (07:27 +0000)]
Merge branch 'TimePath/lint' into 'master'

Lint

More closely matches the behaviour of `cpp`, and restores compatibility with my source analyser.

`cc -E -x c -DSVQC -DQCC_SUPPORT_ACCUMULATE -DQCC_SUPPORT_NIL server/progs.inc` now works

See merge request !222

9 years agoMake: depend on lib/ 222/head
TimePath [Thu, 10 Sep 2015 03:02:39 +0000 (13:02 +1000)]
Make: depend on lib/

9 years agoPrefer lowercase filenames
TimePath [Thu, 10 Sep 2015 01:30:24 +0000 (11:30 +1000)]
Prefer lowercase filenames

9 years agoFix whitespace for #include
TimePath [Thu, 10 Sep 2015 01:23:39 +0000 (11:23 +1000)]
Fix whitespace for #include

9 years agoFix multiline comments
TimePath [Thu, 10 Sep 2015 01:18:31 +0000 (11:18 +1000)]
Fix multiline comments

9 years agoImprove compatibility with cpp
TimePath [Thu, 10 Sep 2015 01:01:16 +0000 (11:01 +1000)]
Improve compatibility with cpp

9 years agoLint
TimePath [Wed, 9 Sep 2015 11:56:47 +0000 (21:56 +1000)]
Lint

9 years agoNew hook chain textures 224/head
Keziolio [Sun, 20 Sep 2015 13:16:47 +0000 (15:16 +0200)]
New hook chain textures

9 years agoDisable multijump on the client by default (only those who want it should be able...
Mario [Fri, 18 Sep 2015 20:09:09 +0000 (06:09 +1000)]
Disable multijump on the client by default (only those who want it should be able to use it)

9 years agoRun whitespace.sh
TimePath [Wed, 16 Sep 2015 05:25:05 +0000 (15:25 +1000)]
Run whitespace.sh

9 years agoSmooth scroll: averaging_time cvar `menu_scroll_averaging_time`
TimePath [Wed, 16 Sep 2015 05:07:27 +0000 (15:07 +1000)]
Smooth scroll: averaging_time cvar `menu_scroll_averaging_time`

9 years agoFix chat issues when in developer mode
TimePath [Wed, 16 Sep 2015 00:12:15 +0000 (10:12 +1000)]
Fix chat issues when in developer mode

9 years agoUse "use" instead of "+use" in the "drop flag/key, icon" command
terencehill [Wed, 9 Sep 2015 18:54:42 +0000 (20:54 +0200)]
Use "use" instead of "+use" in the "drop flag/key, icon" command

9 years agoDon't translate "userbind" as it defines part of the cvar name; also I made a mistake...
terencehill [Wed, 9 Sep 2015 18:47:33 +0000 (20:47 +0200)]
Don't translate "userbind" as it defines part of the cvar name; also I made a mistake when I escaped $: it only serves as identifier of the userbind commands and is not meant to be shown

9 years agoIncrease the maximum number of mutators
Mario [Mon, 7 Sep 2015 04:07:17 +0000 (14:07 +1000)]
Increase the maximum number of mutators

9 years agoDisable multijump by default on client
Mario [Mon, 7 Sep 2015 03:29:42 +0000 (13:29 +1000)]
Disable multijump by default on client

9 years agoMerge branch 'master' into terencehill/translation_system_improvements_2
terencehill [Sat, 5 Sep 2015 12:10:22 +0000 (14:10 +0200)]
Merge branch 'master' into terencehill/translation_system_improvements_2

9 years agoMerge branch 'TimePath/global_self' into 'master'
TimePath [Sat, 5 Sep 2015 07:37:50 +0000 (07:37 +0000)]
Merge branch 'TimePath/global_self' into 'master'

Stop using the self global

high priority, frequently broken by changes:

- [x] back up global `self` into local `this` for every function that was using it

- [x] replace all self assignments with `setself` (which *currently* does the same thing, but is easier to search for and can be changed to do other things, like not compile)

---

less urgent, can be done long term post merge:

- [ ] replace `setself` with `WITH`

- [ ] replace `SELFPARAM` with an actual parameter for functions the engine doesn't need to call

See merge request !134

9 years agoUpdate uses of self
TimePath [Sat, 5 Sep 2015 02:10:53 +0000 (12:10 +1000)]
Update uses of self

9 years agoMerge branch 'master' into TimePath/global_self
TimePath [Sat, 5 Sep 2015 02:07:13 +0000 (12:07 +1000)]
Merge branch 'master' into TimePath/global_self

# Conflicts:
# qcsrc/server/mutators/mutator_instagib.qc
# qcsrc/server/mutators/mutator_instagib_items.qc

9 years agoDocument intent
TimePath [Sat, 5 Sep 2015 01:47:29 +0000 (11:47 +1000)]
Document intent

9 years agoMove mod directory below qcsrc
TimePath [Sat, 5 Sep 2015 01:12:20 +0000 (11:12 +1000)]
Move mod directory below qcsrc

9 years agoFix walk movetype port getting stuck on walls (fix by Melanosuchus)
Mario [Thu, 3 Sep 2015 17:47:41 +0000 (03:47 +1000)]
Fix walk movetype port getting stuck on walls (fix by Melanosuchus)

9 years agoFix instagib waypoints
TimePath [Thu, 3 Sep 2015 07:46:15 +0000 (17:46 +1000)]
Fix instagib waypoints

9 years agoAdd gl_max_lightmapsize just in case.
Rudolf Polzer [Thu, 3 Sep 2015 00:19:51 +0000 (02:19 +0200)]
Add gl_max_lightmapsize just in case.

I know DP currently ignores it for Q3BSP anyway.

9 years agoMerge branch 'master' into TimePath/global_self
TimePath [Wed, 2 Sep 2015 10:05:23 +0000 (20:05 +1000)]
Merge branch 'master' into TimePath/global_self

# Conflicts:
# qcsrc/common/weapons/weapon/vaporizer.qc

9 years agoCombine `SELFCALL` and `SELFCALL_DONE` with `WITH`
TimePath [Wed, 2 Sep 2015 09:44:38 +0000 (19:44 +1000)]
Combine `SELFCALL` and `SELFCALL_DONE` with `WITH`

9 years agoMerge branch 'master' into TimePath/global_self
TimePath [Wed, 2 Sep 2015 09:20:00 +0000 (19:20 +1000)]
Merge branch 'master' into TimePath/global_self

# Conflicts:
# qcsrc/server/mutators/gamemode_tdm.qc
# qcsrc/server/mutators/mutator_campcheck.qc
# qcsrc/server/mutators/mutator_instagib.qc
# qcsrc/server/mutators/mutator_multijump.qc
# qcsrc/server/mutators/mutator_nades.qc
# qcsrc/server/mutators/mutator_new_toys.qc
# qcsrc/server/mutators/mutator_spawn_near_teammate.qc
# qcsrc/server/t_items.qc

9 years agoFix "join 'best' team (auto-select)" button showing no tooltip, tooltip support for...
terencehill [Tue, 1 Sep 2015 14:23:38 +0000 (16:23 +0200)]
Fix "join 'best' team (auto-select)" button showing no tooltip, tooltip support for BigCommandButton classes wasn't fully implemented

9 years agoPort the existing tooltips and keybinds translations to the main translation files
terencehill [Tue, 1 Sep 2015 10:46:08 +0000 (12:46 +0200)]
Port the existing tooltips and keybinds translations to the main translation files

9 years ago$$ to show $
terencehill [Tue, 1 Sep 2015 10:09:33 +0000 (12:09 +0200)]
$$ to show $

9 years agoFix a wrongly imported tooltip
terencehill [Tue, 1 Sep 2015 10:04:44 +0000 (12:04 +0200)]
Fix a wrongly imported tooltip

9 years agoMerge branch 'master' into terencehill/translation_system_improvements_2
terencehill [Tue, 1 Sep 2015 09:19:46 +0000 (11:19 +0200)]
Merge branch 'master' into terencehill/translation_system_improvements_2

9 years agoTransifex sync.
Rudolf Polzer [Mon, 31 Aug 2015 19:03:30 +0000 (21:03 +0200)]
Transifex sync.

9 years agoAdd a "German (Switzerland)" translation.
Rudolf Polzer [Mon, 31 Aug 2015 19:00:04 +0000 (21:00 +0200)]
Add a "German (Switzerland)" translation.

9 years agoAdd options to allow instagib secondary fire to damage or push players
Mario [Mon, 31 Aug 2015 15:18:56 +0000 (01:18 +1000)]
Add options to allow instagib secondary fire to damage or push players

9 years agoMerge branch 'Mario/vaporizer_damage' into 'master'
Mario [Mon, 31 Aug 2015 14:19:12 +0000 (14:19 +0000)]
Merge branch 'Mario/vaporizer_damage' into 'master'

Merge branch Mario/vaporizer_damage (S merge request)

Adds a damage option to the vaporizer, fixes support for bonus nades

See merge request !215

9 years agoMerge branch 'master' into Mario/vaporizer_damage
Mario [Mon, 31 Aug 2015 14:15:08 +0000 (00:15 +1000)]
Merge branch 'master' into Mario/vaporizer_damage

# Conflicts:
# qcsrc/common/weapons/w_vaporizer.qc
# qcsrc/server/cl_player.qc

9 years agoRemove a few really useless tooltips
terencehill [Mon, 31 Aug 2015 12:51:18 +0000 (14:51 +0200)]
Remove a few really useless tooltips

9 years agoCapture __FILE__ with AUTOCVAR
TimePath [Mon, 31 Aug 2015 10:08:06 +0000 (20:08 +1000)]
Capture __FILE__ with AUTOCVAR

9 years agoMake custom autocvar enumeration possible
TimePath [Mon, 31 Aug 2015 10:02:21 +0000 (20:02 +1000)]
Make custom autocvar enumeration possible

9 years agoInitialize mutators later with STATIC_INIT_LATE
TimePath [Mon, 31 Aug 2015 09:25:08 +0000 (19:25 +1000)]
Initialize mutators later with STATIC_INIT_LATE

9 years agoAdd mutators to guide
TimePath [Mon, 31 Aug 2015 06:57:25 +0000 (16:57 +1000)]
Add mutators to guide

9 years agoVehicles and monsters
TimePath [Mon, 31 Aug 2015 06:49:55 +0000 (16:49 +1000)]
Vehicles and monsters

9 years agoMerge branch 'master' into TimePath/guide
TimePath [Mon, 31 Aug 2015 06:13:50 +0000 (16:13 +1000)]
Merge branch 'master' into TimePath/guide

9 years agoRemove oldself variables
TimePath [Mon, 31 Aug 2015 05:03:56 +0000 (15:03 +1000)]
Remove oldself variables

9 years agoFix InitializeEntitiesRun()
TimePath [Mon, 31 Aug 2015 03:28:34 +0000 (13:28 +1000)]
Fix InitializeEntitiesRun()

9 years agoReplace all direct assignments to self with setself(e)
TimePath [Mon, 31 Aug 2015 02:23:43 +0000 (12:23 +1000)]
Replace all direct assignments to self with setself(e)

9 years agoRemove tooltips.db* files
terencehill [Sun, 30 Aug 2015 19:35:07 +0000 (21:35 +0200)]
Remove tooltips.db* files

9 years agoMove tooltip functions around
terencehill [Sun, 30 Aug 2015 19:15:56 +0000 (21:15 +0200)]
Move tooltip functions around

9 years agoAdd clearTooltip function
terencehill [Sun, 30 Aug 2015 18:17:56 +0000 (20:17 +0200)]
Add clearTooltip function

9 years agoGet rid of a hack that does nothing, e.value is already properly initialized in confi...
terencehill [Sun, 30 Aug 2015 18:15:10 +0000 (20:15 +0200)]
Get rid of a hack that does nothing, e.value is already properly initialized in configureTextSliderValues(e)

9 years agoMake sure all classes that control a cvar initialize cvarName to string_null in their...
terencehill [Sun, 30 Aug 2015 18:14:19 +0000 (20:14 +0200)]
Make sure all classes that control a cvar initialize cvarName to string_null in their configure method so they can be properly re-configured

9 years agoMake work tooltips of those special TextSliders that reconfigure their self at runtim...
terencehill [Sun, 30 Aug 2015 18:12:54 +0000 (20:12 +0200)]
Make work tooltips of those special TextSliders that reconfigure their self at runtime based on gametype

9 years agoHardcode tooltips
terencehill [Sun, 30 Aug 2015 18:01:54 +0000 (20:01 +0200)]
Hardcode tooltips

9 years agoHardcode keybind definitions so they can be translated like any other string in the...
terencehill [Sun, 30 Aug 2015 17:23:58 +0000 (19:23 +0200)]
Hardcode keybind definitions so they can be translated like any other string in the qc code. Many of them are built dynamically and almost need no translation (none for 10 "weapon_group_*" binds, only one for 32 "+userbind *" binds)

9 years agoDon't kick bots for idling
Mario [Sun, 30 Aug 2015 15:03:58 +0000 (01:03 +1000)]
Don't kick bots for idling

9 years agoMerge branch 'terencehill/menu_weaponarena_selection_fix' into 'master'
Mario [Sun, 30 Aug 2015 14:29:45 +0000 (14:29 +0000)]
Merge branch 'terencehill/menu_weaponarena_selection_fix' into 'master'

Menu weaponarena selection fix

Remember "Weapon arenas:" checkbox selection on mutators dialog opening

See merge request !163

9 years agoAdd a hook for custom gameplay tips
Mario [Sun, 30 Aug 2015 13:49:02 +0000 (23:49 +1000)]
Add a hook for custom gameplay tips

9 years agoDon't show the blaster weaponstart message in a weapon arena mode
Mario [Sun, 30 Aug 2015 13:28:58 +0000 (23:28 +1000)]
Don't show the blaster weaponstart message in a weapon arena mode

9 years agoMerge branch 'Mario/item_fixes' into 'master'
Mario [Sun, 30 Aug 2015 13:26:18 +0000 (13:26 +0000)]
Merge branch 'Mario/item_fixes' into 'master'

Merge branch Mario/item_fixes (M merge request)

Fixes some issues with items, and adds the infamous item fading hack (disabled by default)

See merge request !212

9 years agoRemove an old commented line
Mario [Sun, 30 Aug 2015 13:24:24 +0000 (23:24 +1000)]
Remove an old commented line

9 years agoAdd an option to use team spawns in keyhunt
Mario [Sun, 30 Aug 2015 13:16:43 +0000 (23:16 +1000)]
Add an option to use team spawns in keyhunt

9 years agoFix some issues with items, also add item fading (a sneaky way to save a performance...
Mario [Sun, 30 Aug 2015 13:12:00 +0000 (23:12 +1000)]
Fix some issues with items, also add item fading (a sneaky way to save a performance, at a cost of warpzone support)