Commit graph

348 commits

Author SHA1 Message Date
Jupeyy 0e71a47708 Add customization 2020-09-28 23:21:32 +02:00
bors[bot] fd610e517b
Merge #2903
2903: Remove non-free skins by Moby Dog (fixes #2547) r=def- a=yangfl



Co-authored-by: yangfl <yangfl@users.noreply.github.com>
2020-09-26 07:04:18 +00:00
bors[bot] 8b399ba1be
Merge #2861
2861: Implement censoring words on server r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-09-25 23:07:15 +00:00
def d6edc788f5 Use steam info in cmake more, so i need fewer ugly shell scripts 2020-09-24 17:34:41 +02:00
def 1a17feff12 Use VERSION variable in cmake to specify version number more cleanly 2020-09-24 17:06:03 +02:00
def ebb4e3debe Center update info text, add -DINFORM_UPDATE flag
to be used for Steam release, since autoupdates are enforced anyway and
players don't need to be reminded to update
2020-09-24 13:41:59 +02:00
def c0ca296c63 Add autumn theme by ChillerDragon based on heavens by Sonix- 2020-09-23 23:38:29 +02:00
Jupeyy 8235df7752 Add menu background map 2020-09-23 23:38:28 +02:00
bors[bot] 8cc4487767
Merge #2905
2905: Add LearnToPlay, Sunny Side Up, Tsunami r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-09-22 14:50:05 +00:00
def 5f4ed14c17 Add Sunny Side Up map
Licensed by Ravie via Discord DM
2020-09-22 16:36:44 +02:00
def 1b39526ba3 Add Tsunami map
Licensed by Ravie via Discord DM
2020-09-22 15:21:18 +02:00
def c6ef987521 Add LearnToPlay so we have at least two maps
Licensed by Tridemy and Cøke via Discord DM
2020-09-22 14:22:06 +02:00
yangfl d08eca9ab3 Remove non-free skins by Moby Dog (fixes #2547) 2020-09-22 13:26:18 +08:00
Jupeyy 0ec7f1e1dc Fix dilate threshold & automatically apply dilate on embedded textures in the editor 2020-09-21 19:17:38 +02:00
def 591dfb0d02 Revert "Revert "Remove non-free skins by Lappi (fixes #2547)""
This reverts commit a7f5627df3.
2020-09-20 02:19:37 +02:00
def a7f5627df3 Revert "Remove non-free skins by Lappi (fixes #2547)"
This reverts commit 7b2c71435d.
2020-09-20 01:49:16 +02:00
def f11679afb2 Implement censoring words on server 2020-09-18 19:18:08 +02:00
def 003192eb12 Default to autoupdater off 2020-09-17 21:11:28 +02:00
def f2ec3c4f0a copy-paste error 2020-09-17 18:58:47 +02:00
def 41996fe672 OSX libwebsockets linking fix 2020-09-17 18:35:35 +02:00
bors[bot] 77cb30aec4
Merge #2733
2733: Implement on-demand skin downloader, remove Lappi's non-free skins (fixes #1166, fixes #2547) r=Learath2 a=def-

Seems to work on first try, I'm somewhat surprised :D

Future ideas:

- I haven't checked how the performance impact is of a new skin joining,
  might want to move the loading to a separate thread?
- Use the skins from download directory instead of redownloading? Might
  want to compare modified time.
- Make all skins load on demand only to save some memory?

Co-authored-by: def <dennis@felsin9.de>
2020-09-17 13:49:23 +00:00
def 2c66f7388a Use websockets 2020-09-17 13:35:07 +02:00
QingGo 70b2c842e3 update cmake file to use libwebsockets bundle 2020-09-16 23:16:13 +08:00
def 7b2c71435d Remove non-free skins by Lappi (fixes #2547) 2020-09-15 22:17:09 +02:00
heinrich5991 ffab6292ad
Merge branch 'master' into pr-start 2020-09-11 14:25:50 +02:00
def c839dc96d9 Remove tools we don't need anymore
Following Jupeyys new renderer
2020-09-10 23:15:28 +02:00
def 2cdc7d0faf Adapt 0.7 start menu
- Working Local Server button (needs fixing for Windows)
- Highlight buttons if server is running, new news is out and editor has
  unsaved changes
2020-09-10 20:13:01 +02:00
bors[bot] 21a51ff64b
Merge #2783
2783: Don't insert timestamps into PEs with MinGW r=def- a=heinrich5991

Should make the build reproducible.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-08 12:15:45 +00:00
heinrich5991 68b1df084d Don't insert timestamps into PEs with MinGW
Should make the build reproducible.
2020-09-08 14:13:24 +02:00
def ddc4b74354 Another mac fix 2020-09-08 08:12:42 +02:00
def 7abe20175a Version 14.7.1, fix Mac build 2020-09-08 07:48:25 +02:00
def 45457b6185 Bundle FFmpeg for everything
so that we can enable videorecorder by default

Works as expected.
2020-09-07 07:04:29 +02:00
heinrich5991 5b669bcb32 Only send valid UTF-8 over the network 2020-09-03 18:50:23 +02:00
def f56f36a0a7 SHARED instead of DYNAMIC (fixes #2703) 2020-09-01 15:23:56 +02:00
heinrich5991 32734aceb3 Make steam_api dependency static on Linux non-Steam builds
This allows building without rpath modifying on Linux which seems to be
needed for openSUSE packaging.

Fixes #2669.
2020-08-31 13:12:44 +02:00
Dennis Felsing 92616f1a55
Merge pull request #2664 from ddnet/pr-revert-revert
Revert "Revert Jupeyy's OpenGL changes" (fixes #2659)
2020-08-30 10:55:15 +02:00
heinrich5991 a2f9542d5f Drop lib prefix from MinGW builds of our steam_api.dll stub
libsteam_api.dll -> steam_api.dll

This unifies the name between MinGW and MSVC.

Fixes #2657.
2020-08-29 14:51:14 +02:00
def c85ffb90af Revert "Revert Jupeyy's OpenGL changes"
This reverts commit 3eab3f5eb7.
2020-08-29 12:10:53 +02:00
def 3eab3f5eb7 Revert Jupeyy's OpenGL changes
Emergency-revert for 14.5.1 release, too many problems
2020-08-26 20:03:22 +02:00
def 7babae5b41 Fix MacOSX cross-compilation linking 2020-08-26 10:28:44 +02:00
Dennis Felsing 5ffcab127f Add back Vanilla maps for compatibility (fixes #2643) 2020-08-25 21:49:33 +02:00
bors[bot] 694db44ee2
Merge #2598
2598: Allow specifying an OpenGL version manually r=def- a=Jupeyy

Ofc don't merge, we'll test it first, and if we want merge it, i'd need to enable shader compability for OpenGL 4+, and general support for OpenGL 3.1 and 3.2(bcs i think they already don't allow some older GL commands).

Also i never really read in the OpenGL 1.x specification, i remember that older OpenGL versions required glBegin and stuff like that

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-08-25 15:35:30 +00:00
heinrich5991 a1875e4292 Rename libddnet-antibot.so back to libantibot.so
Now that we install it into /usr/lib/ddnet, it should be fine.
2020-08-25 13:03:20 +02:00
heinrich5991 3c6f05887f Add SteamAPI + stub 2020-08-25 13:03:20 +02:00
Jupeyy a07e9ac2cf Add OpenGL 1.x, 2.x, 3.x support (fixes #2619) (fixes #2607) 2020-08-22 10:22:51 +02:00
Dennis Felsing dbb9c662ba
Merge pull request #2617 from Jupeyy/pr_font_fallback
Font fallback
2020-08-20 20:34:48 +02:00
def 178d864ec9 Switch to Source Han Sans font 2020-08-20 13:55:03 +02:00
heinrich5991 dd2662b4b8
Merge branch 'master' into pr-cert 2020-08-20 11:38:59 +02:00
def 446526486d Use two fonts, one as explicit fallback
Merging with fontforge had problems, for example for the Bei (U+5317) in
Beijing, see https://github.com/fontforge/fontforge/issues/4432
2020-08-20 11:13:08 +02:00
def 7c65b89fd2 Add bomb skin (by Ravie)
License given publicly on Discord
2020-08-19 23:06:39 +02:00