edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
9790 commits 1 branch 424 tags 415 MiB
Commit graph

9790 commits

This branch
This branch
All branches
Author SHA1 Message Date
def 017b8c3621 Move DDNet-custom json code out of external directory (fixes #2022) 2020-01-01 20:07:04 +01:00
def df807a7486 -DVIDEORECORDER=ON instead of -DFFMPEG=ON, fix README 
remove unused files
 2020-01-01 16:56:54 +01:00
sirius 7710b88670 Merge branch 'master' of https://github.com/ddnet/ddnet into demo_render2 2020-01-01 18:36:49 +08:00
Dennis Felsing 9816881a2a
Merge pull request #2017 from def-/pr-fix-websockets-warning 
Fix Websockets warning
 2019-12-31 10:38:49 +01:00
Dennis Felsing 45ad7be57c
Merge pull request #2021 from ElXreno/appdata 
Add AppData manifest
 2019-12-31 10:38:10 +01:00
ElXreno 73d91b7d1a
Updated screenshots 2019-12-31 12:37:19 +03:00
ElXreno 6c47ca7994
Removed the welcome 2019-12-31 11:58:19 +03:00
Artem Polishchuk 375e43e98b Add donation link (#2) 2019-12-31 10:56:29 +03:00
ElXreno 31b228e7dc
Fixed license naming 2019-12-31 10:48:45 +03:00
ElXreno 44adf1878d
Added AppData manifest 2019-12-31 10:06:44 +03:00
Dennis Felsing 93fa910e39 Bundled libs update 
- ogg 1.3.3 -> 1.3.4
- freetype 2.10.0 -> 2.10.1
- curl 7.65.0 -> 7.67.0, openssl 1.1.1c -> 1.1.1d
 2019-12-30 14:56:21 +01:00
Dennis Felsing a24a8c36ee Remove debugging help 2019-12-30 14:29:00 +01:00
Dennis Felsing 070d215ae0 Fix Travis Mac OSX build 
ABI check failed, CMAKE_SIZEOF_VOID_P was thus not set and we look for
libs in wrong directory. Something seems to be wrong with the C/C++
compilers Travis is using. Not sure how to figure out more closely.
 2019-12-30 13:19:33 +01:00
Dennis Felsing ba3b436139 Fix Websockets warning 2019-12-30 10:12:16 +01:00
Dennis Felsing 2a012ab251
Merge pull request #1994 from ChillerDragon/pr_circleci_cmakeflags 
Test mysql and websockets in circleci
 2019-12-30 09:47:22 +01:00
def b0406e335b Remove debugging help 2019-12-29 13:35:19 +01:00
def 0236f15018 Teamscore DDNet7 fix 2019-12-29 12:55:19 +01:00
def 6da92b4b9c Fix map_convert_07 tool 2019-12-29 12:43:41 +01:00
def 5f855b11b2 Version 12.8.1 2019-12-22 22:39:31 +01:00
Dennis Felsing 811ddb3283
Merge pull request #2008 from Learath2/dd_pr_demohotfix 
Fix (not) small bug with demos that don't include a map
 2019-12-22 22:38:22 +01:00
Learath a882cf5196 Fix bug with slices 2019-12-22 19:09:14 +03:00
def aa3e82cda7 Revert "Write out sql server prefix to failed_sql.sql" 
This reverts commit c1a7961359.
 2019-12-22 09:30:33 +01:00
def 8879f17341 Revert "Still pass in SqlServer even when writing to file since we need prefix" 
This reverts commit 6e294d938b.
 2019-12-22 09:28:14 +01:00
Dennis Felsing 83f2fc2669
Merge pull request #2012 from ChillerDragon/pr_func_style 
Style 'void foo() {' -> 'void foo()\n{'
 2019-12-21 18:18:49 +01:00
ChillerDragon 928e5407eb Style 'void foo() {' -> 'void foo()\n{' 2019-12-21 14:35:09 +01:00
Dennis Felsing 3e08d473ab
Merge pull request #2011 from heinrich5991/pr_ddnet_fix_comment 
Fix outdated comment
 2019-12-21 08:00:38 +01:00
heinrich5991 e70fb8e43d Fix outdated comment 2019-12-20 22:51:10 +01:00
Learath 65ec25a8a1 Fix small bug with demos that don't include a map 2019-12-18 13:51:08 +01:00
Dennis Felsing 71857fdb80
Merge pull request #2007 from heinrich5991/pr_ddnet_rm_string_h 
Remove `strcmp` from file score
 2019-12-18 13:15:10 +01:00
heinrich5991 4aeeedbbea Remove strcmp from file score 2019-12-18 12:52:36 +01:00
Dennis Felsing 70e06d8889
Merge pull request #2005 from rffontenelle/patch-4 
Update brazilian_portuguese.txt
 2019-12-18 07:00:28 +01:00
Rafael Fontenelle 9652ef46f1
Update brazilian_portuguese.txt 2019-12-18 02:51:47 -03:00
def 354541a146 Add string.h include in file_score.cpp 
src/game/server/score/file_score.cpp: In member function ‘CFileScore::CPlayerScore* CFileScore::SearchName(const char*, int*, bool)’:
src/game/server/score/file_score.cpp:169:9: error: ‘strcmp’ was not declared in this scope
  169 |    if (!strcmp(r.front().m_aName, pName))
      |         ^~~~~~
src/game/server/score/file_score.cpp:12:1: note: ‘strcmp’ is defined in header ‘<cstring>’; did you forget to ‘#include <cstring>’?
   11 | #include <engine/shared/console.h>
  +++ |+#include <cstring>
   12 |¬
 2019-12-17 22:25:06 +01:00
def fbbf7b3929 Fix MinGW build by temporarily disabling FORTIFY_SOURCE (fixes #2001) 2019-12-17 22:04:21 +01:00
def a7deac1b22 Update credits 2019-12-17 21:35:40 +01:00
Dennis Felsing d8ac51e006
Merge pull request #2000 from def-/pr-12-8 
Version 12.8
 2019-12-17 21:23:58 +01:00
Dennis Felsing 4171e8751f
Merge pull request #1939 from Learath2/dd_pr_demoload 
Always try extracting map before fail. Fix #1886
 2019-12-17 21:20:10 +01:00
Emir Marincic 0bcc7cca96
Merge pull request #1998 from def-/pr-sdl208 
SDL 2.0.10 -> 2.0.8 (fixes #1997)
 2019-12-17 16:03:47 +01:00
Learath2 3784f5bea4 Use a UUID, Cleanup code and UI 2019-12-17 15:44:54 +01:00
Dennis Felsing 044c74f91a Version 12.8 2019-12-16 15:36:26 +01:00
bors[bot] 9b8675b774
Merge #1991 
1991: Translate the replay feature to german (+more) r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-12-16 13:41:33 +00:00
bors[bot] aeee8f8704
Merge #1995 
1995: Remove some unused includes r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-12-16 13:19:32 +00:00
bors[bot] b8d0a37d89
Merge #1999 
1999: Add/Optimize some simplified Chinese translations r=def- a=QingGo



Co-authored-by: 清歌 <zyqingjohn@qq.com>
 2019-12-16 13:05:52 +00:00
清歌 72ac1a2cc8
Add/Optimize some simplified Chinese translations 2019-12-16 19:55:35 +08:00
Dennis Felsing 6e294d938b Still pass in SqlServer even when writing to file since we need prefix 2019-12-16 10:30:56 +01:00
ChillerDragon 4a6a85124a Remove some unused includes 2019-12-14 10:20:42 +01:00
def 868a44f771 SDL 2.0.10 -> 2.0.8 (fixes #1997) 2019-12-13 23:43:04 +01:00
ChillerDragon b36e010aed Translate the replay feature to german (+more) 2019-12-13 16:37:55 +01:00
ChillerDragon 6811ab6040 Test mysql and websockets in circleci 2019-12-12 16:55:40 +01:00
bors[bot] 4a83a42f14
Merge #1981 
1981: Fix: background colors being set to white r=def- a=Aerll

After changing either of background colors in ddnet tab in settings and reopening the client, both become white.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2019-12-10 12:34:48 +00:00