Commit graph

10593 commits

Author SHA1 Message Date
Zwelf 5893913922 Clean up includes in sql backend 2020-08-09 17:54:25 +02:00
Zwelf 5b53a05a40 Rename LoadString to FromString to fix windows build 2020-08-09 17:14:11 +02:00
def 20e8bfd12a Try to fix Windows build 2020-08-09 17:14:11 +02:00
Zwelf 61ffd88f34 Reformulate #if not defined() because MSVC errors on this expression 2020-08-09 17:13:21 +02:00
Zwelf b2cf3cafc5 Implement dump_sqlserver 2020-08-03 16:37:50 +02:00
Zwelf 0fa13f6bf9 Fix include directories for SQLite by heinrich5991 2020-08-03 16:07:36 +02:00
Zwelf 9e1979f561 Rename Database connect result from ERROR to FAILURE 2020-08-03 13:11:52 +02:00
Zwelf 7834c2c1d8 Add file score import script by heinrich5991 2020-08-03 12:58:52 +02:00
Zwelf e483011df6 Add script to move SQLite ranks to MySQL 2020-08-03 12:58:52 +02:00
Zwelf d71bf5cef1 Use DB write server for /load 2020-08-03 12:58:52 +02:00
Zwelf 3e1324dd0a Add uuid parsing 2020-08-03 12:58:52 +02:00
Zwelf c6b1b08355 Database specific collate utf8 nocase
making and work
2020-08-03 12:58:52 +02:00
Zwelf d16bb5cc08 Make timestamps compatible with SQLite
works for `/mapinfo`, `/load`, `/save`, `/times`
2020-08-03 12:58:52 +02:00
Zwelf 41b5ee9dd8 Make /teamrank compatible with SQLite 2020-08-03 12:58:52 +02:00
Zwelf aee73b99dc Rewrite insert teamrank making code reuse easier 2020-08-03 12:58:52 +02:00
Zwelf c8d710926f Fix missing last line 2020-08-03 12:58:52 +02:00
Zwelf 044edbe42b Make storing teamrank compatible with SQLite 2020-08-03 12:58:52 +02:00
Zwelf e3a78a7a31 Add BindBlob and BindFloat function to IDbConnection interface 2020-08-03 12:58:52 +02:00
Zwelf 26a2c91235 Trying to reconnect when ongoing MySQL connection failed 2020-08-03 12:58:52 +02:00
Zwelf a6df9be98e Make getting birthday compatible with SQLite 2020-08-03 12:58:52 +02:00
Zwelf eb4d77f071 Make inserting ranks compatible with SQLite 2020-08-03 12:58:52 +02:00
Zwelf 17de42a947 Implement locking in SQLite 2020-08-03 12:58:52 +02:00
Zwelf 1677e1fed5 Gracefully shutdown database pool 2020-08-03 12:58:52 +02:00
Zwelf 040bec2258 Fix FindSQLite3.cmake 2020-08-03 12:58:52 +02:00
Zwelf 89ee5944b4 Add missing include 2020-08-03 12:58:52 +02:00
Zwelf a9c0912408 Sort cmake output alphabetical 2020-08-03 12:58:52 +02:00
Zwelf 00da45191c Make CREATE TABLE compatible with SQLite 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
Zwelf ad21ec1269 Add SQLite to build system and CI 2020-08-03 12:58:52 +02:00
Zwelf 2eb3d23ef4 Rewrite score using the new interface
delete file_score for now as it will be replaced by a sqlite backend
2020-08-03 12:58:52 +02:00
Zwelf 295ce95d64 Roughly define database pool interface 2020-08-03 12:58:52 +02:00
Zwelf d59cdf47b5 Define new database interface 2020-08-03 12:58:52 +02:00
bors[bot] 6e6e51e626
Merge #2530
2530: Provide sqlite3.lib file r=heinrich5991 a=def-

as requested in https://github.com/ddnet/ddnet-scripts/issues/26

Co-authored-by: def <dennis@felsin9.de>
2020-08-03 10:45:45 +00:00
bors[bot] abb7e7ba1b
Merge #2531
2531: Client: Support .map file drag-and-drop to open map in editor r=heinrich5991 a=def-

As suggested by Lady Saavik

Co-authored-by: def <dennis@felsin9.de>
2020-08-03 10:39:25 +00:00
bors[bot] 49de530d30
Merge #2534
2534: Fix utf8 handling in str_truncate (fixes #2533) r=Zwelf a=def-

and rename to str_utf8_truncate since it's only used for utf8 strings

Co-authored-by: def <dennis@felsin9.de>
2020-08-02 18:58:28 +00:00
def e2fde4d730 Fix utf8 handling in str_truncate (fixes #2533)
and rename to str_utf8_truncate since it's only used for utf8 strings
2020-08-02 18:32:42 +02:00
def 07f18d4ac4 Client: Support .map file drag-and-drop to open map in editor
As suggested by Lady Saavik
2020-08-02 13:00:01 +02:00
def bf4008cc2e Provide sqlite3.lib file
as requested in https://github.com/ddnet/ddnet-scripts/issues/26
2020-08-02 02:06:07 +02:00
def 4873536d93 Polish update by TortiLeq 2020-08-02 00:03:22 +02:00
bors[bot] c37dc66047
Merge #2521
2521: Polish update by TortiLeq r=heinrich5991 a=def-



Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2020-07-24 10:25:23 +00:00
Dennis Felsing 4d496f6774
Polish update by TortiLeq 2020-07-21 23:57:28 +02:00
bors[bot] 34b761312e
Merge #2517
2517: Fix sixup players not making sounds when hooking others r=Learath2 a=Fireball-Teeworlds

I've restructured the code to make it easier to read.

There are two differences in it's behavior:
1. Hook sounds coming from sixup players are now only muted for the player themselves (using a mask) instead of being muted for everyone. This fixes at least one cause for #2508.
2. Mask for `COREEVENT_GROUND_JUMP` is now using `Asker` parameter to `TeamMask()`. I believe it was originally an oversight that this mask was different from the others. But the difference is barely noticeable: one case is when spectating a Tee that is in a solo part. Previously such Tee wouldn't be making ground jumping sounds.

7e610f9944/src/game/server/teams.cpp (L405-L418)

I've tested this with DDNet and Vanilla (0.7) clients.

Co-authored-by: Fireball <fireball.teeworlds@gmail.com>
2020-07-20 13:26:24 +00:00
Fireball 7e610f9944 Fix sixup players not making sounds when hooking others
This also fixes some less noticeable edgecases with ground jump sound: for example, when spectating a tee who is in a solo part.
2020-07-18 19:13:56 +01:00
bors[bot] 127e4e643d
Merge #2472
2472: Add function to show health and armor in nameplates. (mainly for server demo) r=def- a=sirius1242

The effect is as follows:
![effect image](https://user-images.githubusercontent.com/32300858/86894538-c6be2900-c135-11ea-832c-d4beaae36724.png)
- use `cl_nameplates_ha` to switch on-off. (default is off)
- use `cl_nameplates_ha_size` to adjust size of health and armor nameplates.

Mainly for server-side-recorded demos. If it can't get health and armor data, this will not be rendered.

Co-authored-by: sirius <sirius.ustc@gmail.com>
2020-07-16 13:19:01 +00:00
sirius 2394d49d34 update calling way of TextWidth() 2020-07-16 21:07:41 +08:00
sirius a6181ce8d3 Merge branch 'master' of https://github.com/ddnet/ddnet 2020-07-16 21:07:04 +08:00
bors[bot] 76566b57fb
Merge #2515
2515: Port some text.cpp fixes r=def- a=Fireball-Teeworlds

1ca020ea19
912442347d

The first one fixes a stack-buffer-overflow in some UIs (closes #2511), the second one is just for consistent typing.

Co-authored-by: Fireball <fireball.teeworlds@gmail.com>
2020-07-15 22:06:27 +00:00