Commit graph

13566 commits

Author SHA1 Message Date
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
jupeyy 8a8674b545 fix min mouse pos for follow factor 2019-12-19 00:26:54 +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
bors[bot] 709681604d
Merge #1989
1989: Remove a few unused stdio.h's r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-12-09 18:23:26 +00:00
ChillerDragon 01c873bcf7 Remove a few unused stdio.h's 2019-12-09 15:40:59 +01:00
bors[bot] 86d7b483cf
Merge #1988
1988: Ignore map_convert_07 tool binary r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-12-09 14:16:49 +00:00
ChillerDragon c122da255d Ignore map_convert_07 tool binary 2019-12-09 15:15:02 +01:00
Dennis Felsing a27358806c Revert "Support shotgun_speed 0"
This reverts commit 9d39ca888f.
2019-12-09 14:59:10 +01:00
bors[bot] 843b9ec982
Merge #1987
1987: Add libssl-dev as dependency r=def- a=ChillerDragon

I was told that that cmake failed on Crypto not found and installing libssl-dev solved the issue. Could not reproduce it tho.

When compiling ddnet7 with mysql. Might be a issue with ddnet7 only tho so not sure.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-12-09 12:44:51 +00:00
ChillerDragon 4d7960f211 Add libssl-dev as dependency 2019-12-09 13:12:19 +01:00
def 8639c902ae map_convert_07: use regular paths 2019-12-08 23:14:56 +01:00
Dennis Felsing b88ebbc771
Merge pull request #1985 from def-/pr-db-ddnet7
Add support to tell DDNet7 ranks apart from DDNet ones
2019-12-08 23:01:27 +01:00
Dennis Felsing e8f7c55fbe
Merge pull request #1986 from def-/pr-map_converter
Add map_convert_07 tool
2019-12-08 22:59:22 +01:00
def 28aabc5b91 Add map_convert_07 tool
Fixes https://github.com/ddnet/ddnet7/issues/20
2019-12-08 22:44:25 +01:00
Aerll ff685ac1e0
fix ub 2019-12-08 20:08:00 +01:00
Aerll 7d6ad9fca5
revert 2019-12-08 20:05:13 +01:00
def 18e2232727 Add support to tell DDNet7 ranks apart from DDNet ones
Saves should not be loadable from one to the other.

Requires:
ALTER TABLE record_race ADD COLUMN DDNet7 BOOL DEFAULT FALSE AFTER GameID;
ALTER TABLE record_teamrace ADD COLUMN DDNet7 BOOL DEFAULT FALSE AFTER GameID;
ALTER TABLE record_saves ADD COLUMN DDNet7 BOOL DEFAULT FALSE AFTER Server;
2019-12-08 16:04:49 +01:00
bors[bot] 6fa7837892
Merge #1982
1982: Fixed installation on other than Ubuntu GNU/Linux distributions r=heinrich5991 a=ElXreno

Fixed installation on other than Ubuntu GNU/Linux distributions.

Fedora and other GNU/Linux distributions use different $libdir prefixes. Now it can be installed on any GNU/Linux distributions.

Co-authored-by: ElXreno <elxreno@gmail.com>
2019-12-06 12:21:30 +00:00
ElXreno f6478067ae
Fixed installation on other than Ubuntu GNU/Linux distributions 2019-12-06 14:20:32 +03:00
Aerll f8466fde7d
Fix: background colors being set to white
After changing either of background colors in ddnet tab in settings and reopening the client, both become white.
2019-12-05 15:51:40 +01:00
bors[bot] 6e7ef52bda
Merge #1980
1980: Fix: automapper skips tiles when it shouldn't r=def- a=Aerll

In case of something like: INDEX 0 OR 1 all tiles need to be automapped.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
2019-12-05 14:39:51 +00:00
Aerll 9f4721b74b
Fix: automapper skips tiles when it shouldn't
In case of something like: INDEX 0 OR 1 all tiles need to be automapped.
2019-12-05 15:28:35 +01:00
bors[bot] c31f6303cf
Merge #1977
1977: Support shotgun_speed 0 r=Learath2 a=def-

for mapping stationary bullets

As requested by Im 'corneum.

Co-authored-by: def <dennis@felsin9.de>
2019-12-04 16:48:06 +00:00
bors[bot] e02cd322ad
Merge #1979
1979: Clean up color handling a bit r=Learath2 a=def-

- SetAlpha should be called WithAlpha and only works for RGBA
- Fix type correctness of color_scale and introduce color_invert
- Nicer hook coll color handling in RenderPlayer
- Use CRTP to have type safe WithAlpha, otherwise this would compile:
  `ColorHSLA = WithAlpha(ColorRGBA(1.0f, 1.0f, 1.0f));`


Follow-up to https://github.com/ddnet/ddnet/pull/1968

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2019-12-03 12:09:57 +00:00
bors[bot] d8cd6aa83e
Merge #1976
1976: Write out sql server prefix to failed_sql.sql r=Learath2 a=def-

also don't write out non-eligible records.

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2019-12-03 11:58:09 +00:00
Dennis Felsing 37ef24225e Clean up color handling a bit
- SetAlpha should be called WithAlpha and only works for RGBA
- Fix type correctness of color_scale and introduce color_invert
- Nicer hook coll color handling in RenderPlayer
- Use CRTP to have type safe WithAlpha, otherwise this would compile:
  ColorHSLA = WithAlpha(ColorRGBA(1.0f, 1.0f, 1.0f));
2019-12-03 11:32:55 +01:00
bors[bot] d597322ef3
Merge #1978
1978: Update localizations (Thanks to Cellegen for report) r=Learath2 a=def-



Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2019-12-03 10:07:34 +00:00