edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-13 11:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
10789 commits 1 branch 429 tags 412 MiB
Commit graph

2755 commits

Author SHA1 Message Date
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
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
def f4344dc420 Use (u)int64 from system.h instead of (u)int64_t from cstdint 
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);
      |                                                                                          ^~~~~~~
 2020-07-09 13:55:28 +02:00
def 6b7e1f54f4 Send zoom status for dummy too 2020-07-09 13:51:37 +02:00
def b2b664bf53 Don't reset chat on map change (fixes #2451) 2020-07-09 13:47:48 +02:00
bors[bot] 5cc6a08c2b
Merge #2471 
2471: Don't send zoom level while zooming (fixes #2470) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-07-09 11:24:19 +00:00
bors[bot] 56ef688489
Merge #2467 
2467: Add cl_smooth_zoom_time r=def- a=def-

as requested on Discord by nils & fokkonaut

Co-authored-by: def <dennis@felsin9.de>
 2020-07-09 10:35:07 +00:00
def 2e8faac549 Don't send zoom level while zooming (fixes #2470) 2020-07-08 10:42:28 +02:00
sirius edab0d097d add variable to adjust size of health and armor nameplate 2020-07-08 15:41:44 +08:00
sirius 4a44b90b11 adjust distance between health and armor 2020-07-08 14:32:24 +08:00
sirius 00c4adf05b add function to show health and armor in nameplates (only when client can get the health and armor data) 2020-07-08 13:34:24 +08:00
def defe2439bd Add cl_smooth_zoom_time 
as requested on Discord by nils & fokkonaut
 2020-07-07 22:59:20 +02:00
def f9d2c14ff6 Make zoom reset respect cl_default_zoom (fixes #2453) 2020-07-07 18:02:21 +02:00
bors[bot] 9008c96e80
Merge #2429 
2429: Use a cubic polynomial for smoothing zoom r=def- a=heinrich5991

Supersedes #2420.

Co-authored-by: Edgar <git@edgarluque.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-07-05 21:46:25 +00:00
heinrich5991 cdd715fd53 Add smoothing of camera zoom using a cubic polynomial 2020-07-01 00:19:17 +02:00
def 1cb9454ab8 Rename showothers2 -> showothers 
and the old showothers to legacy
 2020-06-30 21:38:51 +02:00
def edba33be33 Add Show others (own team only) menu setting 2020-06-30 21:38:14 +02:00
def c3521572ea Add showothers2@netmsg.ddnet.tw 
to support cl_show_others 2 properly
 2020-06-30 21:38:14 +02:00
Edgar 3578c74667
new defaults use logistic curve 2020-06-30 19:06:29 +02:00
Edgar ce57d928eb
newline at end of file 2020-06-30 16:30:40 +02:00
Edgar a46b266564
Smooth zoom 2020-06-30 16:25:54 +02:00
bors[bot] b96544f8ac
Merge #2413 
2413: Fix showothers for specchar r=heinrich5991 a=edg-l

Fixes https://github.com/ddnet/ddnet/issues/2410

I also made it use the Alpha on specchars that are on another team.

Co-authored-by: Edgar <git@edgarluque.com>
 2020-06-30 12:45:18 +00:00
Edgar eb1779f58c
Fix showothers for specchar 2020-06-30 14:04:41 +02:00
bors[bot] a79b1265df
Merge #2401 
2401: Client tells server its zoom level (fixes #2087) r=heinrich5991 a=def-

and server adapts the visible distance to it

Co-authored-by: def <dennis@felsin9.de>
 2020-06-30 10:01:01 +00:00
def 1782d95d99 Client tells server its zoom level (fixes #2087) 
and server adapts the visible distance to it
 2020-06-29 18:59:07 +02:00
bors[bot] de8cc79578
Merge #2389 
2389: Ignore emoticon of spammy players (fixes #2387) r=heinrich5991 a=def-

Controlled with the regular ignore chat button in players menu

Co-authored-by: def <dennis@felsin9.de>
 2020-06-29 12:09:48 +00:00
def b3b0e1041c Center the icons 2020-06-27 22:58:28 +02:00
bors[bot] 42455d4b4d
Merge #2388 
2388: Get rid of the annoying font size warnings r=heinrich5991 a=def-

Since we're not doing anything about them anyway, and I get them
spamming me on every client start.

Co-authored-by: def <dennis@felsin9.de>
 2020-06-27 20:53:39 +00:00
def b2371522f9 Fix alignment of icons in player options 2020-06-27 22:40:22 +02:00
bors[bot] 6a7695e696
Merge #2396 
2396: Color Selector improvement + cleanup r=Learath2 a=def-

![screenshot-20200627@150939](https://user-images.githubusercontent.com/2335377/85923064-3d326f80-b888-11ea-92f3-a7cf685890dc.png)

Tadaa, new feature in -200 lines :D

Co-authored-by: def <dennis@felsin9.de>
 2020-06-27 20:38:42 +00:00
bors[bot] 70ccf76dcf
Merge #2390 
2390: Support cl_show_hook_coll_own/other 2 to always show (fixes #2383) r=heinrich5991 a=def-

hook collision, without broadcasting to other players.

Removed cl_show_hook_coll_always in return

Renamed cl_video_showhookcollother to cl_video_show_hook_coll_other for consistency

Co-authored-by: def <dennis@felsin9.de>
 2020-06-27 20:31:29 +00:00
def 4e5912909b Improve & fix 2020-06-27 19:40:04 +02:00
def 50af2a8ed6 Show number in color scrollbars 
As suggested by Lady Saavik
 2020-06-27 15:08:50 +02:00
def d147c1c7f5 Cleanup color scrollbars in menus 2020-06-27 15:08:35 +02:00
def 7608eb67d6 Ignore emoticon of spammy players (fixes #2387) 
Add ignore emoticon button in player menu.
Someone needs to draw the graphic for that.
 2020-06-27 01:15:09 +02:00
def dc92626a3b Support cl_show_hook_coll_own/other 2 to always show (fixes #2383) 
hook collision, without broadcasting to other players.

Removed cl_show_hook_coll_always in return

Renamed cl_video_showhookcollother to cl_video_show_hook_coll_other for consistency
 2020-06-26 23:58:07 +02:00
def d6ba9440ca Get rid of the annoying font size warnings 
Since we're not doing anything about them anyway, and I get them
spamming me on every client start.
 2020-06-26 23:42:04 +02:00
def 2d6e56fec8 Translation fixes 
- Code didn't work with newlines, get rid of them
- Some stylistic improvements
 2020-06-26 18:34:50 +02:00
def 07e6dafb50 Revert "Fix out of bounds access in RenderPlayer (fixes #2365)" 
This reverts commit 80931b606a.
 2020-06-26 15:10:38 +02:00
bors[bot] cfda912307
Merge #2009 
2009: Fix min mouse position for follow factor r=heinrich5991 a=Jupeyy

@Learath2 you were the last to change this, would be nice if you could check if this is correct behaviour, i didn't find anything wrong :D

Co-authored-by: jupeyy <jupjopjap@gmail.com>
 2020-06-26 12:54:49 +00:00
3edcxzaq1 4e7b534622
Update menus_ingame.cpp 2020-06-26 11:13:55 +02:00
sven 9d0bae9769 Fix unused translation 2020-06-26 02:49:35 +02:00
bors[bot] b4472d72cf
Merge #2372 
2372: Fix out of bounds access in RenderPlayer (fixes #2365) r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-25 21:56:35 +00:00
bors[bot] 9fb6fa7720
Merge #2373 #2376 
2373: Fix out of bounds access in OnNewSnapshot (fixes #2366) r=Learath2 a=def-



2376: Add instructions for translation stats r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-25 20:49:21 +00:00
def 53971f44f1 ddnet-saves.txt: Also parse correctly when saving on other country 2020-06-25 22:30:51 +02:00
def e03066c8bd Fix out of bounds access in OnNewSnapshot (fixes #2366) 2020-06-25 18:34:41 +02:00
def 80931b606a Fix out of bounds access in RenderPlayer (fixes #2365) 2020-06-25 18:33:41 +02:00
heinrich5991 8c095b2727 Make spec character rendering a bit cleaner 2020-06-25 14:56:23 +02:00
Edgar 2922b4b672
show spectee when player is inactive only 2020-06-25 10:34:57 +02:00
Edgar 2f3073c547
fix /spec hook 2020-06-25 10:12:17 +02:00
Edgar b33180ae77
fix /spec rendering 2020-06-24 19:01:01 +02:00
Edgar 24a308c50c fix saying /spec show you as chatting 2020-06-24 11:32:27 +02:00
def f51a443998 Merge remote-tracking branch 'edg-l/pr_show_spec' 
Update x_spec with the more minimal version by HiRavie
Fix CMakeLists.txt
 2020-06-24 09:55:59 +02:00
bors[bot] 160a7b71fb
Merge #2279 #2327 
2279: Only forbid resizing when videorecorder is recording r=heinrich5991 a=def-



2327: List data files in `CMakeLists.txt` r=def- a=heinrich5991

This fixes missing files for people recompiling when we add new data
files.

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-06-23 08:48:05 +00:00
bors[bot] 1652d73a5e
Merge #2322 
2322: Use proper CSV writing for save codes r=def- a=heinrich5991

Supersedes #2296.

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-06-23 07:25:20 +00:00
heinrich5991 48e8ba69ca Use the CSV write to write save codes 2020-06-23 09:11:59 +02:00
def 83c820db09 Fix some naming conventions in videorecorder 2020-06-23 08:00:03 +02:00
bors[bot] 11e2f04c21
Merge #2280 
2280: Add a slightly longer introduction text r=heinrich5991 a=def-

Since we don't have a tutorial
![Screenshot](https://user-images.githubusercontent.com/2335377/85120864-235bb180-b224-11ea-8bb6-700f7228ee0d.png)

Co-authored-by: def <dennis@felsin9.de>
 2020-06-22 20:45:06 +00:00
def 57280fba99 Store saves client-side in ddnet-saves.txt 
Only appends saves, just in case you forgot where you saved.

Unfortunately only stores your own name, not your entire team.
 2020-06-22 21:12:35 +02:00
Edgar 933ea7cca3
fix bug, use ddnet character 2020-06-22 19:05:57 +02:00
Edgar 3f476171f1
change to white and use colors 2020-06-22 18:43:49 +02:00
Edgar befc4fc1b2
make skin also use alpha 2020-06-21 18:24:51 +02:00
Edgar 78bcc1d8fc
apply alpha to spec nameplates 2020-06-21 18:05:43 +02:00
Edgar f3466e05ba
Show /spec tees with a dashed skin 2020-06-21 17:48:33 +02:00
def c7908524cd Add a slightly longer introduction text 
Since we don't have a tutorial
 2020-06-21 01:15:01 +02:00
def 1610079020 Make the learn button fit (fixes #2293) 2020-06-20 14:57:52 +02:00
bors[bot] 4edac3143a
Merge #2281 
2281: Add Learn button which opens the ddnet wiki in the browser. r=heinrich5991 a=edg-l

![image](https://user-images.githubusercontent.com/15859336/85147350-05f00d00-b24f-11ea-8b6c-f79dbf605747.png)

## **I didn't test it on windows or mac.**

Co-authored-by: Edgar <git@edgarluque.com>
 2020-06-20 12:00:45 +00:00
Edgar 07f0239e01
Add Learn button which opens the ddnet wiki in the browser. 2020-06-20 13:56:02 +02:00
Learath 75e96aa5d3 Get rid of more magic constants, adapt to 0.7 2020-06-19 21:48:48 +03:00
Learath d200ef0bb0 Remove ugly hack 2020-06-19 21:42:19 +03:00
Learath 32fb6718dd Allow joining TEAM_SPECTATOR 2020-06-19 20:28:55 +03:00
bors[bot] 13237ee12e
Merge #2245 #2266 
2245: Stop playing map sound when demo player is paused r=heinrich5991 a=def-

Noticed on Shooting Range map

2266: Reset hook & collision in prediction after kill r=heinrich5991 a=def-

Thanks to Pipou for reporting

Co-authored-by: def <dennis@felsin9.de>
 2020-06-18 19:29:41 +00:00
def 7aed6476dc Allow larger map names 2020-06-18 18:29:27 +02:00
def 0d9d873abf Reset hook & collision in prediction after kill 
Thanks to Pipou for reporting
 2020-06-14 22:50:25 +02:00
Learath 8d255921b8 Fix out of bounds read 2020-06-14 12:38:52 +03:00
ZombieToad f12d84c2c7
Update gameclient.cpp 
so demo renders the right clan as green
 2020-06-04 13:49:29 +01:00
bors[bot] ef51f35840
Merge #2240 
2240: Don't reset zoom when using timeline in demo r=heinrich5991 a=def-

Thanks to Lady Saavik for reporting

Co-authored-by: def <dennis@felsin9.de>
 2020-06-02 17:25:02 +00:00
def d06f1949c2 Stop playing map sound when demo player is paused 
Noticed on Shooting Range map
 2020-06-02 13:47:05 +02:00
def 690fb852df Don't reset client on demo menu events 2020-06-02 13:22:00 +02:00
trml e5d348975b Avoid client crash on predicted explosion 2020-06-01 21:23:18 +02:00
12pm e4b3559c95 add cl_nameplates_ids 2020-05-30 12:37:42 +02:00
heinrich5991 209726552b Remove unused Sv_PlayerTime game message 2020-05-27 20:03:11 +02:00
heinrich5991 0d7872c79e Send DDNet version early in the connection process 
This gets rid of the problem that we don't know whether we should send
full snapshots to clients because they haven't told us about them being
DDNet yet.
 2020-05-22 17:58:41 +02:00
MikiGamer d5c5235c18 Changes 2020-05-19 17:13:34 +02:00
MikiGamer 95c419d684 BlockWorlds Entities 2020-05-19 16:49:28 +02:00
def 21c4df0771 Fix crash in prediction when touching switch tile with number 0 (fixes #2182) 
Just took the same code that we have on server side already
 2020-05-17 08:52:21 +02:00
bors[bot] 2649fb5234
Merge #2161 
2161: Small prediction fixes/update r=def- a=trml

I looked through the latest changes in the server code, and made some updates to the prediction with it. This includes the hammer-out-of-freeze server fix and a small fix for stopper prediction. Also cleaned up some code, and fixed predicted smoke-trails slightly so they don't go through walls in certain cases.

Co-authored-by: trml <trml@users.noreply.github.com>
 2020-05-07 07:30:03 +00:00
bors[bot] 295a479db5
Merge #2164 
2164: Fix empty sound (fixes #2163) r=heinrich5991 a=def-

The problem was that the string is empty after going through the trim, thus the main displaying loop doesn't run, but the sound still does. Verified that it works.

Co-authored-by: def <dennis@felsin9.de>
 2020-05-06 08:48:24 +00:00
def 741c97ccc7 Fix empty sound (fixes #2163) 
The problem was that the string is empty after going through the trim,
thus the main displaying loop doesn't run, but the sound still does.
 2020-05-06 08:15:23 +02:00
trml f6c44468de Another update, fix typo 2020-05-03 00:00:27 +02:00
trml cda99668c7 Fix antiping smoketrails 2020-05-02 18:52:09 +02:00
trml 47cafe6d6b Remove unused code 2020-05-02 18:52:09 +02:00
trml eb1bacb969 Update prediction with latest server physics 2020-05-02 18:52:04 +02:00
trml bcf9e003d7 Make dummy hold fire with cl_dummy_hammer 1 2020-05-01 16:23:42 +02:00
def 76eda61c99 cl_showchat 2 to always show large chat area (fixes #2153) 2020-04-28 22:35:56 +02:00
trml fe1a7fb1e0 Predict directinput order for dummy and main 2020-04-19 12:50:37 +02:00
trml cae7fad901 Use freeze end tick in prediction 2020-04-19 12:50:06 +02:00
trml a4a0b6e9ed Add config flag for dummy prediction and fix compilation 2020-04-18 23:28:40 +02:00
trml 99baf219d0 Revert "Remove the dummy prediction" 
This reverts commit 681f30950c.
 2020-04-18 22:16:25 +02:00