Commit graph

15861 commits

Author SHA1 Message Date
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
Fireball ab9b96ddb2 Backported fix for Text() incorrect parameter type (int -> float)
The original fix was done by @oy for 0.7.4.
2020-07-15 20:49:14 +01:00
Fireball b1c17c3248 Backported fix for TextWidth() parameter mix-up
Fixes #2511 (Stack-buffer-overflows in some UIs).
The original fix was done by @oy for 0.7.4.
2020-07-15 20:48:29 +01:00
bors[bot] c6ec6c5e50
Merge #2512
2512: Fix prediction when chatting while shooting/walking (fixes #2506) r=def- a=trml

Also fixed a case when switching to the dummy and back while holding fire (the reload timer should now stay in sync afterwards).

Co-authored-by: trml <trml@users.noreply.github.com>
2020-07-15 05:39:19 +00:00
trml b354e034fc Fix prediction when chat is enabled 2020-07-15 03:15:35 +02:00
trml d57c8ef463 Fix desync of predicted reload timer 2020-07-15 02:47:51 +02:00
bors[bot] 69593a3191
Merge #2502
2502: Improved dummy switching r=def- a=Fireball-Teeworlds

- Fix a use-after-free when there are no new snapshots for the cl_dummy tee after the switch: #2499 .
- When one of the tees is hooked, cycling through them will no longer show phantom hook for the other tee: https://youtu.be/mxVT4pdyGnU.
- Dummy switch might happen a bit quicker since it doesn't depend on receiving new snapshots.
- Simplified code: m_LastDummy2 is no more.



Co-authored-by: Fireball <fireball.teeworlds@gmail.com>
2020-07-14 06:31:43 +00:00
sirius ef85308a47 remove aBuf 2020-07-14 10:45:03 +08:00
bors[bot] 3ff0a7fec6
Merge #2498
2498: Limit zooming out further (fixes #2497) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-07-13 21:34:05 +00:00
def 4d34dd365b Limit zooming out further (fixes #2497) 2020-07-13 20:23:49 +02:00
sirius 17bf1a9b38 change identifier style 2020-07-14 00:12:03 +08:00
sirius 9482ffa10a change identifier style 2020-07-13 23:10:00 +08:00
bors[bot] 37a906d972
Merge #2501
2501: Show "Free View" for Sixup r=fokkonaut a=Learath2

@fokkonaut is this enough?

bors delegate=fokkonaut

Co-authored-by: Learath <learath2@gmail.com>
2020-07-13 09:50:48 +00:00
Learath 85a2268b2a Show "Free View" for Sixup 2020-07-13 11:35:03 +03:00
sirius d7646666f0 use array instead of string 2020-07-13 12:41:07 +08:00
bors[bot] 38ea723d94
Merge #2433 #2505 #2506
2433: Fix votes for sixup r=heinrich5991 a=Learath2

I think this looks sane but I haven't tested it at all for idk how to even test this locally/alone

2505: Fix legacy 64 player serverinfo, don't send duplicate packets (fixes #2495) r=heinrich5991 a=def-

For legacy we sent the first packet once correctly, then the 2nd and 3rd
packet without the marker and token at the start, so they never worked.

For new 64 player serverinfo we sent all packets correctly but the 1st
packet twice.

Introduced in #1955.

2506: Prevent whisper spam from 0.7 (fixes #2504) r=heinrich5991 a=def-



Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: def <dennis@felsin9.de>
2020-07-12 22:58:23 +00:00
bors[bot] 3a3e8e4d65
Merge #2493
2493: Fix compiler warning in stoppers without changing physics r=heinrich5991 a=def-

Probably related to #2487, was previously fixed and caused stoppers not to work.

```
src/game/collision.cpp:902:247: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare]
src/game/collision.cpp:891:252: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare]
src/game/collision.cpp:885:251: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare]
```

Co-authored-by: def <dennis@felsin9.de>
2020-07-12 22:50:07 +00:00
bors[bot] 9361be8aed
Merge #2494
2494: Persian update by Quick r=def- a=def-

Not sure if the missing empty lines inbetween matter, can fix later.

Co-authored-by: def <dennis@felsin9.de>
2020-07-12 22:36:05 +00:00
def 74197fc027 Prevent whisper spam from 0.7 (fixes #2504) 2020-07-13 00:28:47 +02:00
def c8876b2c02 Fix legacy 64 player serverinfo, don't send duplicate packets (fixes #2495)
For legacy we sent the first packet once correctly, then the 2nd and 3rd
packet without the marker and token at the start, so they never worked.

For new 64 player serverinfo we sent all packets correctly but the 1st
packet twice.

Introduced in #1955.
2020-07-13 00:19:00 +02:00
Fireball 918f321dfb Improved dummy switching
- Fix a use-after-free when there are no new snapshots for the cl_dummy tee after the switch.
- When one of the tees is hooked, cycling through them will no longer show phantom hook for the other tee.
- Dummy switch might happen a bit quicker since it doesn't depend on receiving new snapshots.
- Simplified code: m_LastDummy2 is no more.
2020-07-12 19:14:18 +01:00
Learath dd010364ed Fix double messages 2020-07-12 10:34:36 +03:00
def 478d7434b2 Persian update by Quick
and regenerate translation files while at it
2020-07-11 23:21:34 +02:00
def 8858fc24ec Fix compiler warning in stoppers without changing physics
Probably related to #2487, was previously fixed and caused stoppers not
to work.

src/game/collision.cpp:902:247: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare]
src/game/collision.cpp:891:252: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare]
src/game/collision.cpp:885:251: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare]
2020-07-11 11:38:29 +02:00
def a0e96d58ea Version 14.2 2020-07-10 08:32:12 +02:00
bors[bot] 9a4fbc4e83
Merge #2489
2489: Update French translations (by SunnyPistache & Pipou) r=def- a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-07-09 22:35:17 +00:00
def 59243c0588 Update French translations (by SunnyPistache & Pipou) 2020-07-10 00:34:17 +02:00
bors[bot] 1a79644dde
Merge #2490
2490: Don't request IUpdater interface when built without updater r=heinrich5991 a=def-

Fixes warning:

[kernel]: failed to find interface with the name 'updater'

Co-authored-by: def <dennis@felsin9.de>
2020-07-09 22:27:03 +00:00
def 3585d83196 Don't request IUpdater interface when built without updater
Fixes warning:

[kernel]: failed to find interface with the name 'updater'
2020-07-10 00:01:02 +02:00
def 8e1b9516f6 Rebuild sqlite without extension, rename to sqlite3 2020-07-09 23:11:59 +02:00
bors[bot] 9492eaa630
Merge #2488
2488: Remove sqlite3ext.h since we don't need it r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-07-09 18:49:57 +00:00
bors[bot] d7a0a914c3
Merge #2460
2460: Don't reset chat on map change (fixes #2451) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-07-09 18:38:40 +00:00
bors[bot] c4d5c8dfa2
Merge #2478 #2480
2478: Use (u)int64 from system.h instead of (u)int64_t from cstdint r=heinrich5991 a=def-

src/game/client/prediction/gameworld.h:62:90: error: ‘int64_t’ has not been declared
   62 |  void CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamage, int ActivatedTeam, int64_t Mask);
      |                                                                                          ^~~~~~~

2480: Send zoom status for dummy too r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-07-09 18:31:32 +00:00