xonotic/xonotic-data.pk3dir.git
3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Fri, 11 Nov 2016 11:04:16 +0000 (21:04 +1000)]
Merge branch 'master' into Mario/wepent_experimental

3 years agoMerge branch 'DefaultUser/m_itemid' into 'master'
Mario [Fri, 11 Nov 2016 10:51:58 +0000 (10:51 +0000)]
Merge branch 'DefaultUser/m_itemid' into 'master'

Replace m_itemid references with itemdef references where possible

See merge request !386

3 years agoMake use of constants for damagetext bitflags
terencehill [Thu, 10 Nov 2016 23:32:31 +0000 (00:32 +0100)]
Make use of constants for damagetext bitflags

3 years agoOptimize damagetext networking
terencehill [Thu, 10 Nov 2016 22:48:37 +0000 (23:48 +0100)]
Optimize damagetext networking

3 years agoAdd .m_respawnsound for GameItems 386/head
Freddy [Thu, 10 Nov 2016 21:48:44 +0000 (22:48 +0100)]
Add .m_respawnsound for GameItems

3 years ago.m_glow is only needed in GAMEQC
Freddy [Thu, 10 Nov 2016 21:27:27 +0000 (22:27 +0100)]
.m_glow is only needed in GAMEQC

3 years agoSimplify
terencehill [Thu, 10 Nov 2016 18:16:25 +0000 (19:16 +0100)]
Simplify

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)]
Merge branch 'master' into Mario/wepent_experimental

3 years agoMerge branch 'terencehill/ca_shownames_fix' into 'master'
Mario [Thu, 10 Nov 2016 16:04:58 +0000 (16:04 +0000)]
Merge branch 'terencehill/ca_shownames_fix' into 'master'

CA: fix name tags getting displayed above eliminated players (when they are spectating or observing)

It fixes #1813

See merge request !388

3 years agoMerge branch 'DefaultUser/more_damagetext' into 'master'
Mario [Thu, 10 Nov 2016 15:58:10 +0000 (15:58 +0000)]
Merge branch 'DefaultUser/more_damagetext' into 'master'

Add more options for damagetext

{potential} describes the full damage the target took without capping it when the target dies
{potential_health} describes the health damage the target took without capping it when the target dies

See merge request !382

3 years agoMerge branch 'martin-t/msnt' into 'master'
Mario [Thu, 10 Nov 2016 15:48:56 +0000 (15:48 +0000)]
Merge branch 'martin-t/msnt' into 'master'

Spawning near teammates

Fixes #1799 and makes the spawn spot selection much more reliable.

The change in defaults is what me and @RomanSixty agreed on as a reasonable value. The 0 was most likely an oversight anyway which caused players to spawn in a chain reaction e.g. https://www.youtube.com/watch?v=c2gbe-MzdAU&feature=youtu.be&t=1m5s .

The FOREACH_CLIENT_RANDOM macro unfortunately can't be nested due to QC arrays being global.

See merge request !383

3 years agoMerge branch 'DefaultUser/func_train_random_target' into 'master'
Mario [Tue, 8 Nov 2016 03:57:13 +0000 (03:57 +0000)]
Merge branch 'DefaultUser/func_train_random_target' into 'master'

Make func_train respect its target's "target_random" field

See merge request !385

3 years agoMerge branch 'master' into DefaultUser/func_train_random_target 385/head
Mario [Tue, 8 Nov 2016 03:37:22 +0000 (13:37 +1000)]
Merge branch 'master' into DefaultUser/func_train_random_target

3 years agoRemove mode prefix from some of the server list categories
Mario [Mon, 7 Nov 2016 17:29:20 +0000 (03:29 +1000)]
Remove mode prefix from some of the server list categories

3 years agoShow no title in the uid2name dialog. It fixes #1836
terencehill [Mon, 7 Nov 2016 16:20:03 +0000 (17:20 +0100)]
Show no title in the uid2name dialog. It fixes #1836

3 years agoTurn off standard weaponarena in weapon arena modes (overkill, melee only, instagib)
Mario [Mon, 7 Nov 2016 12:47:27 +0000 (22:47 +1000)]
Turn off standard weaponarena in weapon arena modes (overkill, melee only, instagib)

3 years agoSimplify conditions
terencehill [Mon, 7 Nov 2016 10:39:58 +0000 (11:39 +0100)]
Simplify conditions

3 years agoDon't count weapons available in the map as hidden
Mario [Mon, 7 Nov 2016 05:16:18 +0000 (15:16 +1000)]
Don't count weapons available in the map as hidden

3 years agoCA: fix name tags getting displayed above eliminated players (when they are spectatin... 388/head
terencehill [Sun, 6 Nov 2016 00:24:29 +0000 (01:24 +0100)]
CA: fix name tags getting displayed above eliminated players (when they are spectating or observing). It fixes #1813

3 years agoMerge branch 'master' into martin-t/msnt 383/head
Martin Taibr [Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)]
Merge branch 'master' into martin-t/msnt

3 years agoentity array
Martin Taibr [Sun, 6 Nov 2016 14:46:43 +0000 (15:46 +0100)]
entity array

3 years agoMove nade timer handling out of offhand code (offhand code isn't run when player...
Mario [Sun, 6 Nov 2016 11:44:13 +0000 (21:44 +1000)]
Move nade timer handling out of offhand code (offhand code isn't run when player is frozen)

3 years agoChange the way item glow is handled
Freddy [Sat, 5 Nov 2016 17:00:27 +0000 (18:00 +0100)]
Change the way item glow is handled

3 years agoDon't apply ITS_POWERUP to all powerups
Freddy [Sat, 5 Nov 2016 13:57:59 +0000 (14:57 +0100)]
Don't apply ITS_POWERUP to all powerups

3 years agoUpdate hash for hagar fix
Mario [Sat, 5 Nov 2016 02:47:31 +0000 (12:47 +1000)]
Update hash for hagar fix

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Sat, 5 Nov 2016 02:43:35 +0000 (12:43 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/client/view.qc
# qcsrc/common/weapons/weapon/tuba.qc

3 years agoUse .instanceOfPowerup
Freddy [Sat, 5 Nov 2016 01:41:34 +0000 (02:41 +0100)]
Use .instanceOfPowerup

3 years agoFix hagar loading and switching weapons
Mario [Fri, 4 Nov 2016 13:54:47 +0000 (23:54 +1000)]
Fix hagar loading and switching weapons

3 years agotest only 10 teammates
Martin Taibr [Thu, 3 Nov 2016 13:44:31 +0000 (14:44 +0100)]
test only 10 teammates

3 years agoless bad FOREACH_CLIENT_RANDOM
Martin Taibr [Wed, 2 Nov 2016 22:30:31 +0000 (23:30 +0100)]
less bad FOREACH_CLIENT_RANDOM

3 years agoAdd .future_target field for func_train
Freddy [Wed, 2 Nov 2016 17:57:18 +0000 (18:57 +0100)]
Add .future_target field for func_train

3 years agoHack to fix tuba alternative instruments
Mario [Wed, 2 Nov 2016 13:57:43 +0000 (23:57 +1000)]
Hack to fix tuba alternative instruments

3 years agoRemove a "="
Freddy [Wed, 2 Nov 2016 12:04:42 +0000 (13:04 +0100)]
Remove a "="

3 years agofunc_breakable: Always check for updates, not just when activated/destroyed, fixes...
Mario [Wed, 2 Nov 2016 01:50:23 +0000 (11:50 +1000)]
func_breakable: Always check for updates, not just when activated/destroyed, fixes breakable objects that can move

3 years agoAlso let the first target of func_train be random
Freddy [Tue, 1 Nov 2016 15:03:40 +0000 (16:03 +0100)]
Also let the first target of func_train be random

For this to work, the func_train entity needs to have .target_random set
initially

3 years agoRandom entity selection only for the target field for func_train
Freddy [Tue, 1 Nov 2016 14:48:34 +0000 (15:48 +0100)]
Random entity selection only for the target field for func_train

3 years agoMake func_train respect its target's "target_random" field
Freddy [Tue, 1 Nov 2016 13:24:40 +0000 (14:24 +0100)]
Make func_train respect its target's "target_random" field

3 years agoMerge branch 'martin-t/damagetext' into 'master'
terencehill [Sun, 30 Oct 2016 22:22:05 +0000 (22:22 +0000)]
Merge branch 'martin-t/damagetext' into 'master'

Add forgotten cvar to default config

See merge request !384

3 years agoadd cl_damagetext_accumulate_alpha_rel to default config 384/head
Martin Taibr [Sun, 30 Oct 2016 20:05:03 +0000 (21:05 +0100)]
add cl_damagetext_accumulate_alpha_rel to default config

3 years agofix default
Martin Taibr [Sun, 30 Oct 2016 19:32:53 +0000 (20:32 +0100)]
fix default

3 years agocleanup
Martin Taibr [Sun, 30 Oct 2016 19:17:51 +0000 (20:17 +0100)]
cleanup

3 years agoremove msnt_deathloc, fix spot selection
Martin Taibr [Sat, 29 Oct 2016 22:00:45 +0000 (00:00 +0200)]
remove msnt_deathloc, fix spot selection

3 years agoi could do something like this but it looks ugly
Martin Taibr [Sat, 29 Oct 2016 01:16:11 +0000 (03:16 +0200)]
i could do something like this but it looks ugly

3 years agodon't test all spots when a good one is found early
Martin Taibr [Fri, 28 Oct 2016 23:40:52 +0000 (01:40 +0200)]
don't test all spots when a good one is found early

3 years agocomment
Martin Taibr [Fri, 28 Oct 2016 19:23:37 +0000 (21:23 +0200)]
comment

3 years agoMerge branch 'master' into martin-t/msnt
Martin Taibr [Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)]
Merge branch 'master' into martin-t/msnt

3 years agoAlso change docstring for cl_damagetext_format in defaultXonotic.cfg 382/head
Freddy [Fri, 28 Oct 2016 18:43:11 +0000 (20:43 +0200)]
Also change docstring for cl_damagetext_format in defaultXonotic.cfg

3 years agoremove redundant test
Martin Taibr [Fri, 28 Oct 2016 18:40:01 +0000 (20:40 +0200)]
remove redundant test

3 years agoiterate through clients in random order
Martin Taibr [Fri, 28 Oct 2016 18:36:00 +0000 (20:36 +0200)]
iterate through clients in random order

3 years agoLower monster think delay (fixes choppy zombies)
Mario [Fri, 28 Oct 2016 06:04:42 +0000 (16:04 +1000)]
Lower monster think delay (fixes choppy zombies)

3 years agoMerge branch 'Mario/xonoticless_fix' into 'master'
Mario [Thu, 27 Oct 2016 23:15:46 +0000 (23:15 +0000)]
Merge branch 'Mario/xonoticless_fix' into 'master'

Merge branch Mario/xonoticless_fix (M merge request)

Moves some stuff around so the game code can be compiled with -DXONOTIC=0 again.

See merge request !381

3 years agoFix wall dodging working on the skybox
Mario [Thu, 27 Oct 2016 04:38:05 +0000 (14:38 +1000)]
Fix wall dodging working on the skybox

3 years agoFix compilation test 381/head
Mario [Tue, 25 Oct 2016 09:04:37 +0000 (19:04 +1000)]
Fix compilation test

3 years agoMerge branch 'master' into Mario/xonoticless_fix
Mario [Mon, 24 Oct 2016 22:59:40 +0000 (08:59 +1000)]
Merge branch 'master' into Mario/xonoticless_fix

3 years agoClear clients from the intrusive lists on disconnect
Mario [Mon, 24 Oct 2016 22:44:09 +0000 (08:44 +1000)]
Clear clients from the intrusive lists on disconnect

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Mon, 24 Oct 2016 17:47:15 +0000 (03:47 +1000)]
Merge branch 'master' into Mario/wepent_experimental

3 years agoMerge branch 'Mario/intrusive_3' into 'master'
Mario [Mon, 24 Oct 2016 15:59:19 +0000 (15:59 +0000)]
Merge branch 'Mario/intrusive_3' into 'master'

Merge branch Mario/intrusive_3 (XXS merge request)

Kills off one of the worst abusers of findfloat(), bringing it down under physics in the most time consuming functions list.

See merge request !380

3 years agoDamagetext: change {real_damage} to {potential_health}
Freddy [Mon, 24 Oct 2016 15:44:46 +0000 (17:44 +0200)]
Damagetext: change {real_damage} to {potential_health}

3 years agoMerge branch 'Mario/intrusive_2' into 'master'
Mario [Sun, 23 Oct 2016 21:58:36 +0000 (21:58 +0000)]
Merge branch 'Mario/intrusive_2' into 'master'

Merge branch Mario/intrusive_2 (M merge request)

Ports a few more things to intrusive lists, greatly improving performance on maps with warpzones.

See merge request !363

3 years agoVehicleSpawn --> VehicleInit
terencehill [Sun, 23 Oct 2016 19:00:35 +0000 (21:00 +0200)]
VehicleSpawn  -->  VehicleInit

3 years agoRevert "Rename VehicleSpawn mutator hook to VehicleInit and invert the returned value...
terencehill [Sun, 23 Oct 2016 18:37:04 +0000 (20:37 +0200)]
Revert "Rename VehicleSpawn mutator hook to VehicleInit and invert the returned value as it makes more sense"

This reverts commit ba479caf23cd515c9741eb6595dad2044a1fa826.

3 years agoRemove 2 unnecessary function references
terencehill [Sun, 23 Oct 2016 17:09:56 +0000 (19:09 +0200)]
Remove 2 unnecessary function references

3 years agoMake it compile with XONOTIC, too
Mario [Sun, 23 Oct 2016 04:42:26 +0000 (14:42 +1000)]
Make it compile with XONOTIC, too

3 years agoMake it compile without XONOTIC defined
Mario [Sun, 23 Oct 2016 04:26:38 +0000 (14:26 +1000)]
Make it compile without XONOTIC defined

3 years agoMerge branch 'DefaultUser/forceplayercolors_menu_update' into 'master'
Mario [Sat, 22 Oct 2016 21:30:55 +0000 (21:30 +0000)]
Merge branch 'DefaultUser/forceplayercolors_menu_update' into 'master'

add new option for cl_forceplayercolor to the menu

Change textbox to slider

See merge request !379

3 years agoadd new option for cl_forceplayercolor to the menu 379/head
Freddy [Wed, 3 Aug 2016 13:14:05 +0000 (15:14 +0200)]
add new option for cl_forceplayercolor to the menu

3 years agoDamagetext: Add {real_damage}
Freddy [Sat, 22 Oct 2016 20:24:20 +0000 (22:24 +0200)]
Damagetext: Add {real_damage}

Shows how much health damage you would have dealt even if the target
dies

3 years agoExtend docstring for cl_damagetext_format
Freddy [Wed, 13 Jul 2016 23:40:36 +0000 (01:40 +0200)]
Extend docstring for cl_damagetext_format

3 years agoDamagetext: add possibility to show potential damage
Freddy [Fri, 8 Jul 2016 13:51:22 +0000 (15:51 +0200)]
Damagetext: add possibility to show potential damage

3 years agoKill off one of the biggest baddest findchain loops 380/head
Mario [Sat, 22 Oct 2016 18:58:24 +0000 (04:58 +1000)]
Kill off one of the biggest baddest findchain loops

3 years agoTweak a few things 363/head
Mario [Sat, 22 Oct 2016 17:57:45 +0000 (03:57 +1000)]
Tweak a few things

3 years agoMerge branch 'master' into Mario/intrusive_2
Mario [Sat, 22 Oct 2016 17:48:51 +0000 (03:48 +1000)]
Merge branch 'master' into Mario/intrusive_2

3 years agoFix compile
Mario [Sat, 22 Oct 2016 02:01:39 +0000 (12:01 +1000)]
Fix compile

3 years agoAdd wall jump mutator
Mario [Sat, 22 Oct 2016 01:48:51 +0000 (11:48 +1000)]
Add wall jump mutator

3 years agoMerge branch 'martin-t/damagetext' into 'master'
Mario [Sat, 22 Oct 2016 01:13:49 +0000 (01:13 +0000)]
Merge branch 'martin-t/damagetext' into 'master'

fix damage text rounding errors when accumulating damage

This fixes MG reporting wrong damage when accumulated after passing through a wall (or similar situations where damage is not a whole number) while keeping rounding behavior for weapons like mortar.

I used MinceR's idea of multiplying the damage by 100 and sending the decimal part inside the short instead of using float to keep bandwidth the same.

Now that i think about it, this could cause trouble if the damage dealt is higher than 655 (because 656*100 won't fit in short). However health and armor max is 200 so it shouldn't happen unless we start sending damage text for vehicles as well.

See merge request !365

3 years agoAdd a break
Freddy [Fri, 21 Oct 2016 19:10:09 +0000 (21:10 +0200)]
Add a break

3 years agoReplace m_itemid with itemdef in some functions in t_items.qc
Freddy [Fri, 21 Oct 2016 18:58:31 +0000 (20:58 +0200)]
Replace m_itemid with itemdef in some functions in t_items.qc

3 years agoSpawner: Spawn nothing if it's set to an invalid monster
Mario [Fri, 21 Oct 2016 16:15:29 +0000 (02:15 +1000)]
Spawner: Spawn nothing if it's set to an invalid monster

3 years agoUpdate hash
Mario [Fri, 21 Oct 2016 15:52:39 +0000 (01:52 +1000)]
Update hash

3 years agoFix source comments in physicsX.cfg.
Rudolf Polzer [Fri, 21 Oct 2016 14:41:53 +0000 (10:41 -0400)]
Fix source comments in physicsX.cfg.

3 years agoReapply size to func_breakable when changing its model
Mario [Fri, 21 Oct 2016 01:38:32 +0000 (11:38 +1000)]
Reapply size to func_breakable when changing its model

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Fri, 21 Oct 2016 01:27:13 +0000 (11:27 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc
# qcsrc/common/weapons/weapon/tuba.qc

3 years agoCheck for matching switchweapon when auto firing arc and hagar
Mario [Fri, 21 Oct 2016 01:24:56 +0000 (11:24 +1000)]
Check for matching switchweapon when auto firing arc and hagar

3 years agoMerge branch 'terencehill/ons_camera' into 'master'
Mario [Fri, 21 Oct 2016 01:17:46 +0000 (01:17 +0000)]
Merge branch 'terencehill/ons_camera' into 'master'

Onslaught: improve generator's explosion view

* Make use of .clientcamera showing the exploding generator, this way vis is checked correctly
* Find best suitable angles for the generator's camera (particularly useful in runningmanctf)

See merge request !377

3 years agoMerge branch 'martin-t/unused_fields' into 'master'
Mario [Fri, 21 Oct 2016 01:17:03 +0000 (01:17 +0000)]
Merge branch 'martin-t/unused_fields' into 'master'

Martin t/unused fields

I was playing with grep&friends and decided to see if I could remove some unused fields from the code. I actually expected to find a lot more and only removed a few of those anyway because sometimes I wasn't sure if it's safe to remove them and didn't wanna spend too much time on it.

If anybody wants to go more in-depth, I'll leave the ipython script here as inspiration

```
#!/usr/bin/env ipython3

fields = !find . -type f -name '*.q*' -print0 | xargs -0 grep -hoP '^[[:space:]]*\.[a-zA-Z1-9_]+ [a-zA-Z1-9_]+(, [a-zA-Z1-9_]+)*;' | awk '{$1 = ""; print}' | tr ',' '\n' | tr -d " ;"

fields = set(fields)
fields = sorted(fields)

for field in fields:
    ret = !find . -type f -name '*.q*' -print0 | xargs -0 grep -P '\.$field[^a-zA-Z1-9_]?'
    if len(ret) <= 1:
        print(field + " " + str(len(ret)))
```

See merge request !378

3 years agoone more 378/head
Martin Taibr [Thu, 20 Oct 2016 23:27:18 +0000 (01:27 +0200)]
one more

3 years agoitthis isn't a word
Mario [Thu, 20 Oct 2016 21:32:32 +0000 (07:32 +1000)]
itthis isn't a word

3 years agoAdd a basic entity that spawns monsters when triggered
Mario [Thu, 20 Oct 2016 21:30:25 +0000 (07:30 +1000)]
Add a basic entity that spawns monsters when triggered

3 years agoMerge branch 'master' into terencehill/ons_camera 377/head
terencehill [Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)]
Merge branch 'master' into terencehill/ons_camera

3 years agoOnslaught: get rid of an error message when round restart
terencehill [Thu, 20 Oct 2016 13:52:43 +0000 (15:52 +0200)]
Onslaught: get rid of an error message when round restart

3 years agoMake the target entity a parameter instead of spawning it, so the monster's spawn...
Mario [Wed, 19 Oct 2016 21:53:37 +0000 (07:53 +1000)]
Make the target entity a parameter instead of spawning it, so the monster's spawn fields can be customized

3 years agoAllow setting a monster to not auto align itself at spawn
Mario [Wed, 19 Oct 2016 21:21:39 +0000 (07:21 +1000)]
Allow setting a monster to not auto align itself at spawn

3 years agoFix the error message that appears when loading an instagib-only map into regular...
Rudolf Polzer [Wed, 19 Oct 2016 21:11:10 +0000 (17:11 -0400)]
Fix the error message that appears when loading an instagib-only map into regular gameplay.

Replaces:

can't play the selected map in the given game mode (dm). Falling back to
a supported mode (dm)

with:

the selected map lacks features required by current settings; playing
anyway.

Note: such maps aren't selectable/votable anyway, this only applies to the "map" command.

3 years agoFix intrusive list warning when a monster re-spawns
Mario [Wed, 19 Oct 2016 21:10:44 +0000 (07:10 +1000)]
Fix intrusive list warning when a monster re-spawns

3 years agoClean up monster direction checking code a bit more
Mario [Wed, 19 Oct 2016 20:46:04 +0000 (06:46 +1000)]
Clean up monster direction checking code a bit more

3 years agoDon't check trace_fraction on all cases
Mario [Wed, 19 Oct 2016 20:37:37 +0000 (06:37 +1000)]
Don't check trace_fraction on all cases

3 years agoMake sure monster turns around if it touches another monster
Mario [Wed, 19 Oct 2016 20:35:06 +0000 (06:35 +1000)]
Make sure monster turns around if it touches another monster

3 years agoMake monster appear flag work properly with re-spawning
Mario [Wed, 19 Oct 2016 20:27:42 +0000 (06:27 +1000)]
Make monster appear flag work properly with re-spawning

3 years agoFix warning spam for bots using the tuba.
Rudolf Polzer [Wed, 19 Oct 2016 20:18:39 +0000 (16:18 -0400)]
Fix warning spam for bots using the tuba.

3 years agoDon't spawn passive monsters if random is chosen
Mario [Wed, 19 Oct 2016 19:44:45 +0000 (05:44 +1000)]
Don't spawn passive monsters if random is chosen