Commit graph

11046 commits

Author SHA1 Message Date
bors[bot] c7b61ac768
Merge #2831
2831: add windows websockets client support r=def- a=QingGo

In the last PR of websockets https://github.com/ddnet/ddnet/pull/2805 , It only support the websocket client in macOS and LinuxOS. And I add the Windows OS windows websockets client support in this PR.

It seem that netinet/in.h isn't used by websocket code so I remove it. After removed it I can successfully compile and run DDNet client and server in Linux too. If netinet/in.h have something usage I don't know, please tell me.

Co-authored-by: QingGo <zyqingjohn@qq.com>
2020-09-15 13:06:18 +00:00
QingGo d627b85202 add windows websockets client support 2020-09-15 20:54:33 +08:00
bors[bot] 981d5d4e99
Merge #2675
2675: support multiple modifiers for binds r=def- a=plsplsplslol



Co-authored-by: plsplsplslol <alpootagpro@gmail.com>
2020-09-15 08:37:38 +00:00
bors[bot] 393f3deed4
Merge #2828
2828: Use resize instead of rescale r=def- a=Jupeyy

rescale doesn't clamp, and looks worse, might be slightly faster tho.

So i also renamed the config vars that might cause resizing and/or are not very useful

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-14 22:02:59 +00:00
bors[bot] 016e52cad9
Merge #2827
2827: Update russian translation. r=def- a=gerdoe-jr



Co-authored-by: Vlad <gerdoexx@gmail.com>
2020-09-14 21:56:07 +00:00
Jupeyy 8b29240491 Use POT texture when resizing, when NOTP is not supported 2020-09-14 22:12:58 +02:00
Jupeyy 3eea399d37 Rename quality texture and compressed texture, because they should not be used 2020-09-14 21:34:56 +02:00
Jupeyy 9a4dd80a5e Remove rescale function, always use resize 2020-09-14 21:30:25 +02:00
Vlad 35e93df7e0 Update russian translation. 2020-09-14 20:56:43 +03:00
bors[bot] c0f7a2bf03
Merge #2825
2825: Fix entity text & improve Grow r=def- a=Jupeyy

fixes #2822

@BannZay wanna check?

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-14 15:12:37 +00:00
Jupeyy fbdd66c092 Improve grow 2020-09-14 16:42:33 +02:00
Jupeyy 8923116324 Fix entity text 2020-09-14 16:42:21 +02:00
bors[bot] 3392933385
Merge #2819
2819: Fix compilation on MinGW Windows r=Learath2 a=def-

graphics.h:197:36: error: ‘uint8_t’ has not been declared

Co-authored-by: def <dennis@felsin9.de>
2020-09-14 14:08:34 +00:00
bors[bot] 3df140740c
Merge #2815
2815: Renamed tile names. r=def- a=gerdoe-jr

I didn't get why some tiles' names end with `END/START` and another with `DISABLE/ENABLE`, so, I just replaced all `END/START` with `DISABLE/ENABLE`.
Also, I renamed `TILE_BONUS` and `TILE_PENALTY`, because you need to check the variables' declarations/references for understanding their purposes.

Co-authored-by: Vlad <gerdoexx@gmail.com>
Co-authored-by: def <dennis@felsin9.de>
2020-09-14 14:02:05 +00:00
def a67a8e36aa clang-format: fix style 2020-09-14 16:00:51 +02:00
def 2c5f01a093 Fix compilation on MinGW Windows
graphics.h:197:36: error: ‘uint8_t’ has not been declared
2020-09-13 23:05:43 +02:00
Vlad be90f3f48b Replaced tile names. 2020-09-13 23:00:49 +03:00
bors[bot] 5d64ed34aa
Merge #2805
2805: update libwebsocket to 4.x and fix bug and make client able to use websocket r=def- a=QingGo



Co-authored-by: QingGo <zyqingjohn@qq.com>
2020-09-13 19:10:36 +00:00
QingGo b64a0ef4c6 make client able to connect ws server with ws:// 2020-09-13 09:59:10 +08:00
bors[bot] 5228473ec9
Merge #2807
2807: Remove sv_team_lock command r=heinrich5991 a=BannZay

No map uses this command. Does not seems like this command is used anywhere.

Any reason to keep this command ?

Co-authored-by: Andrii <bannzay3@gmail.com>
2020-09-12 22:33:38 +00:00
Andrii a81f46dee2 fix formatting 2020-09-13 01:16:31 +03:00
bors[bot] 7f5da16168
Merge #2806
2806: Allow to use config_retrieve on whole directory r=heinrich5991 a=BannZay

Work on topmost directory only

Co-authored-by: Andrii <bannzay3@gmail.com>
2020-09-12 21:51:48 +00:00
Andrii a2b149a114 remove sv_team_lock command 2020-09-13 00:46:49 +03:00
Andrii bea30a879d
Apply suggestions from code review
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-13 00:40:22 +03:00
Andrii 3835395591 allow to use config_retrieve on whole directory 2020-09-12 23:48:01 +03:00
QingGo 4ae0833701 use clang formatter 2020-09-12 01:43:42 +08:00
QingGo 3fa500aa60 update libwebsocket to 4.x and fix bug 2020-09-12 00:53:15 +08:00
bors[bot] 6bd0348bff
Merge #2730
2730: Adapt 0.7 start menu r=heinrich5991 a=def-

![screenshot-20200904@075411](https://user-images.githubusercontent.com/2335377/92204521-f3679600-ee83-11ea-99f0-56339d39bb53.png)
Supports hotkeys to enter them, escape to go back. Start menu can be disabled in settings. Play goes to the last tab you had open between Internet, LAN, DDNet, KoG.
Still missing:
- News picture
- More DDNet-looking Play picture
- Maybe implement the server button, but seems like too much work for little benefit

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-11 13:25:01 +00:00
heinrich5991 ffab6292ad
Merge branch 'master' into pr-start 2020-09-11 14:25:50 +02:00
def 2f70de8ef1 Update translation files 2020-09-11 10:00:09 +02:00
def aeb8bcbd9a Show an error message on missing file 2020-09-11 09:59:05 +02:00
def 277040fc7c shell_execute: handle some failures 2020-09-11 09:47:19 +02:00
bors[bot] 0ad5e8f815
Merge #2801
2801: Find the common ancestor for the style checking r=def- a=heinrich5991

This allows the style checker to only look at the changes done in the
current branch, and not the other commits that were done in the base
branch.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-11 07:22:05 +00:00
bors[bot] d720f74cfd
Merge #2800
2800: Style-fixed version of #2784 r=def- a=heinrich5991

Thanks to @Jupeyy for the original pull request.

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-11 07:10:29 +00:00
bors[bot] 5ac6c3bac9
Merge #2803
2803: Always accept the local server name for saves r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-11 06:37:27 +00:00
heinrich5991 35228fb997 Always accept the local server name for saves 2020-09-11 06:10:53 +02:00
heinrich5991 b235637713 Find the common ancestor for the style checking
This allows the style checker to only look at the changes done in the
current branch, and not the other commits that were done in the base
branch.
2020-09-11 00:57:03 +02:00
heinrich5991 aa46ca6bf9 Fix some style issues via scripts/fix_style.py, size_t 2020-09-11 00:47:38 +02:00
Jupeyy 1e1c16f83a Make override consistent 2020-09-11 00:34:43 +02:00
Jupeyy 3b403f76a9 Fix editor speedup brush 2020-09-11 00:34:43 +02:00
Jupeyy b83d8735fe Create entity textures seperately 2020-09-11 00:34:42 +02:00
bors[bot] f6e1ed5f19
Merge #2738
2738: Don't search the sorted array linearly r=heinrich5991 a=Learath2

Small optimization but it could start mattering with #2733

Co-authored-by: Learath <learath2@gmail.com>
2020-09-10 22:30:46 +00:00
bors[bot] 51483c2ff1
Merge #2789 #2797
2789: Refresh server browser immediately when updated ddnet info arrived r=heinrich5991 a=def-

At the moment it only happens the next time you press refresh.

Before we had it so that it always reloaded once the ddnet info arrived,
causing a quick flickering and lots of packets having to be resent every
time someone pressed refresh, even if nothing changed.

The new approach combines the advantages of both without the
disadvantages. An even nicer way would be to compare the json objects,
so that news and version updates don't matter, but our json library
doesn't seem to support that.

2797: dilate: Don't crash if file doesn't exist r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-09-10 22:24:06 +00:00
bors[bot] 4abd889802
Merge #2799
2799: Use check_header_guards script r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-09-10 22:06:32 +00:00
def d92e6ecb00 Use check_header_guards script 2020-09-11 00:03:31 +02:00
bors[bot] fe0032451b
Merge #2796
2796: Remove tools we don't need anymore r=heinrich5991 a=def-

Following Jupeyys new renderer

Co-authored-by: def <dennis@felsin9.de>
2020-09-10 21:25:34 +00:00
def 80b7ceb3d7 dilate: Don't crash if file doesn't exist 2020-09-10 23:25:33 +02:00
bors[bot] 250b241fe3
Merge #2790
2790: Fixes two mapres by mind r=heinrich5991 a=def-

- Two missed dilate
- Two others forgot to delete white text markings

Co-authored-by: def <dennis@felsin9.de>
2020-09-10 21:16:19 +00:00
def c839dc96d9 Remove tools we don't need anymore
Following Jupeyys new renderer
2020-09-10 23:15:28 +02:00
bors[bot] 10eaa585e3
Merge #2794
2794: Make fix_style executable r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-09-10 21:08:57 +00:00