Commit graph

11667 commits

Author SHA1 Message Date
def f51a443998 Merge remote-tracking branch 'edg-l/pr_show_spec'
Update x_spec with the more minimal version by HiRavie
Fix CMakeLists.txt
2020-06-24 09:55:59 +02:00
bors[bot] 0f0de9b333
Merge #2338
2338: Ensure that team state is always sent (fix #2315) r=def- a=trml

Noticed that team state wasn't sent to the client in some cases (when SetForceCharacterNewTeam is called directly), which I think this could happen if a team is unlocked between killing and respawning a player. Also added a CheckTeamFinished for that case.

Co-authored-by: trml <trml@users.noreply.github.com>
2020-06-24 05:46:25 +00:00
bors[bot] de328c1360
Merge #2301
2301: map_convert_07: Check image width for divisibility by 16 r=heinrich5991 a=def-

As noticed on Sunny Land.

> [5:31 PM] redix: in theory it should be enough if width and height are divisible by 16

Now running this over our maps and fixing them manually.

Co-authored-by: def <dennis@felsin9.de>
2020-06-23 23:30:34 +00:00
trml ca36f4787c Ensure that team state is always sent 2020-06-23 23:57:33 +02:00
def a8a2b41f3a Set skill level for Sixup (fixes #2334) 2020-06-23 22:47:29 +02:00
bors[bot] 3ba2d3a867
Merge #2333
2333: Log join type r=def- a=Learath2

This should let us get a quick idea of how many people are actually using the bridge.

Also adds the const qualification which could enable more optimization.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-23 15:36:30 +00:00
Learath f327e5bc42 Log join type 2020-06-23 18:30:57 +03:00
def 9e038d2f4a Add note that autoexec_server.cfg gets overwritten by updates (fixes #2010) 2020-06-23 17:13:02 +02:00
bors[bot] 339070b8d2
Merge #2329
2329: Translate the emoticon message r=def- a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
2020-06-23 09:46:36 +00:00
Learath 5293f78f22 Translate the emoticon message 2020-06-23 12:25:04 +03:00
bors[bot] 366a0ec80b
Merge #2326
2326: Disable -Wstringop-overflow warning in IntsToStr r=heinrich5991 a=def-

Since it won't write into invalid memory when Num > 0

Co-authored-by: def <dennis@felsin9.de>
2020-06-23 08:55:37 +00:00
bors[bot] 160a7b71fb
Merge #2279 #2327
2279: Only forbid resizing when videorecorder is recording r=heinrich5991 a=def-



2327: List data files in `CMakeLists.txt` r=def- a=heinrich5991

This fixes missing files for people recompiling when we add new data
files.

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-06-23 08:48:05 +00:00
bors[bot] e040c281e0
Merge #2325
2325: Fix array as initializer g++ 4.9 error (fixes #2320) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-06-23 08:39:29 +00:00
def 557f23b347 Disable -Wstringop-overflow warning in IntsToStr
Since it won't write into invalid memory when Num > 0
2020-06-23 10:35:41 +02:00
heinrich5991 10ab14d5eb List data files in CMakeLists.txt
This fixes missing files for people recompiling when we add new data
files.
2020-06-23 10:29:32 +02:00
bors[bot] 1652d73a5e
Merge #2322
2322: Use proper CSV writing for save codes r=def- a=heinrich5991

Supersedes #2296.

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-06-23 07:25:20 +00:00
heinrich5991 48e8ba69ca Use the CSV write to write save codes 2020-06-23 09:11:59 +02:00
heinrich5991 0db5c51ed9 Add a simple CSV writer for Python's "excel" csv dialect 2020-06-23 09:11:59 +02:00
bors[bot] b720737e5c
Merge #2314
2314: Fix uninitialized warning on SBufferContainerInfo r=def- a=edg-l



Co-authored-by: Edgar <git@edgarluque.com>
2020-06-23 06:05:35 +00:00
def 85f772ba56 Fix array as initializer g++ 4.9 error (fixes #2320) 2020-06-23 08:02:09 +02:00
def 83c820db09 Fix some naming conventions in videorecorder 2020-06-23 08:00:03 +02:00
bors[bot] f682855787
Merge #2324
2324: Check for a null CPlayer::m_pCharacter r=def- a=Learath2

Players need not have characters at all times

Co-authored-by: Learath <learath2@gmail.com>
2020-06-22 22:40:51 +00:00
Learath ce5aca4759 Check for a null CPlayer::m_pCharacter
Players need not have characters at all times
2020-06-23 01:36:51 +03:00
bors[bot] 11e2f04c21
Merge #2280
2280: Add a slightly longer introduction text r=heinrich5991 a=def-

Since we don't have a tutorial
![Screenshot](https://user-images.githubusercontent.com/2335377/85120864-235bb180-b224-11ea-8bb6-700f7228ee0d.png)

Co-authored-by: def <dennis@felsin9.de>
2020-06-22 20:45:06 +00:00
def 57280fba99 Store saves client-side in ddnet-saves.txt
Only appends saves, just in case you forgot where you saved.

Unfortunately only stores your own name, not your entire team.
2020-06-22 21:12:35 +02:00
bors[bot] 0ff34022ef
Merge #2303
2303: map_extract: Only access map info if it exists r=heinrich5991 a=def-

Noticed on map Paranormal

Co-authored-by: def <dennis@felsin9.de>
2020-06-22 19:02:17 +00:00
bors[bot] a407513630
Merge #2306
2306: Make ctrl-s/ctrl-l etc work everywhere in editor (fixes #2302) r=heinrich5991 a=def-

instead of just in the layers view

Co-authored-by: def <dennis@felsin9.de>
2020-06-22 18:56:01 +00:00
Edgar 933ea7cca3
fix bug, use ddnet character 2020-06-22 19:05:57 +02:00
Edgar 3f476171f1
change to white and use colors 2020-06-22 18:43:49 +02:00
bors[bot] 6384ebf13f
Merge #2321
2321: Use the 0.7 race features better r=def- a=Learath2

Mostly tested, couldn't test the diffs though as I don't have score set up. It looks good to me though.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-22 16:04:18 +00:00
Learath 62d014d999 Forgot we faked ids for vanilla 2020-06-22 19:02:17 +03:00
Learath 287e3e2a45 Use 0.7 finish messages 2020-06-22 18:08:08 +03:00
def 07830c868f Fix whitespace in teeinfo.cpp 2020-06-22 15:06:01 +02:00
def 252cda2d49 Use str_comp instead of strcmp
error: ‘strcmp’ was not declared in this scope
2020-06-22 14:47:49 +02:00
def a9f6d3716c Fix str_format on mingw
src/game/server/ddracecommands.cpp:743:39: warning: unknown conversion type character ‘l’ in format [-Wformat=]
  743 |  str_format(aBuf, sizeof(aBuf), "%s-%lld-%s.save", pSelf->Server()->GetMapName(), time_get(), pSelf->Server()->GetAuthName(pResult->m_ClientID));

See https://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/
2020-06-22 14:47:40 +02:00
Edgar a03a22b8e5
Fix uninitialized warning on SBufferContainerInfo 2020-06-22 11:23:52 +02:00
def 79cb7d14eb Don't log preprocess nullptr return 2020-06-22 10:06:55 +02:00
def 9d9d5e26e6 Fix double hook sound in 0.7 2020-06-22 09:27:41 +02:00
bors[bot] 39eae1935b
Merge #2312
2312: Fix crash when player voting random_map leaves and vote passes r=def- a=Zwelf

Closes #2310 

Co-authored-by: Zwelf <zwelf@strct.cc>
2020-06-22 05:47:46 +00:00
Zwelf b96d8673f3 Fix crash when player voting random_map leaves and vote passes
Closes #2310
2020-06-22 00:47:49 +02:00
def b1ff7d3ef2 Handle invalid packets more gracefully 2020-06-22 00:13:16 +02:00
def 9fccd5ecf6 Fix team rank for long map names 2020-06-21 23:47:45 +02:00
bors[bot] 17f7836ce2
Merge #2308
2308: Fix command overlaps in 0.7 r=def- a=Learath2

This also renames `/r` to `/rescue` for them, but it's not that much of an issue as they have completion for it.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-21 20:31:18 +00:00
Edgar befc4fc1b2
make skin also use alpha 2020-06-21 18:24:51 +02:00
Edgar 78bcc1d8fc
apply alpha to spec nameplates 2020-06-21 18:05:43 +02:00
Edgar f3466e05ba
Show /spec tees with a dashed skin 2020-06-21 17:48:33 +02:00
Learath ea3772ce2a Don't send redundant commands. Remove /team on clientside. 2020-06-21 17:28:02 +03:00
Learath 35acd21933 Use the racetimer in 0.7
Clean up /timer while at it
2020-06-21 17:15:08 +03:00
bors[bot] 80f19b789a
Merge #2294
2294: Make the learn button fit (fixes #2293) r=edg-l a=def-

![screenshot_2020-06-20_14-57-03](https://user-images.githubusercontent.com/2335377/85202386-55454480-b306-11ea-99f5-e37ba6e616b5.png)


Co-authored-by: def <dennis@felsin9.de>
2020-06-21 09:31:51 +00:00
bors[bot] 715ef25328
Merge #2295
2295: Open links in background (fixes #2292) r=edg-l a=def-

Only tested on Linux

Co-authored-by: def <dennis@felsin9.de>
2020-06-21 09:25:28 +00:00