Commit graph

9451 commits

Author SHA1 Message Date
Learath 6882db1da2 Introduce flag to render all entities 2019-07-31 15:20:17 +03:00
Dennis Felsing e791927541 Version 12.6 2019-07-31 07:20:21 +02:00
bors[bot] 7b1d2d3f23 Merge #1862
1862: Add Sleepbubble to ClAfkMark r=def- a=FallenKN

With setting cl_afk_mark to 2 you will now get a sleepbubble on afk instead of the mark.

Which option should be default?
Also it displays chatbubble instead of sleepbubble when the playerflag is active. (I don't know which behavior is preferred)
Kept sleepy eyes on afk aswell.

 ![screenshot_2019-07-29_14-47-34](https://user-images.githubusercontent.com/13277346/62049848-624dd680-b210-11e9-82f7-2d20281eb899.png)

Co-authored-by: FallenKN <fallen.kn@gmail.com>
2019-07-30 19:15:58 +00:00
FallenKN b2d3df8f75 Remove ClAfkMark option & rename it to ClAfkEmote 2019-07-30 20:19:46 +02:00
bors[bot] 9f48df6bf1 Merge #1865
1865: SDL 2.0.10 r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2019-07-30 17:45:23 +00:00
bors[bot] 1d9191edfe Merge #1819
1819: Show mapname in scoreboard r=def- a=ChillerDragon

![screenshot_2019-07-11_16-03-47](https://user-images.githubusercontent.com/20344300/61057588-e53ff600-a3f5-11e9-8b20-3b082172bd63.png)
![screenshot_2019-07-11_15-46-04](https://user-images.githubusercontent.com/20344300/61057605-ecff9a80-a3f5-11e9-8f59-68811a1b123a.png)

Not sure if this feature should exclude non ddrace gametypes. Or exclude standard maps. Or if the truncation limit should increase with bigger scoreboards.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-07-30 17:17:32 +00:00
def 6bb8e304f6 SDL 2.0.10 2019-07-30 19:14:28 +02:00
bors[bot] fd502a8cce Merge #1844
1844: Fix wrong flag color in scoreboard and spectator select menu (custom mods) r=Learath2 a=fokkonaut

Since in DDrace every player is in team red, in order to show them in one scoreboard, the flag will always be blue in scoreboard and the spectator select menu, here is a simple fix

I left kill messages out since they would need a fix which is a bit more complicated, and i didnt want to do too much just to support this. These two would make it already a lot better

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
Co-authored-by: Learath <learath2@gmail.com>
2019-07-30 10:36:14 +00:00
Learath 99c62fb931 Fix killmessages aswell 2019-07-29 17:36:44 +03:00
FallenKN b804d3e1f2 Enhance ClAfkMark with another option 2019-07-29 14:46:21 +02:00
bors[bot] 8ab6e2c0a8 Merge #1848 #1860
1848: Fix deci seconds not updating in spectator/pause (fixes #1846) r=heinrich5991 a=fokkonaut

Before this was set in `RenderDDRaceEffects()`, but that function is only called if `m_pClient->m_Snap.m_pLocalCharacter` exists, which isn't the case in spectator/pause.

1860: Ignore some more common files r=heinrich5991 a=Ryozuki

compile_commands.json is used a lot for language servers

https://cmake.org/cmake/help/latest/variable/CMAKE_EXPORT_COMPILE_COMMANDS.html

tags are generated from ctags

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
2019-07-29 12:15:16 +00:00
Ryozuki 3a58918e10
Ignore some more common files 2019-07-29 14:14:06 +02:00
bors[bot] 29e691c2db Merge #1859
1859: Move the afk flag up front r=heinrich5991 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
2019-07-29 11:49:36 +00:00
Learath 9061f03174 Move the afk flag up front 2019-07-29 14:46:29 +03:00
Learath 0bc3650356 Send DDNet capability flag 2019-07-29 14:18:40 +03:00
bors[bot] dc41bb9649 Merge #1821
1821: Add afk marks r=def- a=ardadem

This is final state  (and most minimalist to not create mess) of my previous pull request. I didn't reopen it because it's contains changed unnecessary commits.

If someone will become afk, mark will be spawn next to tee's name.
![2019-07-13-13:59:20-screenshot](https://user-images.githubusercontent.com/13207692/61170739-8c4b9b80-a576-11e9-9d87-4c4b2f93941b.png)


Co-authored-by: Arda <ddmirarda@gmail.com>
2019-07-26 08:58:20 +00:00
Arda fb2cb4db26 move afk state inside to player flags 2019-07-26 11:48:15 +03:00
Arda 1a7fc77931 better names 2019-07-26 10:18:50 +03:00
bors[bot] b3075b6a1b Merge #1855
1855: Persist playerflags when using timeout protection r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-07-26 04:54:46 +00:00
12pm c57fcf3ee7 Persist playerflags when using timeout protection 2019-07-26 01:39:53 +02:00
12pm a0e2abf4af Render all entities on non ddnet servers
Fixes #1741
2019-07-24 21:33:43 +02:00
bors[bot] 898e6ca958 Merge #1851
1851: Fix blockZ and infectionZ r=def- a=fokkonaut

I talked to coffee (creator of both mods) and he said it is okay to use zoom on the mods, also: eye emotes work there so the eye wheel is also supported. I have updated both mods to ddnet master so they have all the new stuff

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2019-07-24 06:16:05 +00:00
fokkonaut 5c280a3c9d
Fix blockZ and infectionZ
I talked to coffee (creator of both mods) and he said it is okay to use zoom on the mods, also: eye emotes work there so the eye wheel is also supported. I have updated both mods to ddnet master so they have all the new stuff
2019-07-24 06:52:32 +02:00
bors[bot] 102ddc4d49 Merge #1849
1849: Remove unused branch/flag r=def- a=Learath2

I've dug through a lot of servers, couldn't really find any that send their time in a way that would take that branch.

Co-authored-by: Learath <learath2@gmail.com>
2019-07-22 15:31:11 +00:00
Learath 5ddc140494 Remove unused branch/flag 2019-07-22 18:20:19 +03:00
fokkonaut 1bfda0f635 Fix deci seconds not updating in spectator/pause (fixes #1846) 2019-07-22 10:41:19 +02:00
bors[bot] 658efe776b Merge #1845
1845: Fix infectionZ gamemode seen as DDNet r=heinrich5991 a=fokkonaut

InfectionZ's gametype is somehow infection, instead of infectionZ

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2019-07-21 08:32:59 +00:00
fokkonaut a8756f99e0 Fix infectionZ gamemode seen as DDNet 2019-07-21 10:03:27 +02:00
fokkonaut e77bdb8114 Fix wrong flag color in spectator select menu (custom mods) 2019-07-21 09:02:38 +02:00
fokkonaut a268b95ea3 Fix wrong flag color in scoreboard (custom mods) 2019-07-21 08:55:55 +02:00
bors[bot] 69ace3c1ec Merge #1837
1837: Don't advertise the reserved slots. Fix #1808 r=heinrich5991 a=Learath2

I think this is also fine for vanilla, but I can't get the vanilla client to work on mac to test it.

Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: Emir Marincic <learath2@gmail.com>
2019-07-20 18:32:19 +00:00
Emir Marincic 57197d990c
Better represent the state of the server
Co-Authored-By: heinrich5991 <heinrich5991@gmx.de>
2019-07-20 21:25:15 +03:00
bors[bot] cd8994147c Merge #1842
1842: [WIP] Fix timer r=heinrich5991 a=Learath2

I'm really unsure about this one.

DEPENDS on #1839 

Co-authored-by: Learath <learath2@gmail.com>
2019-07-19 22:23:22 +00:00
bors[bot] 628f673014 Merge #1830
1830: fix-ClDyncamMinDistance camera spawn r=Learath2 a=FallenKN

I forgot about the dyncam option, #1636.

Co-authored-by: FallenKN <fallen.kn@gmail.com>
2019-07-19 16:53:06 +00:00
bors[bot] 2f23b5c29a Merge #1839
1839: Set m_Race. Fix #1806 r=heinrich5991 a=Learath2

@heinrich5991 apparently you forgot to set `CGameInfo::m_Race` 🙂 

Co-authored-by: Learath <learath2@gmail.com>
2019-07-19 09:31:04 +00:00
Learath b1ed78d58d Add new flag, Fix #1807 2019-07-19 12:28:08 +03:00
Learath 78ac5ce030 Send the flag from the server 2019-07-19 11:21:32 +03:00
bors[bot] 72dcf6fba6 Merge #1838
1838: Force spawn order of teams. Fix #1828 r=heinrich5991 a=Learath2

This has an unfortunate(?) consequence of causing tees that hit kill tiles and fall out of map respawn instantly. If this is undesirable the fix would be a little more complex, maybe implementing a delay to the spawn in `CPlayer` or reordering the entity list to force strong on the tee (by swapping with one of their teammates (this might have some undesirable effects aswell, not sure though)).

Co-authored-by: Learath <learath2@gmail.com>
2019-07-19 00:40:10 +00:00
bors[bot] ebeeace65e Merge #1841
1841: Restart required message when changing Show console r=heinrich5991 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2019-07-19 00:16:01 +00:00
fokkonaut 3edaf4b8cd Style fixes 2019-07-19 02:06:33 +02:00
fokkonaut 78f52629e4 fix build 2019-07-19 01:58:49 +02:00
fokkonaut 07089be2e0 Restart required message when changing Show console 2019-07-19 01:53:27 +02:00
Learath 25ec19b70b Set m_Race. Fix #1806 2019-07-18 18:56:24 +03:00
Learath 02f5723321 Force spawn order of teams. Fix #1828 2019-07-18 18:35:51 +03:00
Learath 1769e5ae71 Don't advertise the reserved slots. Fix #1808 2019-07-18 18:20:55 +03:00
bors[bot] 71652e0113 Merge #1833
1833: Correctly embed replacing images r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-07-17 05:42:22 +00:00
12pm 5f7a09dfe3 Correctly embed replacing images 2019-07-17 03:00:09 +02:00
bors[bot] 769364116b Merge #1831
1831: Apply ShowOthersAlpha to projectiles (fix #1595) r=Learath2 a=trml

Also moved IsOtherTeam to CGameClient, and used it to clean up nameplates.cpp a little.

Co-authored-by: trml <trml@users.noreply.github.com>
2019-07-16 21:00:51 +00:00
trml cd64204358 Use IsOtherTeam for nameplates too 2019-07-16 22:34:18 +02:00
trml ddfcb62caa Apply ShowOtherAlpha to projectiles 2019-07-16 22:06:57 +02:00