xonotic/xonotic-data.pk3dir.git
18 months agoMerge branch 'Mario/qcphysics' into 'master'
Mario [Tue, 21 Jan 2020 20:09:47 +0000 (20:09 +0000)]
Merge branch 'Mario/qcphysics' into 'master'

Enable QC physics by default again, as the known issues with it have been resolved

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

18 months agoUpdate hash
Mario [Tue, 21 Jan 2020 19:57:17 +0000 (05:57 +1000)]
Update hash

18 months agoMerge branch 'master' into Mario/qcphysics
Mario [Tue, 21 Jan 2020 19:24:22 +0000 (05:24 +1000)]
Merge branch 'master' into Mario/qcphysics

18 months agoMerge branch 'Mario/ipv6_gamelog' into 'master'
Mario [Tue, 21 Jan 2020 15:29:02 +0000 (15:29 +0000)]
Merge branch 'Mario/ipv6_gamelog' into 'master'

Merge branch Mario/ipv6_gamelog (S merge request)

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

18 months agoMake the delimiter a hardcoded toggle rather than a customisable setting 765/head
Mario [Mon, 20 Jan 2020 23:07:06 +0000 (09:07 +1000)]
Make the delimiter a hardcoded toggle rather than a customisable setting

18 months agoMerge branch 'bones_was_here/flaglights' into 'master'
Mario [Mon, 20 Jan 2020 22:42:55 +0000 (22:42 +0000)]
Merge branch 'bones_was_here/flaglights' into 'master'

Add description for g_ctf_dynamiclights and whitelist

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

18 months agoAdd description for g_ctf_dynamiclights and whitelist 764/head
bones_was_here [Mon, 20 Jan 2020 22:32:56 +0000 (08:32 +1000)]
Add description for g_ctf_dynamiclights and whitelist

18 months agoTemporarily whitelist CTF stalemate timer so that different values can be tested...
Mario [Mon, 20 Jan 2020 22:17:20 +0000 (08:17 +1000)]
Temporarily whitelist CTF stalemate timer so that different values can be tested on servers without affecting purity

18 months agoMerge branch 'Mario/rain_fix' into 'master'
Mario [Mon, 20 Jan 2020 19:09:39 +0000 (19:09 +0000)]
Merge branch 'Mario/rain_fix' into 'master'

Merge branch Mario/rain_fix (M merge request)

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

18 months agoMerge branch 'Mario/csqc_refdef' into 'master'
Mario [Mon, 20 Jan 2020 19:08:34 +0000 (19:08 +0000)]
Merge branch 'Mario/csqc_refdef' into 'master'

Merge branch Mario/csqc_refdef (XXS merge request)

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

18 months agoMerge branch 'Mario/intrusivelist_objects' into 'master'
Mario [Mon, 20 Jan 2020 07:06:39 +0000 (07:06 +0000)]
Merge branch 'Mario/intrusivelist_objects' into 'master'

Merge branch Mario/intrusivelist_objects (S merge request)

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

18 months agoAllow customising the delimiter of IPV6 IPs in the game log's join message, so script...
Mario [Mon, 20 Jan 2020 02:32:16 +0000 (12:32 +1000)]
Allow customising the delimiter of IPV6 IPs in the game log's join message, so scripts can process it easier

18 months agoAdd a compiler flag to debug shotgun melee range
Mario [Sun, 19 Jan 2020 18:05:44 +0000 (04:05 +1000)]
Add a compiler flag to debug shotgun melee range

18 months agoUpdate item sizes in other locations, to match the new default
Mario [Sun, 19 Jan 2020 16:41:46 +0000 (02:41 +1000)]
Update item sizes in other locations, to match the new default

18 months agoMerge branch 'bones_was_here/weaponbbox' into 'master'
Mario [Sun, 19 Jan 2020 16:32:49 +0000 (16:32 +0000)]
Merge branch 'bones_was_here/weaponbbox' into 'master'

Increase height of weapon item bbox from 32 to 48

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

18 months agoAllow mappers to define the draw distance of the rain brush, useful for extra large... 762/head
Mario [Sun, 19 Jan 2020 00:18:59 +0000 (10:18 +1000)]
Allow mappers to define the draw distance of the rain brush, useful for extra large maps where the default distance may be too much

18 months agoIncrease rain draw distance to 1000 (also for drain)
Mario [Sun, 19 Jan 2020 00:12:26 +0000 (10:12 +1000)]
Increase rain draw distance to 1000 (also for drain)

18 months agoIncrease rain draw distance to 700, so drain functions
Mario [Sun, 19 Jan 2020 00:10:54 +0000 (10:10 +1000)]
Increase rain draw distance to 700, so drain functions

18 months agoFix rainsnow logic, thanks to Player_2
Mario [Sun, 19 Jan 2020 00:07:53 +0000 (10:07 +1000)]
Fix rainsnow logic, thanks to Player_2

18 months agoMerge branch 'master' into Mario/rain_fix
Mario [Sat, 18 Jan 2020 22:36:44 +0000 (08:36 +1000)]
Merge branch 'master' into Mario/rain_fix

18 months agoReplace some per-frame physics loops with intrusive lists 761/head
Mario [Sat, 18 Jan 2020 21:33:46 +0000 (07:33 +1000)]
Replace some per-frame physics loops with intrusive lists

18 months agoDisable third person spectator change camera until its effect can be improved, as...
Mario [Sat, 18 Jan 2020 21:00:38 +0000 (07:00 +1000)]
Disable third person spectator change camera until its effect can be improved, as per #2157

18 months agoIncrease height of weapon item bbox from 32 to 48 760/head
bones_was_here [Sat, 18 Jan 2020 20:10:10 +0000 (06:10 +1000)]
Increase height of weapon item bbox from 32 to 48

18 months agoMerge branch 'martin-t/electro-denoobing' into 'master'
Martin Taibr [Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)]
Merge branch 'martin-t/electro-denoobing' into 'master'

Electro: midair combos

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

18 months agoelectro midaircombo_speed to preserve balance bug :P 757/head
Martin Taibr [Sat, 18 Jan 2020 14:25:04 +0000 (15:25 +0100)]
electro midaircombo_speed to preserve balance bug :P

18 months agoMove weapon frame handling to the client side
Mario [Sat, 18 Jan 2020 00:11:17 +0000 (10:11 +1000)]
Move weapon frame handling to the client side

18 months agoRemove a macro only used once, clean up miscfunctions a tiny bit
Mario [Fri, 17 Jan 2020 23:19:45 +0000 (09:19 +1000)]
Remove a macro only used once, clean up miscfunctions a tiny bit

18 months agoRemove/disable a couple of unused misc functions
Mario [Fri, 17 Jan 2020 16:33:20 +0000 (02:33 +1000)]
Remove/disable a couple of unused misc functions

18 months agoRename AmmoNameFromWeaponentity to GetAmmoName and move it out of miscfunctions
Mario [Fri, 17 Jan 2020 16:07:37 +0000 (02:07 +1000)]
Rename AmmoNameFromWeaponentity to GetAmmoName and move it out of miscfunctions

18 months agomore midair combo options: own/teammate/enemy
Martin Taibr [Thu, 16 Jan 2020 14:34:18 +0000 (15:34 +0100)]
more midair combo options: own/teammate/enemy

18 months agokeep old midair combo behavior in all balances
Martin Taibr [Thu, 16 Jan 2020 13:51:56 +0000 (14:51 +0100)]
keep old midair combo behavior in all balances

18 months agofix read from deleted entity
Martin Taibr [Thu, 16 Jan 2020 13:51:38 +0000 (14:51 +0100)]
fix read from deleted entity

18 months agoDisable cl_useenginerefdef by default so that the QC implementation is used 758/head
Mario [Wed, 15 Jan 2020 18:19:15 +0000 (04:19 +1000)]
Disable cl_useenginerefdef by default so that the QC implementation is used

18 months agoSince the polygon drawing calls now explicitly state whether they're 2D or 3D, remove...
Mario [Wed, 15 Jan 2020 17:58:01 +0000 (03:58 +1000)]
Since the polygon drawing calls now explicitly state whether they're 2D or 3D, remove a hack older than Xonotic that was used to force the engine to guess that it's 2D mode

18 months agoFix g_maplist_votable_abstain description
Mario [Wed, 15 Jan 2020 09:10:11 +0000 (19:10 +1000)]
Fix g_maplist_votable_abstain description

18 months agoTransifex autosync
Rudolf Polzer [Wed, 15 Jan 2020 06:25:16 +0000 (07:25 +0100)]
Transifex autosync

18 months agoFix sv_doors_always_open definition in config
Mario [Tue, 14 Jan 2020 21:55:44 +0000 (07:55 +1000)]
Fix sv_doors_always_open definition in config

18 months agoAdd a function to skip certain target fields when using an entity's targets so they...
Mario [Tue, 14 Jan 2020 21:53:24 +0000 (07:53 +1000)]
Add a function to skip certain target fields when using an entity's targets so they don't need to be manually nullified, fix a potential crash with warpzone targets

18 months agoAdd an option to disable flag waypoints in CTF on the server, useful for maps where...
Mario [Tue, 14 Jan 2020 19:45:44 +0000 (05:45 +1000)]
Add an option to disable flag waypoints in CTF on the server, useful for maps where the flag's location isn't represented accurately by them (e.g. warpzone heavy maps), also add an option to control the maximum view distance of flag waypoints, useful for large maps that have lots of flags

18 months agoadd midaircombo_own to balance files
Martin Taibr [Tue, 14 Jan 2020 17:51:58 +0000 (18:51 +0100)]
add midaircombo_own to balance files

18 months agoUpdate ticrate before calling player prediction code
Mario [Tue, 14 Jan 2020 17:18:22 +0000 (03:18 +1000)]
Update ticrate before calling player prediction code

18 months agoFix a division by 0
Mario [Tue, 14 Jan 2020 17:15:37 +0000 (03:15 +1000)]
Fix a division by 0

18 months agoUpdate the saved fields as well if there's no tick rate defined for server matched...
Mario [Tue, 14 Jan 2020 17:03:15 +0000 (03:03 +1000)]
Update the saved fields as well if there's no tick rate defined for server matched physics, fixes projectiles with sys_ticrate set to 0

18 months agoAdd Freeze Tag to the list of gamemodes that don't require weapons on the map
Mario [Tue, 14 Jan 2020 16:53:28 +0000 (02:53 +1000)]
Add Freeze Tag to the list of gamemodes that don't require weapons on the map

18 months agoFix raptor landing not taking the full time with very high ticrates
Mario [Tue, 14 Jan 2020 16:52:04 +0000 (02:52 +1000)]
Fix raptor landing not taking the full time with very high ticrates

18 months agoDo traces for shot origin when the racer is actually going to fire, instead of every...
Mario [Tue, 14 Jan 2020 16:22:21 +0000 (02:22 +1000)]
Do traces for shot origin when the racer is actually going to fire, instead of every frame the player has the button held, fixes some inconsistencies with racer cannon alternation

18 months agoUse the effect entity instead of strings for vehicle projectile muzzle effects
Mario [Tue, 14 Jan 2020 16:07:40 +0000 (02:07 +1000)]
Use the effect entity instead of strings for vehicle projectile muzzle effects

18 months agoFix raptor cannon spamming attacks as fast as it can instead of obeying its refire...
Mario [Tue, 14 Jan 2020 16:01:47 +0000 (02:01 +1000)]
Fix raptor cannon spamming attacks as fast as it can instead of obeying its refire, also increase the refire to match the current ticrate

18 months agoMerge branch 'martin-t/linkexplode' into 'master'
Mario [Tue, 14 Jan 2020 13:34:32 +0000 (13:34 +0000)]
Merge branch 'martin-t/linkexplode' into 'master'

Enable linkexplode by default again

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

18 months agoremove bal-wep-xpm
Martin Taibr [Tue, 14 Jan 2020 13:13:25 +0000 (14:13 +0100)]
remove bal-wep-xpm

18 months agoupdate hash
Martin Taibr [Tue, 14 Jan 2020 13:09:38 +0000 (14:09 +0100)]
update hash

18 months agoMerge branch 'terencehill/spectate_player' into 'master'
Mario [Tue, 14 Jan 2020 13:09:26 +0000 (13:09 +0000)]
Merge branch 'terencehill/spectate_player' into 'master'

Make so that 'spectate playerX' does nothing if it fails to spectate playerX

Closes #2328

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

18 months agoMerge branch 'master' into martin-t/linkexplode
Martin Taibr [Tue, 14 Jan 2020 13:01:21 +0000 (14:01 +0100)]
Merge branch 'master' into martin-t/linkexplode

18 months agoMerge branch 'DefaultUser/mapinfo_without_weapons_in_ca' into 'master'
Mario [Tue, 14 Jan 2020 10:45:27 +0000 (10:45 +0000)]
Merge branch 'DefaultUser/mapinfo_without_weapons_in_ca' into 'master'

CA doesn't require weapons on maps

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

18 months agoFix a NaN warning from Raptor flares
Mario [Tue, 14 Jan 2020 09:44:11 +0000 (19:44 +1000)]
Fix a NaN warning from Raptor flares

18 months agoTransifex autosync
Rudolf Polzer [Tue, 14 Jan 2020 06:25:15 +0000 (07:25 +0100)]
Transifex autosync

18 months agoAdd g_buffs_randomize_teamplay setting (on by default) to control whether buffs are...
Mario [Mon, 13 Jan 2020 16:49:20 +0000 (02:49 +1000)]
Add g_buffs_randomize_teamplay setting (on by default) to control whether buffs are randomized in teamplay modes (g_buffs_randomize still acts as a master switch), useful for modes with bases where symmetry may be desired

18 months agoCA doesn't require weapons on maps 756/head
Freddy [Sun, 12 Jan 2020 19:01:41 +0000 (20:01 +0100)]
CA doesn't require weapons on maps

18 months agoAdjust DeFrag compatibility's player size adjustment to fit the visible player model...
Mario [Sun, 12 Jan 2020 14:46:27 +0000 (00:46 +1000)]
Adjust DeFrag compatibility's player size adjustment to fit the visible player model more accurately

18 months agoMake crosshair_chase_playeralpha a cvar
Mario [Sun, 12 Jan 2020 14:19:28 +0000 (00:19 +1000)]
Make crosshair_chase_playeralpha a cvar

18 months agoAutomatically detect .arena files instead of adding a settemp hack to generated ...
Mario [Sun, 12 Jan 2020 13:00:29 +0000 (23:00 +1000)]
Automatically detect .arena files instead of adding a settemp hack to generated .mapinfo files

18 months agoRestore Vortex balance to Xonotic defaults in the Testing balance
Mario [Sun, 12 Jan 2020 11:59:10 +0000 (21:59 +1000)]
Restore Vortex balance to Xonotic defaults in the Testing balance

18 months agoMerge branch 'martin-t/solpen-nerf' into 'master'
Mario [Sun, 12 Jan 2020 11:26:52 +0000 (11:26 +0000)]
Merge branch 'martin-t/solpen-nerf' into 'master'

Linear solpen falloff again

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

18 months agoupdate hash 755/head
Martin Taibr [Sun, 12 Jan 2020 11:10:53 +0000 (12:10 +0100)]
update hash

18 months agolinear solpen falloff again
Martin Taibr [Sun, 12 Jan 2020 11:00:47 +0000 (12:00 +0100)]
linear solpen falloff again

18 months agoRevert "Make sure g_campaign is always reset to 0 on disconnection (without relying...
terencehill [Sat, 11 Jan 2020 23:15:57 +0000 (00:15 +0100)]
Revert "Make sure g_campaign is always reset to 0 on disconnection (without relying on the "Start Multiplayer!" button of the menu)"

This reverts commit c8534e0bb85fe93b76ad32415bb0581d4771dd9b.

18 months agoWIP: electro: allow midair combos to only affect enemy orbs
Martin Taibr [Fri, 10 Jan 2020 22:03:51 +0000 (23:03 +0100)]
WIP: electro: allow midair combos to only affect enemy orbs

18 months agoMerge branch 'mirceakitsune/campaign_leadlimit' into 'master'
Martin Taibr [Fri, 10 Jan 2020 20:00:24 +0000 (20:00 +0000)]
Merge branch 'mirceakitsune/campaign_leadlimit' into 'master'

Allow campaign levels to specify leadlimit

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

18 months agoAllow campaign levels to specify leadlimit
Mircea Kitsune [Fri, 10 Jan 2020 20:00:24 +0000 (20:00 +0000)]
Allow campaign levels to specify leadlimit

18 months agoUpdate the view smoothing cvars to Xonotic values in code
Mario [Fri, 10 Jan 2020 15:39:03 +0000 (01:39 +1000)]
Update the view smoothing cvars to Xonotic values in code

18 months agoSet a default value for cl_stairsmoothspeed in code so that it works in any engine
Mario [Fri, 10 Jan 2020 15:12:10 +0000 (01:12 +1000)]
Set a default value for cl_stairsmoothspeed in code so that it works in any engine

18 months agoRename sv_vq3compat to sv_q3defragcompat to clarify its purpose
Mario [Thu, 9 Jan 2020 11:22:04 +0000 (21:22 +1000)]
Rename sv_vq3compat to sv_q3defragcompat to clarify its purpose

18 months agoAutomatically detect .defi files and enable VQ3 compat at match start, not while...
Mario [Thu, 9 Jan 2020 11:08:35 +0000 (21:08 +1000)]
Automatically detect .defi files and enable VQ3 compat at match start, not while generating the .mapinfo file

18 months agoMerge branch 'illwieckz/ge128' into 'master'
Mario [Thu, 9 Jan 2020 09:57:19 +0000 (09:57 +0000)]
Merge branch 'illwieckz/ge128' into 'master'

DarkPlaces does not support alphaFunc GT0 and uses GE128 instead

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

18 months agoDarkPlaces does not support alphaFunc GT0 and uses GE128 instead 753/head
Thomas Debesse [Thu, 9 Jan 2020 09:27:03 +0000 (10:27 +0100)]
DarkPlaces does not support alphaFunc GT0 and uses GE128 instead

By making this change, we ensure the materials look the same on DarkPlaces and
other engines, even in the case it's wrong on DarkPlaces because Xonotic mappers
now expect the wrong behavior.

Darkplaces only supports one alphaFunc operation, it only reads the alphaFunc
keyword and does not read the function name:

https://gitlab.com/xonotic/darkplaces/blob/324a5329d33ef90df59e6488abce6433d90ac04c/model_shared.c#L1875-1876

It then uses the GE128 operator unconditionally:

https://gitlab.com/xonotic/darkplaces/blob/0ea8f691e05ea968bb8940942197fa627966ff99/render.h#L95

People may silently introduce regressions in their textures designed for GT0
by compressing them using a lossy picture format like Jpg.

Xonotic texture known to trigger this bug (in xonotic-maps):

    models/desertfactory/textures/shaders/grass01.jpg

Using GE128 hides Jpeg artifacts while it's possible a TGA version worked with GT0.

Xonotic texture that may benefit from GT0 if supported (in xonotic-maps):

    models/desertfactory/textures/shaders/sign_ladder_dirty.jpg

By storing this texture in lossless format and making sure the frame is pure
black and the ladder is a bit less black than pure black, only the frame would
be transparent.

Unfortunately, after years of GE128 usagen displaying the texture with GT0
operation would be a regression.

Note: I also renamed some `alphafunc` to `alphaFunc` even if it was already GE128.

18 months agoadd link to translation guide on wiki
Martin Taibr [Wed, 8 Jan 2020 13:42:30 +0000 (14:42 +0100)]
add link to translation guide on wiki

18 months agoMerge branch 'martin-t/weaponorder' into 'master'
Mario [Wed, 8 Jan 2020 05:48:31 +0000 (05:48 +0000)]
Merge branch 'martin-t/weaponorder' into 'master'

Cleanup weaponorder

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

18 months agoMerge branch 'is_not_beaten' into 'master'
Mario [Wed, 8 Jan 2020 05:42:49 +0000 (05:42 +0000)]
Merge branch 'is_not_beaten' into 'master'

Show goal time in Race scoreboard w/o "is beaten"

Closes #2320

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

18 months agoMake sure g_campaign is always reset to 0 on disconnection (without relying on the...
terencehill [Tue, 7 Jan 2020 18:57:51 +0000 (19:57 +0100)]
Make sure g_campaign is always reset to 0 on disconnection (without relying on the "Start Multiplayer!" button of the menu)

18 months agoMake uses of R_BeginPolygon explicit as to whether they're 2D or 3D
Mario [Tue, 7 Jan 2020 18:09:50 +0000 (04:09 +1000)]
Make uses of R_BeginPolygon explicit as to whether they're 2D or 3D

18 months agoMake the slick flag usable outside of applygravity
Mario [Tue, 7 Jan 2020 16:57:11 +0000 (02:57 +1000)]
Make the slick flag usable outside of applygravity

18 months agoMerge branch 'terencehill/frametime_checks' into 'master'
Mario [Tue, 7 Jan 2020 14:40:04 +0000 (14:40 +0000)]
Merge branch 'terencehill/frametime_checks' into 'master'

Frametime checks

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

18 months agoMerge branch 'master' into Mario/qcphysics
Mario [Tue, 7 Jan 2020 13:12:55 +0000 (23:12 +1000)]
Merge branch 'master' into Mario/qcphysics

18 months agoFix off-hand grappling hook firing from the center of the screen
Mario [Mon, 6 Jan 2020 19:14:35 +0000 (05:14 +1000)]
Fix off-hand grappling hook firing from the center of the screen

18 months agoDon't copy trace globals when performing touch with entities, the engine does this...
Mario [Mon, 6 Jan 2020 18:51:12 +0000 (04:51 +1000)]
Don't copy trace globals when performing touch with entities, the engine does this to provide them to QC, a process that is not required in QC

18 months agoTweak unsticking to match the engine a bit closer, fixes some issues with getting...
Mario [Mon, 6 Jan 2020 18:24:43 +0000 (04:24 +1000)]
Tweak unsticking to match the engine a bit closer, fixes some issues with getting stuck inside clips

18 months agoUpdate cl_viewmodel_alpha description
Mario [Mon, 6 Jan 2020 17:43:07 +0000 (03:43 +1000)]
Update cl_viewmodel_alpha description

18 months agoMerge branch 'Mario/weapon_opacity_menu' into 'master'
Mario [Mon, 6 Jan 2020 17:41:25 +0000 (17:41 +0000)]
Merge branch 'Mario/weapon_opacity_menu' into 'master'

Merge branch Mario/weapon_opacity_menu (S merge request)

Closes #2371

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

18 months agoMerge branch Mario/weapon_opacity_menu (S merge request)
Mario [Mon, 6 Jan 2020 17:41:25 +0000 (17:41 +0000)]
Merge branch Mario/weapon_opacity_menu (S merge request)

18 months agoHopefully fix compilation units
Mario [Mon, 6 Jan 2020 12:52:11 +0000 (22:52 +1000)]
Hopefully fix compilation units

18 months agoFix crouching not being applied while in bloodloss
Mario [Mon, 6 Jan 2020 12:29:58 +0000 (22:29 +1000)]
Fix crouching not being applied while in bloodloss

18 months agoFix glitchy jumping while bloodloss is in effect
Mario [Mon, 6 Jan 2020 12:21:19 +0000 (22:21 +1000)]
Fix glitchy jumping while bloodloss is in effect

18 months agoDisable bloodloss when the match has ended, fixes cases where players instantly die...
Mario [Mon, 6 Jan 2020 11:56:25 +0000 (21:56 +1000)]
Disable bloodloss when the match has ended, fixes cases where players instantly die during intermission

18 months agoRemove crosshair_hittest_showimpact from the menu and add a notice to its cvar that...
Mario [Mon, 6 Jan 2020 11:52:48 +0000 (21:52 +1000)]
Remove crosshair_hittest_showimpact from the menu and add a notice to its cvar that it's glitchy

18 months agoReset weapon alignment on respawn and when dual wielding status changes, default...
Mario [Mon, 6 Jan 2020 10:27:07 +0000 (20:27 +1000)]
Reset weapon alignment on respawn and when dual wielding status changes, default to right alignment when dual wielding

18 months agoMerge branch 'mirceakitsune/campaign_gametype_icon' into 'master'
Martin Taibr [Sat, 4 Jan 2020 16:20:45 +0000 (16:20 +0000)]
Merge branch 'mirceakitsune/campaign_gametype_icon' into 'master'

Draw the gametype icon on campaign entries

Since I've been doing multiple campaign fixes, I decided to include an update to the menu part as well. I wanted to see how it would look if the gametype icon of levels was also displayed within the field. Personally I find it good looking, as well somewhat easier to tell which level you're at with this change.

I tried several combinations; Above the checkmark looked okay, but it's harder to tell which level the icon is referring to... it seems to look best on the right side of the map preview image. I included a few screenshots, the first representing the old appearance and the last being what the MR currently adds... if you find another position better please suggest it and I'll make a new commit.

![campaign](/uploads/3cf11cc059b9353dfa1dc973c4e859b9/campaign.jpg)
![campaign_above_checkmark](/uploads/9537d4e2bc7919f4275c8848ffbba405/campaign_above_checkmark.jpg)
![campaign_preview_left](/uploads/2ecd0dfa12246c26a9accc4485658b4e/campaign_preview_left.jpg)
![campaign_preview_right](/uploads/f4b32394f3b54e13daf43a50e32b33a7/campaign_preview_right.jpg)

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

18 months agoMerge branch 'mirceakitsune/campaign_difficulty' into 'master'
Martin Taibr [Fri, 3 Jan 2020 04:33:33 +0000 (04:33 +0000)]
Merge branch 'mirceakitsune/campaign_difficulty' into 'master'

Better campaign difficulty customization

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

18 months agoBetter campaign difficulty customization
Mircea Kitsune [Fri, 3 Jan 2020 04:33:33 +0000 (04:33 +0000)]
Better campaign difficulty customization

18 months agoDon't use the IS_DEAD macro in CSQC Player code (not defined in lib)
Mario [Thu, 2 Jan 2020 13:04:06 +0000 (23:04 +1000)]
Don't use the IS_DEAD macro in CSQC Player code (not defined in lib)

18 months agoUse cp instead of ln to create the csprogs pk3.
Rudolf Polzer [Thu, 2 Jan 2020 00:53:11 +0000 (19:53 -0500)]
Use cp instead of ln to create the csprogs pk3.

Makes building work even when hard links are not supported.