edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10192 commits 1 branch 429 tags 411 MiB
Commit graph

345 commits

Author SHA1 Message Date
Learath 4451fed535 Fix missing include 2020-01-23 16:07:40 +01:00
def 0236f15018 Teamscore DDNet7 fix 2019-12-29 12:55:19 +01: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 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
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
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
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 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
Dennis Felsing c1a7961359 Write out sql server prefix to failed_sql.sql 2019-11-25 14:04:57 +01:00
bors[bot] c146de63fa
Merge #1909 
1909: Fix filescore path r=Learath2 a=ChillerDragon

The filescore system did not handle map paths well that were an actual path and not just the mapname.

```
# before fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:29:44][filescore]: opening 'records/DDNetPP-maps-BlmapChill_record.dtb' for reading failed

# after fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:31:05][filescore]: opening 'records/BlmapChill_record.dtb' for reading failed
```

I called ```Server()->``` in a thread so please review thread safety before merge.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-09-15 13:30:48 +00:00
ChillerDragon b39de87b18 Fix filescore path 
# before fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:29:44][filescore]: opening 'records/DDNetPP-maps-BlmapChill_record.dtb' for reading failed

# after fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:31:05][filescore]: opening 'records/BlmapChill_record.dtb' for reading failed
 2019-09-15 13:35:35 +02:00
12pm 3b1dcc8793 Handle 0 star random map votes 2019-08-27 18:33:37 +02:00
fokkonaut fabdc73087 Fix 'several players were found' on /rank 2019-07-14 11:31:58 +02:00
def 6d19963933 Remove unused variables 2019-06-25 23:07:32 +02:00
def f7e642bbbe Fix race condition in /map (untested) 2019-06-25 21:03:20 +02:00
heinrich5991 096c87bd1d Hack around the race condition in random maps selection 
Revert this "once we get proper SQL code"™.
 2019-05-20 00:12:59 +02:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
def 9dddb290dd File score: Implement negative top5 (fixes #1631) 2019-04-15 18:55:33 +02:00
bors[bot] 826a7781ae Merge #1621 
1621: Actually enable -Wuseless-cast r=heinrich5991 a=def-

It's not supported in C and we only checked using a C compiler.

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-12 00:08:19 +00:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast 
But don't enable it yet because I'm not sure what the best way is.
 2019-04-11 19:54:43 +02:00
def 0a286b1d94 File score: report file opening errors 2019-04-11 08:15:14 +02:00
def 279d6e60ca No duplicate () on rank 2019-04-10 22:05:44 +02:00
def ef0e685496 Make timestamp consistent in scores 
The motivation is to have the exact same timestamp for every member
finishing in a team and the team rank as well. This makes the database
more consistent and tooling easier.
 2019-04-02 20:18:40 +02:00
def 1e4890c499 More error checking in system.c (fixes #1317) 2019-03-19 23:16:29 +01:00
12pm 679628c4eb Exclude current map on random map votes 2019-03-18 15:10:27 +01:00
Learath c4af290df5 Don't use strtok. Close #1468 2019-03-05 12:46:29 +03:00
def 7f8b1ecf21 Fix saves sql insert format for file fallback 2018-12-30 00:31:29 +01:00
Dennis Felsing e076d07f5f
Merge pull request #1408 from ddnet/sneaky 
Sneaky code (TODO: Also mark 708?)
 2018-12-18 12:16:53 +01:00
Dennis Felsing 5026ba555d Fallback for /save when DB unreachable 2018-12-18 12:07:27 +01:00
def 6846a6ecad Fixes and stress improvements 2018-12-17 20:05:50 +01:00
Dennis Felsing f83a9be610 Sneaky code (TODO: Also mark 708?) 2018-12-17 14:55:58 +01:00
def 58927375fc Add message for failed database connection 2018-08-22 22:27:01 +02:00
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
heinrich5991 925aff21d4 Fix all the header guards and adjust the script a little 2018-07-06 16:11:38 +02:00
Dennis Felsing 93f0cd8933 Proper negative top5 calculation (fixes #1064) 2018-03-05 11:53:55 +01:00
Learath2 ff872b39cd Forgot to add GameID to the col-list 2018-02-14 01:17:40 +01:00
Learath bc11fc2a35 Add GameUuid to teamscore aswell 
Also get GameUuid through an interface.
 2018-02-07 16:43:36 +01:00
Learath 94d98e833a Fix mistakes. Fix CREATE TABLE 2018-02-07 01:10:02 +01:00
Learath 0aeb912db2 Escape the UUID just in case 2018-02-07 00:44:03 +01:00
Learath 4a52bca55d Include the teehistorian uuid instead 2018-02-07 00:35:21 +01:00
Learath 4748d5f065 Add client version to the record 2018-02-06 20:07:42 +01:00
def 3033fbb466 Also pass negative numbers 2018-01-21 19:13:20 +01:00
def a731482152 /top5, /top5team, /top5points, /times also show worst results with negative numbers 2018-01-21 19:08:52 +01:00
Dennis Felsing 31bbbaf512 case sensitivity 2018-01-15 09:10:20 +01:00
Dennis Felsing 272e14357c Fix SQL code for points/top5points 2018-01-15 09:08:51 +01:00
def ac2943a49b utf8mb4 in database for real utf8 2017-08-26 09:00:33 +02:00
def 98520bb407 other kind of fix 2017-08-19 09:36:13 +02:00
def d40dd4f362 Don't try next SQL server when /times returns empty 2017-08-19 09:32:14 +02:00
def 0a28556481 A bit nicer birthday message 2017-07-31 18:24:16 +02:00
def d9aeeae3fc Fix sql_score.cpp formatters 2017-07-30 14:23:25 +02:00
def adef38a574 Revert "We want the Timestamp of a team to stay min(Timestamp) to indicate the first time this team finished the map" 
This reverts commit bf0e67a34a.
 2017-07-26 18:12:41 +02:00
def cf08239e58 no plenk 2017-07-24 20:58:51 +02:00
def bf0e67a34a We want the Timestamp of a team to stay min(Timestamp) to indicate the first time this team finished the map 2017-07-23 21:20:12 +02:00
def 42b07441a5 Try to make SQL connections a bit more hardy 2017-07-08 14:14:50 +02:00
ChillerDragon 727b9f84b6 fixed scoreboard update for slow racers (less hacky) (#765) 
* fixed scoreboard update for slow racers (less hacky)

* Fix some style issues
 2017-07-05 23:01:57 +02:00
def 45acda1a66 Fix compiler warning 2017-06-02 21:49:53 +02:00
def c49aa0671f Revert "A bit faster" 
This reverts commit 1428c25083.
 2017-05-24 23:16:10 +02:00
def 1428c25083 A bit faster 2017-05-24 21:39:04 +02:00
def 02995bf72f Oops 2017-05-24 21:36:14 +02:00
def 1f86e6c8df Save fixes 2017-05-24 21:32:26 +02:00
def 0f14307e8f oops 2017-05-17 22:37:54 +02:00
def 7e7d56048b New try at loading in team only 2017-05-17 22:30:13 +02:00
Dennis Felsing 87adba55ad Allow voting again if no map could be found for random map vote 2017-05-15 11:15:04 +02:00
def 8c9995f166 oops 2017-05-14 22:44:52 +02:00
def 413f96b43d Prevent some save/load cheating 2017-05-14 22:42:49 +02:00
def f4112e3bcb Revert "Tees must be teamed up before loading" 
This reverts commit d29f2306ef.
 2017-05-14 22:36:44 +02:00
def f2232b8026 Fix compilation 2017-05-14 22:14:02 +02:00
Dennis Felsing 58207926ac Merge pull request #726 from Learath2/dd_pr_load 
Tees must be teamed up before loading
 2017-05-14 11:54:39 +02:00
def 8dcad29138 Also update timestamp in team rank (fixes discord bot to show team ranks when they exist) 2017-04-23 14:08:58 +02:00
def 9da2655ea7 Add own time to /mapinfo 2017-04-21 20:13:51 +02:00
def 407943a0a0 A bit more cautious SQL code 2017-04-13 09:26:12 +02:00
def d450678bf3 Quit even if score-threads didn't complete 2017-04-13 08:38:27 +02:00
Learath 0cafa8b813 Random tees can't load saves 2017-04-12 16:59:46 +02:00
Learath 47f405e160 Remove tees that don't belong 2017-04-12 10:33:02 +02:00
Learath d29f2306ef Tees must be teamed up before loading 2017-04-11 21:18:26 +02:00
HMH 7ef108c818 Fix style in some places which the previous fix missed 2017-03-23 22:28:06 +01:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
def 3ed6692ad7 SQL string cleanup 2016-09-25 10:41:34 +02:00
H-M-H 1a311585be escape strings before applying FuzzyString 2016-09-03 18:28:11 +02:00
def c91ef1ea81 str_append instead of strcat 2016-08-21 21:14:41 +02:00
def 2aa3303884 Longer team ranks 2016-08-21 21:06:12 +02:00
H-M-H 35bd378a62 fixed RandomUnfinishedMap 
do not execute this function several times even after success
 2016-06-22 02:00:29 +02:00
def e518a701a3 Clean up sql dbg_msg calls 2016-06-15 11:52:40 +02:00
def e0ec97174a Try to fix broken /map 2016-06-10 03:05:47 +02:00
HMH bb9d23bb73 sql-save: forgot a line 2016-05-31 12:32:09 +02:00
HMH 28d116217b fixed resetting of saving-state of teams (was not reset always) 
destructor of CSqlTeamSave takes care of that now
while doing so the allocation of CSaveTeam has been moved to the stack
 2016-05-31 00:03:28 +02:00
HMH ea5892b1ce don't clear sql-mapstring twice 2016-05-21 22:53:49 +02:00
H-M-H b648b530d5 Merge branch 'master' into sqlmasters 2016-05-20 23:40:29 +02:00
def 3c54f443b2 Make sv_join_vote_delay work for /map votes and make the number of seconds configurable 2016-05-20 20:05:47 +02:00
def ede6a9f93f More uniform /times output (thanks Soreu) 2016-05-20 18:28:33 +02:00
H-M-H 2bcbe52d14 fixed /load message 2016-05-11 15:54:09 +02:00
H-M-H 42fc8a0fe2 fixed use of Str and ClrStr 2016-05-11 15:26:16 +02:00
H-M-H 6a2438e1cf fixed includes 2016-05-11 15:01:53 +02:00
H-M-H 3b6baaa8d3 made CSqlData const for threadfunctions and added a class for sqlstrings 
CSqlData is const for threadfunctions now to avoid modification from
within the threadfunctions as these might be called several times.
Previously this was a problem as ClearString could possibily be applied
multiple times to the same string.

To solve this the class CSqlString has been added. This class takes a
const char* and copies it. Additionally a clearstring is created from
the given const char*. This enables access to the original as well as
the cleared string safe for sql-statements.

sql_string_helpers got an own source file now.

A crashbug from CSqlServer has been fixed (pointer has not been set
back to 0)
 2016-05-09 23:35:23 +02:00
H-M-H 4bf1a68292 do not write nullbytes to failed_sql.sql 2016-05-05 13:23:35 +02:00
H-M-H 30ca8d8774 made writing to sql-failurefile threadsafe 2016-05-04 23:37:34 +02:00
H-M-H 5dc47ede58 put sql_string_helpers into an own namespace 2016-05-04 16:51:18 +02:00