Commit graph

429 commits

Author SHA1 Message Date
def 6fbc8187b5 Fix Windows Discord build
CMake Error in CMakeLists.txt:
  IMPORTED_IMPLIB not set for imported target "discord-shared" configuration
  "Release".
2021-01-31 10:17:21 +01:00
heinrich5991 c2b28f124b Put the Discord stuff into its own file 2021-01-31 10:17:21 +01:00
Edgar 96db08b760 add discord rich presence 2021-01-31 10:17:21 +01:00
def 9c5b5ce2d0 Add Arabic language by .Yukki 2021-01-31 10:13:32 +01:00
heinrich5991 43998ce41a Replace projectile hack with a new extended snapshot object
Still send the old hack to old clients, still accept the old hack from
old servers. This is so F-Client can support DDNet servers without such
hacks.
2021-01-26 20:58:42 +01:00
heinrich5991 3539f2b183 Allow ParseUuid to report errors and add tests 2021-01-23 01:21:20 +01:00
Alexander Akulich 242aa63178 ddracechat.h is used by the client, so move it to src/game
where ddracecommands.h already is.
2021-01-16 03:20:57 +03:00
bors[bot] 40a36c2dfc
Merge #3377 #3487
3377: Add Thread Safety Analysis r=heinrich5991 a=def-

https://clang.llvm.org/docs/ThreadSafetyAnalysis.html

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


3487: Fix centisecs rounding in str_time_float r=heinrich5991 a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
2021-01-10 15:00:19 +00:00
Alexander Akulich dc5b9340d5 Extract allocation macros to alloc.h (mimic the upstream)
See the upstream commit 24bda2faa0
2021-01-10 14:25:12 +03:00
Aurelien Jarno 08f9d037e9 Link with -pthread instead of -lpthread
The canonical way to link with the thread library is to use -pthread, which
brings in additional libraries like libatomic.so on riscv64. However cmake
defaults to link with -lpthread which only bring the libpthread.so library.
Fortunately it has the option THREADS_PREFER_PTHREAD_FLAG for that, which is
"highly recommended" but not the default.
2020-12-30 21:50:36 +08:00
def 59f1c2cbe6 Add New Year season theme by mind and use for 2 days
Map reduces my FPS from 60 to 45, mind can't optimize it further.

I'd release this as 15.2.5 in 1-2 days ideally with no other new changes in.
2020-12-28 17:45:04 +01:00
def e592afc98c Add Thread Safety Analysis
and annotate some code: https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
2020-12-23 18:13:21 +01:00
fokkonaut d4c4031f20 Add F-DDrace entities 2020-12-22 12:23:21 +01:00
heinrich5991 9cce68023a Export all symbols from the main executable for the antibot
Add `-rdynamic` if supported by the linker.

Not all symbols being exported broke our builds recently, the antibot
library used `mem_comp` from the main binary but it wasn't exported,
leading to the following runtime error:

```
./DDRace64-Server_sql: symbol lookup error: /home/teeworlds/servers/libantibot.so: undefined symbol: mem_comp
```
2020-12-09 10:17:11 +01:00
heinrich5991 037b928dd7 Manually patch gtest to allow CMake version 2.8.12...3.19.1
Fixes #3355.

Works around https://github.com/google/googletest/issues/3040.
2020-12-08 10:24:22 +01:00
heinrich5991 abd2a54522 Bump to gtest from a commit SHA to 1.10.1 2020-12-08 10:24:22 +01:00
heinrich5991 59cbc01415 Bump minimum CMake version from 2.8 to 2.8.12
Declare that we're fine with policies up to 3.19.1. This should fix
policy errors and "too low cmake_minimal_version() errors" for the
forseeable future.
2020-12-08 10:24:22 +01:00
Rafael Fontenelle 8d3d46a55e
Remove remaining tileset_ occurrence
tileset_* tools were removed in c839dc96
2020-11-24 09:08:59 -03:00
jupeyy 259629db9f Map optimizer 2020-11-21 12:10:20 +01:00
Jupeyy c989cd67f9 Check skin/sprite images for correctness 2020-11-18 07:59:15 +01:00
def 3b90f97aa5 Pull out blocklist_driver.cpp and unit test it 2020-11-06 19:00:14 +01:00
def 06b534c07d Create fallback wordlist in sourcecode (fixes #3206) 2020-11-03 17:01:16 +01:00
louis dbc57656ed Fix PaladiN border, delete Terrorist 2020-10-30 10:10:12 +01:00
Jupeyy eb2689cf9e Rename QuadContainerAsSprite to QuadContainerEx, so its useful for all kind of rendering 2020-10-20 18:45:03 +02:00
Learath2 ceefe305ec Add workaround for CMake 2.8. Fix version caching 2020-10-17 18:50:26 +02:00
heinrich5991 a604d913ce Move ghost code to client
It's not used by the server, so there's no reason to put it into the
shared codebase.
2020-10-14 17:08:58 +02:00
ChillerDragon 263fdbd8e1 Use 0.7 gameskin by @Zatline
a5105264ff
db08239506
31c6d2684d
2020-10-09 21:04:06 +02:00
Jupeyy 8d6148b20b Modulize skins, particles, emoticons and game 2020-10-09 09:07:19 +02:00
Jupeyy b1d5a388f1 Add comfort (entities asset) by louis 2020-10-07 05:11:38 +02:00
Nikola Radovanovic 31b6194ca1 Add to CMakeList 2020-10-03 23:50:27 +02:00
Dennis Felsing 2ba9535529 Use warnings popups for some io failures 2020-10-02 16:06:16 +02:00
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
def c458ee52b0 Remove need for custom certificate
in anticipation of using CloudFlare
2020-08-19 17:54:05 +02:00
def 1394ac0fc4 Merge DejaVuSansCJKName with DejavuWenQuanYiMicroHei and use it for all (fixes #2593)
got them merged with fontforge, finally looks good.

allows reading CJK for everyone independent of language chosen.

Hopefully the lags are gone.
2020-08-19 12:31:55 +02:00
Jupeyy 7450e354de Add OpenGL 4.x support & cleanup 2020-08-19 08:42:09 +02:00
def 4da0592d78 Replace Kobra 4 and Goo! with Gold Mine
and add maps7 version
2020-08-18 10:47:17 +02:00
def cf15ef6cc0 Ship map_convert_07 executable 2020-08-16 22:43:56 +02:00
heinrich5991 63c26d25ee Add back skins by Moby Dog 2020-08-14 17:43:19 +02:00
def e0c06464d2 Version 14.3.1 2020-08-10 23:43:10 +02:00
Dennis Felsing 8239836a02
Merge pull request #2548 from def-/pr-skins-license
Move skins license information to its own file
2020-08-10 19:36:56 +02:00
def 0a9eb72d52 Fix bundling SQLite3 on Mac
Verified locally
2020-08-10 18:35:04 +02:00
def d08535684e Move skins license information to its own file 2020-08-10 18:23:31 +02:00
bors[bot] b06bea7c04
Merge #2465
2465: Sqlite3 support and prepared statements r=heinrich5991 a=Zwelf

This PR changes the abstraction layer of the score backend to thin abstractions over the MySQL and SQLite3 library. It executes all Queries in one worker thread making it easier to use the ddnet thread pool. This doesn't change much, because each the mysql-connection was locked with `m_SqlLock` beforehand, serializing writes and reads respectively.

Behavior change (even though I tried to minimize them):

* `sv_use_sql` is used to determine if mysql server should be added
* `sv_sql_failure_file` is replaced by `sv_sqlite_file`
* `sv_sqlite_file` is either used as a backup server when `sv_use_sql` is enabled or as the primary read+write server when `sv_use_sql` is disabled
* `/load` now escapes the like-string

Since I am not good at designing config file commands, I would appreciate feedback on this part.

WIP:
* [x] rewrite SQL statements to work in both MySQL and SQLite (preferable just ANSI-SQL)
  * [x] create tables (`COLLATE BINARY` and encoding info)
  * [x] store rank (UPSERT for points)
  * [x] load birthday (different function in sqlite for time handling)
  * [x] `/mapinfo` (`convert(? using utf8mb4) COLLATE utf8mb4_general_ci`)
  * [x] `/map` (`convert(? using utf8mb4) COLLATE utf8mb4_general_ci`)
  * [x] store teamrank (`GROUP_CONCAT`)
  * [x] `/teamrank` (`GROUP_CONCAT`)
  * [x] ~`/top5team` (`GROUP_CONCAT`)~ doesn't contain GROUP_CONCAT
  * [x] `/times` (`UNIX_TIMESTAMP`)
  * [x] `/load` without any arguments (`UNIX_TIMESTAMP`)
* [x] all commits compiling, making future bisect easier
* [x] write a sqlite_to_mysql script
* [x] write an old_file_server to sqlite script
* [x] gracefully shutdown DbPool

Co-authored-by: Zwelf <zwelf@strct.cc>
2020-08-09 23:30:08 +00:00
def 7be7160d9b Remove unlicensed skins (fixes #2518)
and mention skin licenses (fixes #2544)

Still missing: Which skin is by btd?
2020-08-09 15:07:08 +02:00
def 802c97a79d Remove IP skin
Apparently that's a pokemon, definitely can't use that one
2020-08-08 13:10:59 +02:00
Zwelf 0fa13f6bf9 Fix include directories for SQLite by heinrich5991 2020-08-03 16:07:36 +02:00
Zwelf a9c0912408 Sort cmake output alphabetical 2020-08-03 12:58:52 +02:00
Zwelf 452017a58b Move format string to CREATE TABLE into own file 2020-08-03 12:58:52 +02:00
Zwelf 2c5f892205 Apply suggestions from code review 2020-08-03 12:58:52 +02:00
Zwelf b898f8c7c2 Remove unused MySQL interface 2020-08-03 12:58:52 +02:00
Zwelf 7c31a15c93 Add SQLite interface 2020-08-03 12:58:52 +02:00