xonotic/xonotic-data.pk3dir.git
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 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 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 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 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 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 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 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 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

3 years agoAdd a passive flag for monsters that don't chase players
Mario [Wed, 19 Oct 2016 19:41:12 +0000 (05:41 +1000)]
Add a passive flag for monsters that don't chase players

3 years agoOnslaught: fix clientcamera support when round restarts
terencehill [Wed, 19 Oct 2016 01:11:41 +0000 (03:11 +0200)]
Onslaught: fix clientcamera support when round restarts

3 years agoFix control point icon spinning rapidly when it comes into view
Mario [Tue, 18 Oct 2016 19:01:08 +0000 (05:01 +1000)]
Fix control point icon spinning rapidly when it comes into view

3 years agoMerge branch 'master' into terencehill/ons_camera
terencehill [Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)]
Merge branch 'master' into terencehill/ons_camera

3 years agoFix monster ticrates
Mario [Tue, 18 Oct 2016 15:55:46 +0000 (01:55 +1000)]
Fix monster ticrates

3 years agoOther half of the fix
Mario [Tue, 18 Oct 2016 07:22:23 +0000 (17:22 +1000)]
Other half of the fix

3 years agoFix spectator weapon entity
Mario [Tue, 18 Oct 2016 07:20:23 +0000 (17:20 +1000)]
Fix spectator weapon entity

3 years agoChange bulldozer direction handling to send 1 byte instead of 2
Mario [Mon, 17 Oct 2016 23:37:25 +0000 (09:37 +1000)]
Change bulldozer direction handling to send 1 byte instead of 2

3 years agoMerge branch 'terencehill/menu_quit_dialog_fix' into 'master'
Mario [Mon, 17 Oct 2016 17:56:47 +0000 (17:56 +0000)]
Merge branch 'terencehill/menu_quit_dialog_fix' into 'master'

Hide the menu when closing the Quit dialog while connected

See merge request !376

3 years agoOnly send wepent to its owner client
Mario [Mon, 17 Oct 2016 17:35:38 +0000 (03:35 +1000)]
Only send wepent to its owner client

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

3 years agoFix minor redundancy in nexball dphitcontentsmask
Mario [Mon, 17 Oct 2016 14:01:29 +0000 (00:01 +1000)]
Fix minor redundancy in nexball dphitcontentsmask

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Mon, 17 Oct 2016 13:37:30 +0000 (23:37 +1000)]
Merge branch 'master' into Mario/wepent_experimental

3 years agoUpdate hash again...
Mario [Mon, 17 Oct 2016 13:26:16 +0000 (23:26 +1000)]
Update hash again...

3 years agoremove more unused fields
Martin Taibr [Sun, 16 Oct 2016 15:47:30 +0000 (17:47 +0200)]
remove more unused fields

3 years agoHide the menu when closing the Quit dialog while connected 376/head
terencehill [Fri, 14 Oct 2016 18:17:42 +0000 (20:17 +0200)]
Hide the menu when closing the Quit dialog while connected

3 years agoMake nexball's ball bounce off player clips (fixes ball falling into inaccessible...
Mario [Fri, 14 Oct 2016 17:02:50 +0000 (03:02 +1000)]
Make nexball's ball bounce off player clips (fixes ball falling into inaccessible areas on some maps)

3 years agoRevert last 2 commits (cause is elsewhere)
Mario [Fri, 14 Oct 2016 16:54:55 +0000 (02:54 +1000)]
Revert last 2 commits (cause is elsewhere)

3 years agoAlso don't consider player same team if they're dead or spectating
Mario [Fri, 14 Oct 2016 16:51:52 +0000 (02:51 +1000)]
Also don't consider player same team if they're dead or spectating

3 years agoIgnore CA spectators
Mario [Fri, 14 Oct 2016 16:39:58 +0000 (02:39 +1000)]
Ignore CA spectators

3 years agoRemove oldmovement (unused)
Mario [Fri, 14 Oct 2016 10:35:03 +0000 (20:35 +1000)]
Remove oldmovement (unused)

3 years agoAdd a mutator hook to force hide the scoreboard
Mario [Fri, 14 Oct 2016 10:22:13 +0000 (20:22 +1000)]
Add a mutator hook to force hide the scoreboard

3 years agoanim_pain
Martin Taibr [Fri, 14 Oct 2016 00:44:12 +0000 (02:44 +0200)]
anim_pain

3 years agoUpdate view location earlier, fixes observers stuck in side view
Mario [Thu, 13 Oct 2016 22:14:55 +0000 (08:14 +1000)]
Update view location earlier, fixes observers stuck in side view

3 years agoFix viewloc ladder prediction
Mario [Thu, 13 Oct 2016 21:34:23 +0000 (07:34 +1000)]
Fix viewloc ladder prediction

3 years agounused killer_origin
Martin Taibr [Thu, 13 Oct 2016 19:23:38 +0000 (21:23 +0200)]
unused killer_origin

3 years agomore unused
Martin Taibr [Thu, 13 Oct 2016 19:22:44 +0000 (21:22 +0200)]
more unused

3 years agoremove usused entity fields
Martin Taibr [Thu, 13 Oct 2016 16:06:55 +0000 (18:06 +0200)]
remove usused entity fields

3 years agoFix compile
Mario [Thu, 13 Oct 2016 08:33:40 +0000 (18:33 +1000)]
Fix compile

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Thu, 13 Oct 2016 08:31:57 +0000 (18:31 +1000)]
Merge branch 'master' into Mario/wepent_experimental

3 years agoFix CTS scores
Mario [Thu, 13 Oct 2016 08:30:45 +0000 (18:30 +1000)]
Fix CTS scores

3 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Wed, 12 Oct 2016 22:53:23 +0000 (08:53 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

3 years agoAccept balance hash change
Mario [Wed, 12 Oct 2016 22:51:33 +0000 (08:51 +1000)]
Accept balance hash change

3 years agoMerge remote-tracking branch 'origin/DefaultUser/overkill_filteritem_fix'
Mario [Wed, 12 Oct 2016 21:53:51 +0000 (07:53 +1000)]
Merge remote-tracking branch 'origin/DefaultUser/overkill_filteritem_fix'

3 years agoFix the g_overkill_filter_* cvars
Freddy [Wed, 12 Oct 2016 21:49:43 +0000 (23:49 +0200)]
Fix the g_overkill_filter_* cvars

3 years agoAdd an option to apply gravity on slick surfaces (so one slides down slopes)
Mario [Wed, 12 Oct 2016 17:05:52 +0000 (03:05 +1000)]
Add an option to apply gravity on slick surfaces (so one slides down slopes)

3 years agoMerge branch 'DefaultUser/overkill_cvars' into 'master'
Mario [Wed, 12 Oct 2016 14:48:10 +0000 (14:48 +0000)]
Merge branch 'DefaultUser/overkill_cvars' into 'master'

Minor cleanup for overkill

Reuse g_pickup_respawntime_superweapon for overkill superweapons instead of g_overkill_superguns_respawn_time.
Replace poorly named cvars g_overkill_100h_anyway and g_overkill_100a_anyway.
Add cvars to filter out 25 and 50 armor for overkill

See merge request !375

3 years agoImprove overkill item filter cvars 375/head
Freddy [Wed, 12 Oct 2016 14:39:46 +0000 (16:39 +0200)]
Improve overkill item filter cvars

3 years agoSplit XPM servers into their own "Competitive Mode" category
Mario [Wed, 12 Oct 2016 14:17:56 +0000 (00:17 +1000)]
Split XPM servers into their own "Competitive Mode" category

3 years agoAdd a placeholder icon for Jeff's mod
Mario [Wed, 12 Oct 2016 05:20:02 +0000 (15:20 +1000)]
Add a placeholder icon for Jeff's mod

3 years agoMerge branch 'DefaultUser/insta_ammo' into 'master'
Mario [Wed, 12 Oct 2016 04:54:57 +0000 (04:54 +0000)]
Merge branch 'DefaultUser/insta_ammo' into 'master'

InstaGib: add cvars to convert ammo packs into insta cells

Some maps have few insta cells, on others they're unevenly distributed. This helps server admins to easily change that fact

See merge request !374

3 years agoFix mutators not setting modname
Mario [Wed, 12 Oct 2016 04:53:15 +0000 (14:53 +1000)]
Fix mutators not setting modname

3 years agoReset viewloc when respawning, and link it with spectatee (should fix spectating...
Mario [Tue, 11 Oct 2016 17:00:41 +0000 (03:00 +1000)]
Reset viewloc when respawning, and link it with spectatee (should fix spectating sidescrollers)

3 years agoUpdate physics stats on connect (fixes sometimes spawning inside the floor)
Mario [Tue, 11 Oct 2016 07:50:30 +0000 (17:50 +1000)]
Update physics stats on connect (fixes sometimes spawning inside the floor)

3 years agoRemove 2 unused fields from sv_overkill.qc
Freddy [Mon, 10 Oct 2016 20:59:20 +0000 (22:59 +0200)]
Remove 2 unused fields from sv_overkill.qc

3 years agoDon't remove 25a and 50a in overkill in the default config
Freddy [Mon, 10 Oct 2016 19:16:13 +0000 (21:16 +0200)]
Don't remove 25a and 50a in overkill in the default config

3 years agoReplace g_overkill_100a_anyways and g_overkill_100h_anyways
Freddy [Mon, 10 Oct 2016 18:22:48 +0000 (20:22 +0200)]
Replace g_overkill_100a_anyways and g_overkill_100h_anyways

New cvars g_overkill_healthmega_remove, g_overkill_armormedium_remove
g_overkill_armorbig_remove and g_overkill_armorlarge_remove determine
what items are removed, unlike how the old cvars did

3 years agoRemove g_overkill_superguns_respawn_time
Freddy [Mon, 10 Oct 2016 15:35:32 +0000 (17:35 +0200)]
Remove g_overkill_superguns_respawn_time

Instead use g_pickup_respawntime_superweapon like other superweapons

3 years agoInstaGib: add cvars to convert ammo packs into insta cells 374/head
Freddy [Mon, 10 Oct 2016 14:24:27 +0000 (16:24 +0200)]
InstaGib: add cvars to convert ammo packs into insta cells