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

6232 commits

Author SHA1 Message Date
Zwelf 0c0fab5e66 Moved include from teamscore.h to teamscore.cpp 2020-07-02 22:11:43 +02:00
bors[bot] 7266bcad78
Merge #2444 
2444: Fix erroneous "unable to find all characters" message r=heinrich5991 a=Zwelf

Fixes #2443 

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-02 15:07:55 +00:00
Zwelf 17bb4522fc Fix erroneous "unable to find all characters" message 2020-07-02 16:34:36 +02:00
Zwelf ab9cdc294d Reset all input after rescuing 2020-07-02 16:24:23 +02:00
Zwelf 538de72c94 Don't load movement and pause state when rescuing 2020-07-02 14:06:18 +02:00
Zwelf 4388579d48 Fix reenabling practice mode after kill on solo server 2020-07-02 11:13:07 +02:00
Learath f9bf6cf354 Spam protection on /rank 2020-07-01 23:53:25 +03:00
bors[bot] 6da2f117cf
Merge #2425 
2425: Fix doors not resetting on restart on solo server r=heinrich5991 a=Zwelf



Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-01 16:10:34 +00:00
bors[bot] 98779776e5
Merge #2424 
2424:  Keep hook when loading  r=heinrich5991 a=Zwelf

Solves issue discussed in #2374. Also keeps direction and jump, which is evaluated when player is in /pause. Fire could be deleted, as it does not affect game play in any way.

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-07-01 16:01:25 +00:00
Zwelf bff8e90319 Fix loading team sets teamstate to TEAMSTATE_OPEN 2020-07-01 09:03:16 +02:00
heinrich5991 cdd715fd53 Add smoothing of camera zoom using a cubic polynomial 2020-07-01 00:19:17 +02:00
Zwelf 9e43f8d483 Add CCharacter::m_ReloadTimer to save 2020-06-30 23:49:40 +02:00
Dennis Felsing ac42861d1b
Merge pull request #2427 from def-/pr-14.0.4 
Version 14.1
 2020-06-30 22:44:20 +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
def 1b17c25fda Version 14.1 2020-06-30 21:32:25 +02:00
Zwelf 6f9dd48401 Fix doors not resetting on restart on solo server 2020-06-30 20:42:01 +02:00
Zwelf b99bbccd24 Revert "Revert "Fix /save on solo server"" 
This reverts commit 59a7e1f187.
 2020-06-30 20:22:17 +02:00
def 3de5b3a12f Revert "Revert "Explain why the randomly generated save code is used"" 
This reverts commit 4476ec39f9.
 2020-06-30 20:18:58 +02:00
def 4476ec39f9 Revert "Explain why the randomly generated save code is used" 
This reverts commit 0d887e8b37.
 2020-06-30 20:15:50 +02:00
def d10cb17e54 Revert "Restore old /save behavior" 
This reverts commit d169bb1b52.
 2020-06-30 20:15:46 +02:00
Zwelf 839fd08d6a Check if player still in team when loading hook 2020-06-30 20:13:45 +02:00
Edgar 3578c74667
new defaults use logistic curve 2020-06-30 19:06:29 +02:00
def 59a7e1f187 Revert "Fix /save on solo server" 
This reverts commit 506602d472.
 2020-06-30 18:41:22 +02:00
bors[bot] 5a41318cbd
Merge #2423 
2423: Only SendChat to clients that exist. Initialize m_Sixup anyway r=def- a=Learath2

#2421 

Co-authored-by: Learath <learath2@gmail.com>
 2020-06-30 16:25:47 +00:00
Zwelf 7427e41959 Keep hook when loading 2020-06-30 18:09:26 +02:00
Learath 8d8f1d7208 Only SendChat to clients that exist. Initialize m_Sixup anyway 2020-06-30 18:58:44 +03:00
Zwelf f2b5abb1fb Keep weak/strong when reloading 2020-06-30 17:52:55 +02:00
Zwelf 949d710597 Fix wrong indention 2020-06-30 17:52:55 +02:00
Zwelf c9f8cc99b1 Stop searching when player was found 2020-06-30 17:52:55 +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
bors[bot] 3e77272133
Merge #2417 
2417: Fix out of bounds read in CPlayer::Snap with IsSixup (fixes #2416) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-30 12:37:37 +00:00
bors[bot] 3f61babae3
Merge #2418 
2418: Clean and fix style on character snap r=def- a=edg-l



Co-authored-by: Edgar <git@edgarluque.com>
 2020-06-30 12:19:34 +00:00
Edgar 5c45f0876b
Clean and fix style on character snap 2020-06-30 14:17:27 +02:00
def 49ba9078f5 Fix out of bounds read in CPlayer::Snap with IsSixup (fixes #2416) 2020-06-30 14:08:55 +02: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 ead2422dcf Fix practice on solo servers 2020-06-29 19:34:22 +02:00
Zwelf 506602d472 Fix /save on solo server 
Fixes #2404
 2020-06-29 19:34:21 +02: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] 87407be1c5
Merge #2408 
2408: Don't use %ll format r=def- a=heinrich5991

It's not supported in MSVS. Fix #2407.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-06-29 12:17:44 +00: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
heinrich5991 efc4a8abf7 Don't use %ll format 
It's not supported in MSVS. Fix #2407.
 2020-06-29 13:57:08 +02:00
def ab22bb9665 Add ; when writing save into file 2020-06-29 11:08:51 +02:00
def 2af5001fe7 Version 14.0.3 2020-06-29 08:47:58 +02:00
def 6455689e32 Super team can't be saved/loaded 
Thanks to Lady Saavik for report
 2020-06-29 08:46:34 +02: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
bors[bot] dcd0976159
Merge #2397 
2397: Update game id when updating team score r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-27 20:47:00 +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 1c09798504 Update game id when updating team score 2020-06-27 22:30:14 +02: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 0a8a1b078b Localization: Print line number where failure occured 2020-06-26 18:42:56 +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 1a87abe96b Version 14.0.2 2020-06-26 15:20:07 +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
bors[bot] ec472a9d0a
Merge #2298 
2298: Log save/load in teehistorian r=heinrich5991 a=Zwelf

Including tests

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-06-26 12:45:08 +00:00
Zwelf ef2f306067 Fix teehistorian debug output for save/load 2020-06-26 14:37:14 +02:00
bors[bot] c414a8a624
Merge #2379 
2379: Fix unused translations r=def- a=3edcxzaq1

Fix so that "Connect Dummy" and "Disconnect Dummy" follows language file

Co-authored-by: sven <sven@rx.lan>
Co-authored-by: 3edcxzaq1 <66034590+3edcxzaq1@users.noreply.github.com>
 2020-06-26 09:19:45 +00:00
3edcxzaq1 4e7b534622
Update menus_ingame.cpp 2020-06-26 11:13:55 +02:00
def 42ab24794f Remove unused cl_show_spec_tee config (fixes #2378) 2020-06-26 08:07:34 +02:00
sven 9d0bae9769 Fix unused translation 2020-06-26 02:49:35 +02:00
def d907ec3c11 Version 14.0.1 
Waiting for #2363, #2358, #2356, #2331
 2020-06-26 00:03:04 +02:00
Zwelf d8aab366fc Log save/load in teehistorian 2020-06-26 00:01:12 +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 431d824cf1 Revert "Fix wrong usage of bitwise-or which is resulting in an always true" 
This reverts commit 1b6ff929a2.
 2020-06-25 22:00:08 +02:00
bors[bot] 00eb2044b2
Merge #2374 
2374: Restore old /save behavior r=def- a=Zwelf

Fixes #2362, supersedes #2367 

I didn't change the /save message. There are already two different: "Use '/load %s' on %s to continue" and "Use '/load %s' to continue".
I think it would be better to add a NetMessage, this could also solve the problem of saving which team members were in the team.

>  I guess this can't be used to cheat anything?

Only if an instant rehook is necessary. Might be useful for rehooking an edge hook (but you still have to aim).

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-06-25 19:43:30 +00:00
Zwelf 0d887e8b37 Explain why the randomly generated save code is used 
to the player when the database connection failed
 2020-06-25 20:44:00 +02:00
Zwelf d169bb1b52 Restore old /save behavior 2020-06-25 20:42:48 +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
bors[bot] 97c7525438
Merge #2368 
2368: Make spec character rendering a bit cleaner r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-06-25 16:18:20 +00:00
heinrich5991 8c095b2727 Make spec character rendering a bit cleaner 2020-06-25 14:56:23 +02:00
bors[bot] df66d83a04
Merge #2356 
2356: Make game less dependend on score backend r=heinrich5991 a=Zwelf

Behavior change:
* `sv_save_worse_scores` is respected on file based servers

Mainly a clean up after #2247, but helps #2298 too

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-06-25 10:40:02 +00:00
Zwelf a8abc3937b Make game less dependend on score backend 2020-06-25 12:36:01 +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
bors[bot] bad43e77a0
Merge #2354 
2354: Set rescue tee immediately after loading (fixes #2248) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-06-24 21:37:47 +00:00
Arda Demir 1b6ff929a2 Fix wrong usage of bitwise-or which is resulting in an always true 2020-06-24 22:53:09 +03:00
bors[bot] 677d92aa32
Merge #2353 
2353: Fix /spec rendering r=def- a=edg-l

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

Co-authored-by: Edgar <git@edgarluque.com>
 2020-06-24 19:29:29 +00:00
bors[bot] bd2cb5a8bd
Merge #2352 
2352: Fix SendChatTarget demo recording r=def- a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
 2020-06-24 19:23:23 +00:00
def 3530d0ae32 Set rescue tee immediately after loading (fixes #2248) 2020-06-24 21:19:46 +02:00
Edgar b33180ae77
fix /spec rendering 2020-06-24 19:01:01 +02:00
Learath 581904d849 Fix SendChatTarget demo recording 2020-06-24 19:22:41 +03:00
bors[bot] cbde23aba9
Merge #2305 
2305: Version 14.0 r=def- a=def-

Waiting for https://github.com/ddnet/ddnet/pull/2303 https://github.com/ddnet/ddnet/pull/2301 https://github.com/ddnet/ddnet/pull/2296 https://github.com/ddnet/ddnet/pull/2295 https://github.com/ddnet/ddnet/pull/2294 https://github.com/ddnet/ddnet/pull/2280 https://github.com/ddnet/ddnet/pull/2279 https://github.com/ddnet/ddnet/pull/2242 and probably some sixup fixes by Learath2 :)

Co-authored-by: def <dennis@felsin9.de>
 2020-06-24 16:20:53 +00:00
Learath e122462ae8 Ugly fix for SendChatTarget(-1...). Closes #2337 2020-06-24 18:54:27 +03:00
Learath b6fb304508 Name change hack for 0.7. Close #2330 2020-06-24 18:14:15 +03:00