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

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

4 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

4 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

4 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

4 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

4 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

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

4 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.

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

4 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

4 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

4 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

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

4 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

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

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

4 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

4 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

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

4 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.

4 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

4 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

4 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

4 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

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

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

4 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

4 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

4 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

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

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

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

4 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

4 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)

4 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)

4 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

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

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

4 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

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

4 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

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

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

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

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

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

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

4 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'

4 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

4 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)

4 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

4 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

4 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

4 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

4 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

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

4 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)

4 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)

4 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

4 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

4 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

4 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

4 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

4 years agoRestore behaviour after respawning if func_breakable is set to destroy when triggered
Mario [Sun, 9 Oct 2016 05:04:27 +0000 (15:04 +1000)]
Restore behaviour after respawning if func_breakable is set to destroy when triggered

4 years agoUpdate oldmovement on server too
Mario [Sat, 8 Oct 2016 20:36:33 +0000 (06:36 +1000)]
Update oldmovement on server too

4 years agoKeep player size and view offset stats up to date
Mario [Sat, 8 Oct 2016 18:34:13 +0000 (04:34 +1000)]
Keep player size and view offset stats up to date

4 years agoImprove bandwidth of client walls
Mario [Sat, 8 Oct 2016 18:23:36 +0000 (04:23 +1000)]
Improve bandwidth of client walls

4 years agoFix trigger_delay
Mario [Sat, 8 Oct 2016 18:07:17 +0000 (04:07 +1000)]
Fix trigger_delay

4 years agoCopy antiwall flag (fixes delayed antiwall triggers)
Mario [Sat, 8 Oct 2016 17:41:26 +0000 (03:41 +1000)]
Copy antiwall flag (fixes delayed antiwall triggers)

4 years agoDon't overwrite the .pressedkeys field (abused by other things)
Mario [Sat, 8 Oct 2016 17:03:25 +0000 (03:03 +1000)]
Don't overwrite the .pressedkeys field (abused by other things)

4 years agoDisable unpressing attack on weapon switching by default
Mario [Sat, 8 Oct 2016 14:25:08 +0000 (00:25 +1000)]
Disable unpressing attack on weapon switching by default

4 years agoDisable midair combos (generally not well received test feature)
Mario [Sat, 8 Oct 2016 13:17:47 +0000 (23:17 +1000)]
Disable midair combos (generally not well received test feature)

4 years agoRemove spread from electro and hagar attacks (merge request for these changes was...
Mario [Sat, 8 Oct 2016 13:10:05 +0000 (23:10 +1000)]
Remove spread from electro and hagar attacks (merge request for these changes was approved)

4 years agoAccept sv_stepheight changes (partially gameplay-relevant, mostly used to make old...
Mario [Sat, 8 Oct 2016 12:24:36 +0000 (22:24 +1000)]
Accept sv_stepheight changes (partially gameplay-relevant, mostly used to make old Nexuiz maps functional, as the default prevents walking up most steps and ledges on older maps)

4 years agoConsider g_physics_clientselect a server friendly option
Mario [Sat, 8 Oct 2016 12:06:41 +0000 (22:06 +1000)]
Consider g_physics_clientselect a server friendly option

4 years agoCount another mutator as gameplay-irrelevant
Mario [Sat, 8 Oct 2016 11:59:33 +0000 (21:59 +1000)]
Count another mutator as gameplay-irrelevant

4 years agoConsider g_norecoil an acceptable change
Mario [Sat, 8 Oct 2016 11:53:06 +0000 (21:53 +1000)]
Consider g_norecoil an acceptable change

4 years agoUndefine BADPRESUFFIX too
Mario [Sat, 8 Oct 2016 11:51:55 +0000 (21:51 +1000)]
Undefine BADPRESUFFIX too

4 years agog_buffs is an acceptable change, like g_powerups
Mario [Sat, 8 Oct 2016 11:48:30 +0000 (21:48 +1000)]
g_buffs is an acceptable change, like g_powerups

4 years agoDon't spawn buffs on maps that lack spawnpoints by default
Mario [Sat, 8 Oct 2016 11:47:22 +0000 (21:47 +1000)]
Don't spawn buffs on maps that lack spawnpoints by default

4 years agoRestore default crylink and don't use weaponreplace on machinegun in experimental...
Mario [Sat, 8 Oct 2016 11:22:26 +0000 (21:22 +1000)]
Restore default crylink and don't use weaponreplace on machinegun in experimental balance

4 years agoTweak arc as well (bolt attack remains disabled by default), also whitelist another...
Mario [Sat, 8 Oct 2016 11:13:51 +0000 (21:13 +1000)]
Tweak arc as well (bolt attack remains disabled by default), also whitelist another gameplay-irrelevant cvar