Commit graph

10229 commits

Author SHA1 Message Date
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
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
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
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
def 6cfc6adc83 Make ctrl-s/ctrl-l etc work everywhere in editor (fixes #2302)
instead of just in the layers view
2020-06-21 01:44:01 +02:00
def ca094df46b map_extract: Only access map info if it exists
Noticed on map Paranormal
2020-06-21 00:57:14 +02:00
bors[bot] 4dd72df777
Merge #2297
2297: Ingame time is in milliseconds on 0.7 r=def- a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
2020-06-20 17:25:02 +00:00
bors[bot] 5ca6e9ced6
Merge #2299
2299: Disable timeout for 0.7 clients r=def- a=Learath2

Turns out there is no way to influence `m_LocalClientID` anymore. Another thing changed for the sake of change.

Removing the check whether an `m_LocalClientID` has already been set allows 0.7 clients to reclaim their tees after clientinfo is resent. It should be fairly trivial for custom clients to send an extended message to enable timeout protection.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-20 17:18:11 +00:00
Learath 28905c4659 Disable timeout for 0.7 clients 2020-06-20 19:52:23 +03:00
Learath 865afa613b Ingame time is in milliseconds 2020-06-20 17:31:06 +03:00
def 70b8bf9497 Open links in background (fixes #2292)
Only tested on Linux
2020-06-20 14:59:36 +02:00
def 1610079020 Make the learn button fit (fixes #2293) 2020-06-20 14:57:52 +02:00
bors[bot] 17e77d73bb
Merge #2291
2291: Make PlayerResult messages an union variant r=def- a=Zwelf

and some small style and readability fixes in sql_score.

Co-authored-by: Zwelf <zwelf@strct.cc>
2020-06-20 12:44:59 +00:00
bors[bot] a3ab572fdc
Merge #2290
2290: Restore old message behavior when using /load and /save r=def- a=Zwelf

Only notify the player initiating /load about the error and don't send
'Loading initiated by ...' and 'Saving initiated by ...' messages resulting
in two messages per /load and /save.

Not sure if the old behavior is better or if we want to keep the new with sending two messages per /save and /load.

Co-authored-by: Zwelf <zwelf@strct.cc>
2020-06-20 12:34:28 +00:00
bors[bot] 07f6e71376
Merge #2289
2289: Fix votes called from 0.7 r=def- a=Learath2

Never assume how structures are laid out

Co-authored-by: Learath <learath2@gmail.com>
2020-06-20 12:27:22 +00:00
Zwelf 1e4ccd7cc2 Small style and readability fixes in sql_score 2020-06-20 14:08:38 +02:00
Zwelf 67643e82b0 Make PlayerResult messages an union variant
as it is only used for DIRECT and ALL variants and for no other variants
2020-06-20 14:04:08 +02:00
bors[bot] 4edac3143a
Merge #2281
2281: Add Learn button which opens the ddnet wiki in the browser. r=heinrich5991 a=edg-l

![image](https://user-images.githubusercontent.com/15859336/85147350-05f00d00-b24f-11ea-8b6c-f79dbf605747.png)

## **I didn't test it on windows or mac.**

Co-authored-by: Edgar <git@edgarluque.com>
2020-06-20 12:00:45 +00:00
Edgar 07f0239e01
Add Learn button which opens the ddnet wiki in the browser. 2020-06-20 13:56:02 +02:00
bors[bot] c464e3ef80
Merge #2288
2288: Fix snapping for ninja on 0.7 r=heinrich5991 a=Learath2

0.7 seems to assume players with negative armor are dead, rather than clamping.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-20 11:29:39 +00:00
Learath 8d422dfd70 Fix snapping for ninja 2020-06-20 14:24:38 +03:00
Learath b032eddcb4 Fix votes called from 0.7 2020-06-20 14:22:46 +03:00
Zwelf 673f59d99f Restore old message behavior when using /load and /save
Only notify the player initiating /load about the error and don't send
'Loading initiated by ...' and 'Saving initiated by ...' messages resulting
in two messages per /load and /save.
2020-06-20 13:03:25 +02:00
bors[bot] 4a810091b1
Merge #2284
2284: Remove sv_spectator_votes r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-06-20 10:46:03 +00:00
def c53528b92f Allow spectators to start votes 2020-06-20 11:20:54 +02:00
bors[bot] ff705a3a4f
Merge #2287
2287: Fix `git_revision.cpp` updating for out-of-tree builds r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-06-20 09:20:03 +00:00
bors[bot] 14e6227ea0
Merge #2286
2286: Times are no longer negative in 0.7 r=def- a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
2020-06-20 09:13:45 +00:00
heinrich5991 6f3a7a60ea Fix git_revision.cpp updating for out-of-tree builds 2020-06-20 11:08:59 +02:00
Learath 6db72b2388 Times are no longer negative in 0.7 2020-06-20 11:59:46 +03:00
bors[bot] 9f53623ffe
Merge #2285
2285: Sixup needs it's own maps r=def- a=Learath2

Preliminary testing suggests this works fine. Albeit it is not the prettiest thing ever.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-20 07:22:47 +00:00
Learath 91c44f1808 Sixup needs it's own maps 2020-06-20 01:00:45 +03:00
bors[bot] 5b4227fbba
Merge #2283
2283: teehistorian: Track whether clients join via the 0.7 protocol r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-06-19 20:31:40 +00:00
bors[bot] 710b04500b
Merge #2282
2282: Implement a switch for 0.7 compatibility r=heinrich5991 a=Learath2

In case of emergency, stops accepting 0.7 clients, registering on 0.7 masters and replying to 0.7 serverinfo requests.

Co-authored-by: Learath <learath2@gmail.com>
2020-06-19 20:25:09 +00:00
heinrich5991 e294da41ba teehistorian: Track whether clients join via the 0.7 protocol 2020-06-19 22:06:39 +02:00
Learath da68923ac3 Implement a switch for 0.7 compatibility 2020-06-19 22:08:41 +03:00