]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Tue, 29 Nov 2016 17:58:39 +0000 (18:58 +0100)]
Fix "bot_cmd X pause" command occasionally blocking all other bots
terencehill [Tue, 29 Nov 2016 17:57:11 +0000 (18:57 +0100)]
Fix "bot_cmd X pause" command not always working
terencehill [Fri, 11 Nov 2016 18:14:55 +0000 (19:14 +0100)]
Merge branch 'master' into terencehill/ca_bots_fix
terencehill [Fri, 11 Nov 2016 17:58:14 +0000 (18:58 +0100)]
Improve sv_itemstime description
terencehill [Fri, 11 Nov 2016 17:41:13 +0000 (18:41 +0100)]
Improve code readability
terencehill [Fri, 11 Nov 2016 17:19:43 +0000 (18:19 +0100)]
Damagetext: add {health(ph)}: shows potential_health too if different from health and {total(p)}: shows potential too if different from total
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
terencehill [Thu, 10 Nov 2016 23:32:31 +0000 (00:32 +0100)]
Make use of constants for damagetext bitflags
terencehill [Thu, 10 Nov 2016 22:48:37 +0000 (23:48 +0100)]
Optimize damagetext networking
Freddy [Thu, 10 Nov 2016 21:48:44 +0000 (22:48 +0100)]
Add .m_respawnsound for GameItems
Freddy [Thu, 10 Nov 2016 21:27:27 +0000 (22:27 +0100)]
.m_glow is only needed in GAMEQC
terencehill [Thu, 10 Nov 2016 18:16:25 +0000 (19:16 +0100)]
Simplify
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
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
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
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
Mario [Tue, 8 Nov 2016 03:37:22 +0000 (13:37 +1000)]
Merge branch 'master' into DefaultUser/func_train_random_target
Mario [Mon, 7 Nov 2016 17:29:20 +0000 (03:29 +1000)]
Remove mode prefix from some of the server list categories
terencehill [Mon, 7 Nov 2016 16:20:03 +0000 (17:20 +0100)]
Show no title in the uid2name dialog. It fixes #1836
Mario [Mon, 7 Nov 2016 12:47:27 +0000 (22:47 +1000)]
Turn off standard weaponarena in weapon arena modes (overkill, melee only, instagib)
terencehill [Mon, 7 Nov 2016 10:39:58 +0000 (11:39 +0100)]
Simplify conditions
Mario [Mon, 7 Nov 2016 05:16:18 +0000 (15:16 +1000)]
Don't count weapons available in the map as hidden
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
Martin Taibr [Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)]
Merge branch 'master' into martin-t/msnt
Martin Taibr [Sun, 6 Nov 2016 14:46:43 +0000 (15:46 +0100)]
entity array
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)
terencehill [Sat, 5 Nov 2016 23:49:17 +0000 (00:49 +0100)]
LMS: fix bots getting stuck right after one of them is out of lives
terencehill [Sat, 5 Nov 2016 19:16:02 +0000 (20:16 +0100)]
CA: fix bots getting stuck right after one of them dies
Freddy [Sat, 5 Nov 2016 17:00:27 +0000 (18:00 +0100)]
Change the way item glow is handled
Freddy [Sat, 5 Nov 2016 13:57:59 +0000 (14:57 +0100)]
Don't apply ITS_POWERUP to all powerups
Mario [Sat, 5 Nov 2016 02:47:31 +0000 (12:47 +1000)]
Update hash for hagar fix
Freddy [Sat, 5 Nov 2016 01:41:34 +0000 (02:41 +0100)]
Use .instanceOfPowerup
Mario [Fri, 4 Nov 2016 13:54:47 +0000 (23:54 +1000)]
Fix hagar loading and switching weapons
Martin Taibr [Thu, 3 Nov 2016 13:44:31 +0000 (14:44 +0100)]
test only 10 teammates
Martin Taibr [Wed, 2 Nov 2016 22:30:31 +0000 (23:30 +0100)]
less bad FOREACH_CLIENT_RANDOM
Freddy [Wed, 2 Nov 2016 17:57:18 +0000 (18:57 +0100)]
Add .future_target field for func_train
Mario [Wed, 2 Nov 2016 13:57:43 +0000 (23:57 +1000)]
Hack to fix tuba alternative instruments
Freddy [Wed, 2 Nov 2016 12:04:42 +0000 (13:04 +0100)]
Remove a "="
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
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
Freddy [Tue, 1 Nov 2016 14:48:34 +0000 (15:48 +0100)]
Random entity selection only for the target field for func_train
Freddy [Tue, 1 Nov 2016 13:24:40 +0000 (14:24 +0100)]
Make func_train respect its target's "target_random" field
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
Martin Taibr [Sun, 30 Oct 2016 20:05:03 +0000 (21:05 +0100)]
add cl_damagetext_accumulate_alpha_rel to default config
Martin Taibr [Sun, 30 Oct 2016 19:32:53 +0000 (20:32 +0100)]
fix default
Martin Taibr [Sun, 30 Oct 2016 19:17:51 +0000 (20:17 +0100)]
cleanup
Martin Taibr [Sat, 29 Oct 2016 22:00:45 +0000 (00:00 +0200)]
remove msnt_deathloc, fix spot selection
Martin Taibr [Sat, 29 Oct 2016 01:16:11 +0000 (03:16 +0200)]
i could do something like this but it looks ugly
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
Martin Taibr [Fri, 28 Oct 2016 19:23:37 +0000 (21:23 +0200)]
comment
Martin Taibr [Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)]
Merge branch 'master' into martin-t/msnt
Freddy [Fri, 28 Oct 2016 18:43:11 +0000 (20:43 +0200)]
Also change docstring for cl_damagetext_format in defaultXonotic.cfg
Martin Taibr [Fri, 28 Oct 2016 18:40:01 +0000 (20:40 +0200)]
remove redundant test
Martin Taibr [Fri, 28 Oct 2016 18:36:00 +0000 (20:36 +0200)]
iterate through clients in random order
Mario [Fri, 28 Oct 2016 06:04:42 +0000 (16:04 +1000)]
Lower monster think delay (fixes choppy zombies)
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
Mario [Thu, 27 Oct 2016 04:38:05 +0000 (14:38 +1000)]
Fix wall dodging working on the skybox
Mario [Tue, 25 Oct 2016 09:04:37 +0000 (19:04 +1000)]
Fix compilation test
Mario [Mon, 24 Oct 2016 22:59:40 +0000 (08:59 +1000)]
Merge branch 'master' into Mario/xonoticless_fix
Mario [Mon, 24 Oct 2016 22:44:09 +0000 (08:44 +1000)]
Clear clients from the intrusive lists on disconnect
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
Freddy [Mon, 24 Oct 2016 15:44:46 +0000 (17:44 +0200)]
Damagetext: change {real_damage} to {potential_health}
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
terencehill [Sun, 23 Oct 2016 19:00:35 +0000 (21:00 +0200)]
VehicleSpawn --> VehicleInit
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 .
terencehill [Sun, 23 Oct 2016 17:09:56 +0000 (19:09 +0200)]
Remove 2 unnecessary function references
Mario [Sun, 23 Oct 2016 04:42:26 +0000 (14:42 +1000)]
Make it compile with XONOTIC, too
Mario [Sun, 23 Oct 2016 04:26:38 +0000 (14:26 +1000)]
Make it compile without XONOTIC defined
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
Freddy [Wed, 3 Aug 2016 13:14:05 +0000 (15:14 +0200)]
add new option for cl_forceplayercolor to the menu
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
Freddy [Wed, 13 Jul 2016 23:40:36 +0000 (01:40 +0200)]
Extend docstring for cl_damagetext_format
Freddy [Fri, 8 Jul 2016 13:51:22 +0000 (15:51 +0200)]
Damagetext: add possibility to show potential damage
Mario [Sat, 22 Oct 2016 18:58:24 +0000 (04:58 +1000)]
Kill off one of the biggest baddest findchain loops
Mario [Sat, 22 Oct 2016 17:57:45 +0000 (03:57 +1000)]
Tweak a few things
Mario [Sat, 22 Oct 2016 17:48:51 +0000 (03:48 +1000)]
Merge branch 'master' into Mario/intrusive_2
Mario [Sat, 22 Oct 2016 02:01:39 +0000 (12:01 +1000)]
Fix compile
Mario [Sat, 22 Oct 2016 01:48:51 +0000 (11:48 +1000)]
Add wall jump mutator
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
Freddy [Fri, 21 Oct 2016 19:10:09 +0000 (21:10 +0200)]
Add a break
Freddy [Fri, 21 Oct 2016 18:58:31 +0000 (20:58 +0200)]
Replace m_itemid with itemdef in some functions in t_items.qc
Mario [Fri, 21 Oct 2016 16:15:29 +0000 (02:15 +1000)]
Spawner: Spawn nothing if it's set to an invalid monster
Mario [Fri, 21 Oct 2016 15:52:39 +0000 (01:52 +1000)]
Update hash
Rudolf Polzer [Fri, 21 Oct 2016 14:41:53 +0000 (10:41 -0400)]
Fix source comments in physicsX.cfg.
Mario [Fri, 21 Oct 2016 01:38:32 +0000 (11:38 +1000)]
Reapply size to func_breakable when changing its model
Mario [Fri, 21 Oct 2016 01:24:56 +0000 (11:24 +1000)]
Check for matching switchweapon when auto firing arc and hagar
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
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
Martin Taibr [Thu, 20 Oct 2016 23:27:18 +0000 (01:27 +0200)]
one more
Mario [Thu, 20 Oct 2016 21:32:32 +0000 (07:32 +1000)]
itthis isn't a word
Mario [Thu, 20 Oct 2016 21:30:25 +0000 (07:30 +1000)]
Add a basic entity that spawns monsters when triggered
terencehill [Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)]
Merge branch 'master' into terencehill/ons_camera
terencehill [Thu, 20 Oct 2016 13:52:43 +0000 (15:52 +0200)]
Onslaught: get rid of an error message when round restart
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
Mario [Wed, 19 Oct 2016 21:21:39 +0000 (07:21 +1000)]
Allow setting a monster to not auto align itself at spawn
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.
Mario [Wed, 19 Oct 2016 21:10:44 +0000 (07:10 +1000)]
Fix intrusive list warning when a monster re-spawns
Mario [Wed, 19 Oct 2016 20:46:04 +0000 (06:46 +1000)]
Clean up monster direction checking code a bit more
Mario [Wed, 19 Oct 2016 20:37:37 +0000 (06:37 +1000)]
Don't check trace_fraction on all cases
Mario [Wed, 19 Oct 2016 20:35:06 +0000 (06:35 +1000)]
Make sure monster turns around if it touches another monster