]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
6 years agoMerge branch 'master' into Mario/weapons_fpsfix
Mario [Mon, 11 Jun 2018 12:38:23 +0000 (22:38 +1000)]
Merge branch 'master' into Mario/weapons_fpsfix

6 years agoTweak it again
Mario [Mon, 11 Jun 2018 12:37:57 +0000 (22:37 +1000)]
Tweak it again

6 years agoMerge branch 'master' into Mario/weapons_fpsfix
Mario [Mon, 11 Jun 2018 12:08:47 +0000 (22:08 +1000)]
Merge branch 'master' into Mario/weapons_fpsfix

6 years agoTweak Mario balance
Mario [Mon, 11 Jun 2018 12:00:27 +0000 (22:00 +1000)]
Tweak Mario balance

6 years agoMerge branch 'martin-t/defaults' into 'master'
Mario [Mon, 11 Jun 2018 08:55:19 +0000 (08:55 +0000)]
Merge branch 'martin-t/defaults' into 'master'

Changes to defaults

See merge request xonotic/xonotic-data.pk3dir!530

6 years agoMerge branch 'Lyberta/PrintMove' into 'master'
Mario [Mon, 11 Jun 2018 08:52:58 +0000 (08:52 +0000)]
Merge branch 'Lyberta/PrintMove' into 'master'

Moved print functions to client.q[ch].

See merge request xonotic/xonotic-data.pk3dir!555

6 years agoDisable sv_vote_gametype (to be decided by a poll)
Mario [Mon, 11 Jun 2018 08:11:49 +0000 (18:11 +1000)]
Disable sv_vote_gametype (to be decided by a poll)

6 years agoMerge branch 'master' into martin-t/defaults
Mario [Mon, 11 Jun 2018 08:06:38 +0000 (18:06 +1000)]
Merge branch 'master' into martin-t/defaults

6 years agoMove dedicated_print to miscfunctions (not a client-specific function)
Mario [Mon, 11 Jun 2018 07:50:04 +0000 (17:50 +1000)]
Move dedicated_print to miscfunctions (not a client-specific function)

6 years agoMerge branch 'master' into Lyberta/PrintMove
Mario [Mon, 11 Jun 2018 07:48:10 +0000 (17:48 +1000)]
Merge branch 'master' into Lyberta/PrintMove

6 years agoPurge direct includes of mutators/events.qh in favour of the _mod files
Mario [Mon, 11 Jun 2018 04:45:51 +0000 (14:45 +1000)]
Purge direct includes of mutators/events.qh in favour of the _mod files

6 years agoFix compilation unit
Mario [Mon, 11 Jun 2018 04:33:30 +0000 (14:33 +1000)]
Fix compilation unit

6 years agoAnother attempt to fix compilation unit
Mario [Mon, 11 Jun 2018 02:45:15 +0000 (12:45 +1000)]
Another attempt to fix compilation unit

6 years agoFix compilation unit
Mario [Mon, 11 Jun 2018 02:15:01 +0000 (12:15 +1000)]
Fix compilation unit

6 years agoMerge branch 'Lyberta/OverkillWeaponIcons' into 'master'
Mario [Mon, 11 Jun 2018 02:12:48 +0000 (02:12 +0000)]
Merge branch 'Lyberta/OverkillWeaponIcons' into 'master'

Overkill weapon icons code

See merge request xonotic/xonotic-data.pk3dir!563

6 years agoUse icon names from default HUD theme for OK weapons. 563/head
Lyberta [Mon, 11 Jun 2018 00:29:24 +0000 (03:29 +0300)]
Use icon names from default HUD theme for OK weapons.

6 years agoPort the g_inventory global entity from the scoreboard items branch, for accessing...
Mario [Sun, 10 Jun 2018 11:32:54 +0000 (21:32 +1000)]
Port the g_inventory global entity from the scoreboard items branch, for accessing the player's inventory locally

6 years agoFix a couple more compilation unit failures
Mario [Sun, 10 Jun 2018 09:44:11 +0000 (19:44 +1000)]
Fix a couple more compilation unit failures

6 years agoAdd the item definition as a paremter to m_iteminit so the correct field can be acces...
Mario [Sun, 10 Jun 2018 09:41:06 +0000 (19:41 +1000)]
Add the item definition as a paremter to m_iteminit so the correct field can be accessed later

6 years agoMerge branch 'master' into Mario/weapons_fpsfix
Mario [Sun, 10 Jun 2018 09:31:28 +0000 (19:31 +1000)]
Merge branch 'master' into Mario/weapons_fpsfix

6 years agoReplace some ammo field references with resources
Mario [Sun, 10 Jun 2018 09:24:43 +0000 (19:24 +1000)]
Replace some ammo field references with resources

6 years agoMove the client portion of client walls into the models file now that it's common
Mario [Sun, 10 Jun 2018 08:12:06 +0000 (18:12 +1000)]
Move the client portion of client walls into the models file now that it's common

6 years agoMerge branch 'Lyberta/OverkillWeaponsMutator' into 'master'
Mario [Sun, 10 Jun 2018 08:04:11 +0000 (08:04 +0000)]
Merge branch 'Lyberta/OverkillWeaponsMutator' into 'master'

Overkill weapons mutator

See merge request xonotic/xonotic-data.pk3dir!561

6 years agoFix another random include error
Mario [Sun, 10 Jun 2018 07:59:10 +0000 (17:59 +1000)]
Fix another random include error

6 years agoAdded Overkill weapons mutator. 561/head
Lyberta [Sun, 10 Jun 2018 07:47:41 +0000 (10:47 +0300)]
Added Overkill weapons mutator.

6 years agoRemove g_subs
Mario [Sun, 10 Jun 2018 07:40:12 +0000 (17:40 +1000)]
Remove g_subs

6 years agoClean up g_subs a bit more
Mario [Sun, 10 Jun 2018 06:59:33 +0000 (16:59 +1000)]
Clean up g_subs a bit more

6 years agoMerge branch 'Lyberta/RandomItems2' into 'master'
Mario [Sun, 10 Jun 2018 06:22:14 +0000 (06:22 +0000)]
Merge branch 'Lyberta/RandomItems2' into 'master'

Better random items.

See merge request xonotic/xonotic-data.pk3dir!560

6 years agoMove all the remaining gamemodes to common
Mario [Sun, 10 Jun 2018 06:21:04 +0000 (16:21 +1000)]
Move all the remaining gamemodes to common

6 years agoMerge branch 'master' into Lyberta/RandomItems2 560/head
Lyberta [Sun, 10 Jun 2018 04:36:35 +0000 (07:36 +0300)]
Merge branch 'master' into Lyberta/RandomItems2

6 years agoFix compilation unit
Mario [Sun, 10 Jun 2018 04:20:11 +0000 (14:20 +1000)]
Fix compilation unit

6 years agoFix a missed use of SUB_UseTargets
Mario [Sun, 10 Jun 2018 03:48:12 +0000 (13:48 +1000)]
Fix a missed use of SUB_UseTargets

6 years agoPossibly fix compilation unit
Mario [Sun, 10 Jun 2018 03:24:27 +0000 (13:24 +1000)]
Possibly fix compilation unit

6 years agoBetter random items.
Lyberta [Sat, 9 Jun 2018 21:41:06 +0000 (00:41 +0300)]
Better random items.

6 years agoRemove a bit more dead code and put an include in the right place
Mario [Sat, 9 Jun 2018 16:48:10 +0000 (02:48 +1000)]
Remove a bit more dead code and put an include in the right place

6 years agoRemove some dead code from steerlib
Mario [Sat, 9 Jun 2018 16:35:21 +0000 (02:35 +1000)]
Remove some dead code from steerlib

6 years agoMove dynlight to mapobjects
Mario [Sat, 9 Jun 2018 16:29:39 +0000 (02:29 +1000)]
Move dynlight to mapobjects

6 years agoClean up mapobjects' includes a little bit, move some subs around
Mario [Sat, 9 Jun 2018 16:23:57 +0000 (02:23 +1000)]
Clean up mapobjects' includes a little bit, move some subs around

6 years agoRename triggers to mapobjects
Mario [Sat, 9 Jun 2018 15:52:03 +0000 (01:52 +1000)]
Rename triggers to mapobjects

6 years agoMove an assault constant into the assault file
Mario [Sat, 9 Jun 2018 15:27:39 +0000 (01:27 +1000)]
Move an assault constant into the assault file

6 years agoMerge branch 'morosophos/rankings_cnt' into 'master'
Mario [Sat, 9 Jun 2018 15:18:49 +0000 (15:18 +0000)]
Merge branch 'morosophos/rankings_cnt' into 'master'

Morosophos/rankings cnt

See merge request xonotic/xonotic-data.pk3dir!558

6 years agoMove another small piece of random weapons around
Mario [Sat, 9 Jun 2018 13:31:14 +0000 (23:31 +1000)]
Move another small piece of random weapons around

6 years agoMove more of weaponarena_random into its mutator file
Mario [Sat, 9 Jun 2018 13:21:57 +0000 (23:21 +1000)]
Move more of weaponarena_random into its mutator file

6 years agoFix dual wielding devastator and mortar, enable vortex and rifle in dual wielding...
Mario [Sat, 9 Jun 2018 12:15:07 +0000 (22:15 +1000)]
Fix dual wielding devastator and mortar, enable vortex and rifle in dual wielding now that aiming is offset

6 years agoFix resetting of the rifle accumulator
Mario [Sat, 9 Jun 2018 07:22:47 +0000 (17:22 +1000)]
Fix resetting of the rifle accumulator

6 years agoOptimize racer performance a tiny bit
Mario [Sat, 9 Jun 2018 06:44:04 +0000 (16:44 +1000)]
Optimize racer performance a tiny bit

6 years agoMerge branch 'master' into Lyberta/PrintMove
Lyberta [Fri, 8 Jun 2018 14:20:01 +0000 (17:20 +0300)]
Merge branch 'master' into Lyberta/PrintMove

6 years agoMerge branch 'master' into Lyberta/PrintMove
Lyberta [Fri, 8 Jun 2018 13:44:56 +0000 (16:44 +0300)]
Merge branch 'master' into Lyberta/PrintMove

6 years agoMerge remote-tracking branch 'origin/master' into morosophos/rankings_cnt
Morosophos [Thu, 7 Jun 2018 19:46:03 +0000 (22:46 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt

6 years agoUpdate hash
Mario [Thu, 7 Jun 2018 15:36:24 +0000 (01:36 +1000)]
Update hash

6 years agoFix the unit test
Mario [Wed, 6 Jun 2018 11:57:59 +0000 (21:57 +1000)]
Fix the unit test

6 years agoMerge branch 'master' into Lyberta/PrintMove
Lyberta [Wed, 6 Jun 2018 10:53:58 +0000 (13:53 +0300)]
Merge branch 'master' into Lyberta/PrintMove

6 years agoMerge branch 'Lyberta/mutator_is_enabled' into 'master'
Mario [Wed, 6 Jun 2018 08:39:02 +0000 (08:39 +0000)]
Merge branch 'Lyberta/mutator_is_enabled' into 'master'

Added MUTATOR_IS_ENABLED macro.

See merge request xonotic/xonotic-data.pk3dir!559

6 years agoFixed random items check in new toys. 559/head
Lyberta [Wed, 6 Jun 2018 02:00:11 +0000 (05:00 +0300)]
Fixed random items check in new toys.

6 years agoFixed compilation units.
Lyberta [Wed, 6 Jun 2018 01:50:28 +0000 (04:50 +0300)]
Fixed compilation units.

6 years agoMerge branch 'master' into Lyberta/mutator_is_enabled
Lyberta [Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)]
Merge branch 'master' into Lyberta/mutator_is_enabled

6 years agoAdded MUTATOR_IS_ENABLED macro.
Lyberta [Wed, 6 Jun 2018 00:38:40 +0000 (03:38 +0300)]
Added MUTATOR_IS_ENABLED macro.

6 years agoMerge branch 'Mario/weapons_stat'
Mario [Tue, 5 Jun 2018 07:26:08 +0000 (17:26 +1000)]
Merge branch 'Mario/weapons_stat'

6 years agoPurge .weapons field
Mario [Tue, 5 Jun 2018 07:23:55 +0000 (17:23 +1000)]
Purge .weapons field

6 years agoReplace uses of the .weapons field with STAT(WEAPONS, player), doesn't replace the...
Mario [Tue, 5 Jun 2018 06:45:02 +0000 (16:45 +1000)]
Replace uses of the .weapons field with STAT(WEAPONS, player), doesn't replace the non-player uses yet

6 years agoUse separate variable to store number of records to arrive from the server
Morosophos [Tue, 5 Jun 2018 07:22:34 +0000 (10:22 +0300)]
Use separate variable to store number of records to arrive from the server

6 years agoMerge remote-tracking branch 'origin/master' into morosophos/rankings_cnt
Nick Savchenko [Mon, 4 Jun 2018 20:57:17 +0000 (23:57 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt

6 years agoStore 99 time records in the server database. Send g_cts_send_rankings_cnt records...
Nick Savchenko [Mon, 4 Jun 2018 20:51:42 +0000 (23:51 +0300)]
Store 99 time records in the server database. Send g_cts_send_rankings_cnt records to the client (default 15)

6 years agoSpectate next player if the spectated player becomes observer (very useful in CA...
terencehill [Mon, 4 Jun 2018 16:31:17 +0000 (18:31 +0200)]
Spectate next player if the spectated player becomes observer (very useful in CA) or disconnects

6 years agoAdd an armor piercing option to vortex
Mario [Mon, 4 Jun 2018 15:40:50 +0000 (01:40 +1000)]
Add an armor piercing option to vortex

6 years agoClan Arena: fix team selection dialog displayed once more after a player dies for...
terencehill [Mon, 4 Jun 2018 14:59:12 +0000 (16:59 +0200)]
Clan Arena: fix team selection dialog displayed once more after a player dies for the first time

6 years agoAlways force re-spawn in CA, fixes sitting as observer forever
Mario [Mon, 4 Jun 2018 05:18:03 +0000 (15:18 +1000)]
Always force re-spawn in CA, fixes sitting as observer forever

6 years agoLower threshold for invisible alpha checks in bot code
Mario [Mon, 4 Jun 2018 05:05:28 +0000 (15:05 +1000)]
Lower threshold for invisible alpha checks in bot code

6 years agoSome minor tweaks to jetpack navigation
Mario [Sun, 3 Jun 2018 11:40:58 +0000 (21:40 +1000)]
Some minor tweaks to jetpack navigation

6 years agoTransifex autosync
Rudolf Polzer [Sun, 3 Jun 2018 05:24:29 +0000 (07:24 +0200)]
Transifex autosync

6 years agoTransifex autosync
Rudolf Polzer [Sat, 2 Jun 2018 05:24:33 +0000 (07:24 +0200)]
Transifex autosync

6 years agoAdd a note for later
Mario [Thu, 31 May 2018 06:22:48 +0000 (16:22 +1000)]
Add a note for later

6 years agoMerge branch 'Lyberta/StandaloneOverkillWeapons' into 'master'
Mario [Thu, 31 May 2018 06:18:25 +0000 (06:18 +0000)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into 'master'

Standalone Overkill weapons

See merge request xonotic/xonotic-data.pk3dir!461

6 years agoUndo the icon change (will redo when we have new icons)
Mario [Thu, 31 May 2018 06:08:18 +0000 (16:08 +1000)]
Undo the icon change (will redo when we have new icons)

6 years agoSanity check
Mario [Thu, 31 May 2018 06:04:00 +0000 (16:04 +1000)]
Sanity check

6 years agoUpdated hash.
Lyberta [Thu, 31 May 2018 05:59:30 +0000 (08:59 +0300)]
Updated hash.

6 years agoMerge branch 'master' into Lyberta/StandaloneOverkillWeapons
Mario [Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

# Conflicts:
# .gitlab-ci.yml

6 years agoTransifex autosync
Rudolf Polzer [Thu, 31 May 2018 05:24:41 +0000 (07:24 +0200)]
Transifex autosync

6 years agoPrevent a division by 0
terencehill [Wed, 30 May 2018 12:28:52 +0000 (14:28 +0200)]
Prevent a division by 0

6 years agocl_ghost_items cvar now really leaves the color unchanged if set to "0 0 0" (like...
terencehill [Wed, 30 May 2018 12:22:26 +0000 (14:22 +0200)]
cl_ghost_items cvar now really leaves the color unchanged if set to "0 0 0" (like the description says); improve description of cl_ghost_items_color and cl_weapon_stay_color cvars

6 years agoFix console error (assignment to world) when a bot is removed while you are spectating it
terencehill [Wed, 30 May 2018 12:03:46 +0000 (14:03 +0200)]
Fix console error (assignment to world) when a bot is removed while you are spectating it

6 years agoTransifex autosync
Rudolf Polzer [Wed, 30 May 2018 05:24:52 +0000 (07:24 +0200)]
Transifex autosync

6 years agoSet RANKINGS_CNT to 100
Nick Savchenko [Tue, 29 May 2018 17:47:28 +0000 (20:47 +0300)]
Set RANKINGS_CNT to 100

6 years agoTransifex autosync
Rudolf Polzer [Tue, 29 May 2018 05:24:36 +0000 (07:24 +0200)]
Transifex autosync

6 years agoTransifex autosync
Rudolf Polzer [Mon, 28 May 2018 05:24:29 +0000 (07:24 +0200)]
Transifex autosync

6 years agoRemove menu_updatecheck cvar and don't show the update message while connected to...
Mario [Mon, 28 May 2018 00:26:43 +0000 (10:26 +1000)]
Remove menu_updatecheck cvar and don't show the update message while connected to a server

6 years agoMerge branch 'master' into Mario/weapons_fpsfix
Mario [Sun, 27 May 2018 03:35:54 +0000 (13:35 +1000)]
Merge branch 'master' into Mario/weapons_fpsfix

6 years agoFix rain maths so it isn't multiplied too much
Mario [Sat, 26 May 2018 08:06:33 +0000 (18:06 +1000)]
Fix rain maths so it isn't multiplied too much

6 years agoTransifex autosync
Rudolf Polzer [Wed, 23 May 2018 05:24:42 +0000 (07:24 +0200)]
Transifex autosync

6 years agoTransifex autosync
Rudolf Polzer [Sun, 20 May 2018 05:24:31 +0000 (07:24 +0200)]
Transifex autosync

6 years agoTransifex autosync
Rudolf Polzer [Sat, 19 May 2018 05:24:33 +0000 (07:24 +0200)]
Transifex autosync

6 years agoTransifex autosync
Rudolf Polzer [Fri, 18 May 2018 05:24:35 +0000 (07:24 +0200)]
Transifex autosync

6 years agoMerge branch 'master' into Lyberta/PrintMove
Lyberta [Thu, 17 May 2018 08:42:02 +0000 (11:42 +0300)]
Merge branch 'master' into Lyberta/PrintMove

6 years agoTransifex autosync
Rudolf Polzer [Thu, 17 May 2018 05:24:39 +0000 (07:24 +0200)]
Transifex autosync

6 years agoReduce duplicated code
terencehill [Wed, 16 May 2018 21:49:21 +0000 (23:49 +0200)]
Reduce duplicated code

6 years agoBot AI: consider an item pickable via a jumppad only if it can be touched by all...
terencehill [Wed, 16 May 2018 20:40:21 +0000 (22:40 +0200)]
Bot AI: consider an item pickable via a jumppad only if it can be touched by all 3 test trajectories; it fixes bots trying to get the Strength without success in the map aetime

6 years agoUpdate the physics panel refresh rate to 60hz
Mario [Wed, 16 May 2018 14:15:33 +0000 (00:15 +1000)]
Update the physics panel refresh rate to 60hz

6 years agoRestore update interval value so as to keep the numbers legible above 60 FPS.
Mario [Wed, 16 May 2018 12:48:02 +0000 (22:48 +1000)]
Restore update interval value so as to keep the numbers legible above 60 FPS.

6 years agoIncrease minimum width of the scoreboard, so all cts records can be displayed
Mirio [Tue, 15 May 2018 21:18:09 +0000 (23:18 +0200)]
Increase minimum width of the scoreboard, so all cts records can be displayed

6 years agoImplement #2019
Mirio [Tue, 15 May 2018 21:17:15 +0000 (23:17 +0200)]
Implement #2019