Commit graph

14677 commits

Author SHA1 Message Date
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
bors[bot] 4c5e96b2a3
Merge #2406
2406: Add ; when writing save into file r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-06-29 11:59:21 +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
heinrich5991 741c3a705e Revert "Fix str_format on mingw"
This reverts commit a9f6d3716c.
2020-06-29 13:48:51 +02:00
def ab22bb9665 Add ; when writing save into file 2020-06-29 11:08:51 +02:00
def d430fe2a30 Stripped SDL2 libs 2020-06-29 10:50:08 +02:00
def 8b0a4592bb Add missing SDL2.lib files 2020-06-29 10:46:19 +02:00
def 32429946da Update ddnet-libs with SDL 2.0.8 from MinGW 2020-06-29 10:18:47 +02:00
def 2af5001fe7 Version 14.0.3 2020-06-29 08:47:58 +02:00
def 6aca082119 Downgrade SDL2 to 2.0.8 again (fixes #2369) 2020-06-29 08:47:15 +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
bors[bot] 66efbfd9e4
Merge #2399
2399: Append 14.0.2 version into appdata r=def- a=ElXreno



Co-authored-by: ElXreno <elxreno@gmail.com>
2020-06-28 08:55:17 +00:00
ElXreno c8d097a020
Append 14.0.2 version into appdata 2020-06-28 11:43:43 +03:00
def cb7a8a3f5e Add gui_icons.png by Ravie 2020-06-28 09:38:39 +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
bors[bot] a48f71c854
Merge #2386
2386: localization fixes r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-06-27 20:24:46 +00:00
def 6635ce210a Switch order in gui_icons.png, add icon by barsik 2020-06-27 19:44:57 +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
bors[bot] 3ada0111b0
Merge #2395
2395: Fix color toggles r=def- a=Learath2

Missed this due to the the ability of calling `.Pack()` with default arguments :/

Co-authored-by: Learath <learath2@gmail.com>
2020-06-27 12:52:19 +00:00
Learath af2e02ccd2 Fix color toggles 2020-06-27 15:12:53 +03:00
def 7d1e67eb44 Fix first lines to start with # 2020-06-27 12:58:55 +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 2d581e0612 copy_fix: Don't generate comment line, just add missing translations at the end 2020-06-26 23:28:44 +02:00
def 3278002ac7 Remove comments in language files 2020-06-26 23:27:49 +02:00
def a56fbbc340 Update ddnet-libs 2020-06-26 21:03:25 +02:00
def 0a8a1b078b Localization: Print line number where failure occured 2020-06-26 18:42:56 +02:00
def a1f9222f50 Add German translation 2020-06-26 18:42:46 +02:00
def d77bf206dc Regenerate language files 2020-06-26 18:38:41 +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 bd11e7ee95 Fix reading old ghosts (fixes #2382) 2020-06-26 15:17:38 +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
bors[bot] 98a5324a42
Merge #2381
2381: Update polish translation by TortiLeq r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-06-26 12:38:02 +00:00
Zwelf ef2f306067 Fix teehistorian debug output for save/load 2020-06-26 14:37:14 +02:00
def 853d312436 Update polish translation by TortiLeq 2020-06-26 13:22:30 +02:00
def 186f917cc9 Update copyright 2020-06-26 13:16:41 +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