Commit graph

11067 commits

Author SHA1 Message Date
bors[bot] 59961a2f49
Merge #2838
2838: Only show new icons, when client is offline r=def- a=Jupeyy



Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-16 05:25:30 +00:00
Jupeyy 1cef3bf047 Only show new icons, when client is offline 2020-09-16 02:14:11 +02:00
bors[bot] 0bb24004dd
Merge #2837
2837: Don't allow zero/empty images(bcs malloc(0) and other things) r=def- a=Jupeyy

Would be nicer, if the map loader would check the map for such things, but since the backend works with the image data and assumes its valid, this prevents crashes.

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-15 20:31:44 +00:00
Jupeyy 2a713ebe2c Don't allow malloc on empty images 2020-09-15 22:23:36 +02:00
bors[bot] 6a06d1b10e
Merge #2809
2809: Update simplified_chinese.txt r=def- a=QingGo

fix translation error and add some translation.

Co-authored-by: 清歌 <zyqingjohn@qq.com>
2020-09-15 20:23:34 +00:00
清歌 75f604b316 Update simplified_chinese.txt
fix translation error and add some translation.
2020-09-15 22:21:00 +02:00
bors[bot] edb4462f8a
Merge #2814 #2818
2814: Remove saving to other servers r=Learath2 a=def-

sv_sql_valid_servernames is no longer required

2818: Load fonts from memory (fixes #2810) r=Learath2 a=def-

Missing: Freeing the memory again. But not so important since we keep
the same fonts until end of process anyway in our case.

@QingGo Could you give this a try from the Github build artifacts? If not, I can provide you a nightly build.

Co-authored-by: def <dennis@felsin9.de>
2020-09-15 17:16:21 +00:00
bors[bot] c1d54da9f7
Merge #2826 #2829 #2835
2826: map_convert_07: Check for width/height 0 r=Learath2 a=def-

as suggested by Jupeyy

2829: Add libsteam_api.a to gitignore r=Learath2 a=def-



2835: Make spacing in top menu buttons consistent, fit for 5:4 r=Learath2 a=def-

![screenshot-20200915@184840](https://user-images.githubusercontent.com/2335377/93240346-4db9fe00-f784-11ea-9755-3a52f51d2755.png)


Co-authored-by: def <dennis@felsin9.de>
2020-09-15 17:08:45 +00:00
bors[bot] 3b0bb7d777
Merge #2816
2816: Implement context for translations (largely taken from Teeworlds) r=Learath2 a=def-

Missing: scripts/languages doesn't work yet, but the context can be
added manually, see german.txt for an example.

Co-authored-by: def <dennis@felsin9.de>
2020-09-15 17:02:00 +00:00
def 7a82779ff7 Make spacing in top menu buttons consistent, fit for 5:4 2020-09-15 18:49:43 +02:00
bors[bot] a2a2abb26c
Merge #2833
2833: Use 0.7 cursor r=def- a=Jupeyy

![image](https://user-images.githubusercontent.com/6654924/93222705-83a0b780-f76f-11ea-866a-b2be9f47296e.png)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-15 16:40:57 +00:00
Jupeyy dc3580d976 0.7 cursor 2020-09-15 16:18:12 +02:00
bors[bot] a4edac3969
Merge #2832
2832: Add new icons for demo, home and server browser r=def- a=Jupeyy

![image](https://user-images.githubusercontent.com/6654924/93217198-ff4b3600-f768-11ea-95a2-cd826b9ffbf5.png)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-15 14:07:57 +00:00
Jupeyy 6a352b40eb Add new icons for demo, home and server browser 2020-09-15 15:31:52 +02:00
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
def 887fa50d7f Update language files 2020-09-15 10:30:49 +02:00
def 3daa798639 Implement script/languages support for contexts 2020-09-15 10:30:49 +02:00
def 7af517009c Implement context for translations (largely taken from Teeworlds)
Missing: scripts/languages doesn't work yet, but the context can be
added manually, see german.txt for an example.
2020-09-15 10:30:49 +02:00
def ef1e6d45be Add libsteam_api.a to gitignore 2020-09-15 07:53:12 +02: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
def f9ec8c5696 map_convert_07: Check for width/height 0
as suggested by Jupeyy
2020-09-14 18:03:23 +02: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 77d47a85ee Load fonts from memory (fixes #2810)
Missing: Freeing the memory again. But not so important since we keep
the same fonts until end of process anyway in our case.

@QingGo Could you give this a try from the Github build artifacts?
2020-09-13 23:06:12 +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
def 0f8d682f81 Remove saving to other servers
sv_sql_valid_servernames is no longer required
2020-09-13 21:49:44 +02: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