Commit graph

12876 commits

Author SHA1 Message Date
def e4023cb18b Dynamic Camera button: Use g_Config.m_ClDyncam as pID 2020-09-29 08:25:38 +02:00
Dennis Felsing 16f965a0e6
Merge pull request #2940 from def-/pr-empty-lines
Fix empty lines in chat (fixes #1835)
2020-09-29 07:51:12 +02:00
Dennis Felsing b88b33cea4
Merge pull request #2928 from Jupeyy/pr_multiple_pngs
Add changeable assets
2020-09-29 07:46:43 +02:00
def 18ad5b58c0 Fix empty lines in chat (fixes #1835) 2020-09-28 23:25:04 +02:00
Jupeyy 0e71a47708 Add customization 2020-09-28 23:21:32 +02:00
Fireball d06e956739 Don't change SpectatorID when not spectating, simplify code
This prevents a confusing situation where /pause and /spec lead to spectating yourself.
This happens if you accidentally pressed spectate_next key when playing.
2020-09-28 19:55:47 +01:00
bors[bot] 9d19770a10
Merge #2933
2933: Handle rcon cmd completion properly with dummy r=heinrich5991 a=def-

Only active player received them, reconnecting dummy a few times lead to
duplicate entries in tab completion. Now only main player is considered
for the completion.

as reported by Betz@lel-$h@l0m on Discord

Co-authored-by: def <dennis@felsin9.de>
2020-09-28 16:32:53 +00:00
bors[bot] 616c0e8ad8
Merge #2889
2889: Allow specifying texture LOD BIAS r=def- a=Jupeyy

For Ravie, and others that want the old renderer opengl 3.3 feeling back xd

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-28 16:01:56 +00:00
bors[bot] 1b07ac9e4a
Merge #2939
2939: print out modifiers when unbinding r=def- a=plsplsplslol



Co-authored-by: plsplsplslol <alpootagpro@gmail.com>
2020-09-28 05:58:17 +00:00
plsplsplslol 236015c474 print out modifiers when unbinding 2020-09-27 17:38:50 -07:00
bors[bot] af958704ca
Merge #2887
2887: Join identical chat lines to prevent spam r=def- a=edg-l

![image](https://user-images.githubusercontent.com/15859336/93714967-6f412e00-fb66-11ea-9b56-2ff2c053b8c1.png)

May fix https://github.com/ddnet/ddnet/issues/259

Needs a bit more testing

Co-authored-by: Edgar <git@edgarluque.com>
2020-09-27 19:28:55 +00:00
bors[bot] dbf5d3f0aa
Merge #2938
2938: Fix auto rules scrollbar bugs r=def- a=edg-l

![image](https://user-images.githubusercontent.com/15859336/94368701-e71ed380-00e5-11eb-8ba5-d4923cc621d1.png)

This pr also doubles window size.

Co-authored-by: Edgar <git@edgarluque.com>
2020-09-27 19:21:59 +00:00
Edgar 5391ff8cc9
fix auto rules scrollbar bugs 2020-09-27 17:20:41 +02:00
Edgar 12161cc55b
change and fix how counter is displayed 2020-09-27 13:28:50 +02:00
def 2deb8aa380 Fix Windows compilation 2020-09-27 11:05:54 +02:00
Dennis Felsing cb2fa0800f
Merge pull request #2934 from def-/pr-show_ips2
Fix show_ips on non-SQL servers
2020-09-27 10:38:37 +02:00
bors[bot] 6e18471a86
Merge #2936
2936: Fix cutting of one character when showing ips in rcon r=def- a=Zwelf

The buffer size passed to `str_append` includes the null terminator.

Co-authored-by: Zwelf <zwelf@strct.cc>
2020-09-27 08:23:02 +00:00
Zwelf cb2c1d2144 Fix cutting of one character when showing ips in rcon
The buffer size passed to `str_append` includes the null terminator.
2020-09-27 10:15:41 +02:00
def b0b47e1286 Fix show_ips on non-SQL servers
Mistake was introduced in 7c31a15c93

We didn't notice since official servers are SQL, except Block servers,
and we just started moderating them a bit.
2020-09-27 01:16:18 +02:00
Edgar 1d8a20f17a join multiple identic chat lines 2020-09-27 00:39:16 +02:00
Jupeyy 6a1cf963d1 try trilinear filtering 2020-09-27 00:37:43 +02:00
Jupeyy c951fc3ee4 Allow specifying texture LOD BIAS 2020-09-27 00:37:42 +02:00
def 25fe5471c5 Handle rcon cmds properly with dummy
Only active player received them, reconnecting dummy a few times lead to
duplicate entries in tab completion. Now only main player is considered
for the completion.

as reported by Betz@lel-$h@l0m on Discord
2020-09-27 00:31:53 +02:00
bors[bot] 6bb8cda483
Merge #2926
2926: clang-format entire repo r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-09-26 22:10:58 +00:00
def b178c7c74a Make sure headers compile standalone
Not planning to do this automatically, but at least cleaning it up once
provides some benefit. Every header should include what it uses.

$ for i in src/**/*.h; do j=${i#"src/"}; echo $j; echo "#include <$j>\nint main() { return 0; }" | /usr/bin/c++ -DCONF_OPENSSL -DCONF_SQL -DCONF_VIDEORECORDER -DCONF_WAVPACK_CLOSE_FILE -DCONF_WAVPACK_OPEN_FILE_INPUT_EX -DGAME_RELEASE_VERSION=\"15.0.5\" -DGLEW_STATIC -D_FORTIFY_SOURCE=2 -I/usr/include/freetype2 -I/usr/include/opus -I/usr/include/SDL2 -I/usr/include/wavpack -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -Isrc -I/usr/include/mysql -I/home/deen/sys/include/ -O2 -g -DNDEBUG -fdiagnostics-color=always -fstack-protector-all -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wformat=2 -Wno-nullability-completeness -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -std=gnu++11 -o /dev/null -x c++ -; done

Ignored: tuning.h, variables.h, config_common.h, mapitems_ex_types.h, mapbugs_list.h, protocol7.h, teehistorian_ex_chunks.h, protocol_ex_msgs.h, config.h, config_variables.h, external, keynames.h
2020-09-26 21:50:27 +02:00
def ee8872fb75 Add formatting-revs.txt
to filter out automatic clang-formats for better git blame information,
for example:

$ git blame --ignore-revs-file formatting-revs.txt src/antibot/antibot_null.cpp

You can also set it in your .git/config:

[blame]
    ignoreRevsFile = formatting-revs.txt
2020-09-26 21:50:27 +02:00
def 3be8a592e5 Run clang-format
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:

$ python scripts/fix_style.py
2020-09-26 21:50:15 +02:00
def 2e8e19290e fix_style.py: Ignore generated key headers 2020-09-26 21:50:13 +02:00
heinrich5991 678b2b15c3 Change fix_style.py script to unconditionally format everything 2020-09-26 21:41:24 +02:00
def 2d8a1ee2b7 Make fix_style.py look at files, not lines 2020-09-26 21:41:20 +02:00
def 0bac9f0de8 Manual preparation for cleaner clang-format
Also include what you use explicitly
2020-09-26 21:41:01 +02:00
bors[bot] 50b8771d04
Merge #2931
2931: Only auto dilate for transparent images r=def- a=Jupeyy

As reported by mind

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2020-09-26 19:37:32 +00:00
Dennis Felsing a5cf31040b
Merge pull request #2929 from def-/pr-pure
Remove pure server filters, add space for Countries/Types
2020-09-26 21:36:19 +02:00
def f8fc11b880 clang-format 2020-09-26 21:33:36 +02:00
def f74cc43f4c Remove pure server filters, add space for Countries/Types
Not so relevant anymore
2020-09-26 21:33:25 +02:00
Jupeyy c69c765507 Only auto dilate for transparent images 2020-09-26 18:57:19 +02:00
bors[bot] 87e86834c3
Merge #2914
2914: After initialization: Agressively try to grab window again r=heinrich5991 a=def-

Since some users on Windows report window not being initially focussed. Reincarnation of https://github.com/ddnet/ddnet/pull/2897 but not for OSX

I think this doesn't hurt.

Co-authored-by: def <dennis@felsin9.de>
2020-09-26 13:02:53 +00:00
def dcfa752e61 After initialization: Agressively try to grab window again
Since some users on Windows report window not being initially focussed
2020-09-26 09:09:05 +02:00
bors[bot] fd610e517b
Merge #2903
2903: Remove non-free skins by Moby Dog (fixes #2547) r=def- a=yangfl



Co-authored-by: yangfl <yangfl@users.noreply.github.com>
2020-09-26 07:04:18 +00:00
bors[bot] 8b399ba1be
Merge #2861
2861: Implement censoring words on server r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-09-25 23:07:15 +00:00
bors[bot] c6ade7eeeb
Merge #2917
2917: Create ALLOW_X_SKINS game info flag r=heinrich5991 a=def-

To allow server to set any x_ prefixed skin and client won't filter it
out. As requested by Pure_luck for his mod to show players as tanks,
walls, etc. Won't be enabled on DDNet-Servers, thus such skins can be
added where a server modification wants to fine-control what skins are
allowed and can enforce such skins.

Co-authored-by: def <dennis@felsin9.de>
2020-09-25 21:22:38 +00:00
def f2386d5c02 Address reviewer comments 2020-09-25 22:25:45 +02:00
bors[bot] 5f6ba345b8
Merge #2923 #2924
2923: Don't str_copy into string itself r=Learath2 a=def-

when reconnecting after server was full:

[2020-09-25 15:39:34][client]: offline error='This server is full'
Source and destination overlap in strncpy(0xd3328e2, 0xd3328e2, 255)
   at 0x483DFDC: strncpy (vg_replace_strmem.c:550)
   by 0x249180: str_copy (system.c:2328)
   by 0x27E1F5: CClient::Connect(char const*, char const*) (client.cpp:707)
   by 0x287864: CClient::Update() (client.cpp:2914)
   by 0x28891B: CClient::Run() (client.cpp:3216)
   by 0x28EDEC: main (client.cpp:4309)

2924: Fix Score/Time alignment r=def- a=Learath2

![screenshot_2020-09-25_16-52-30](https://user-images.githubusercontent.com/490500/94275676-e81dfc80-ff4f-11ea-9f21-dbf5d1cf73a9.png)

Also adds hours to the time

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: Learath <learath2@gmail.com>
2020-09-25 14:55:51 +00:00
bors[bot] f63f693656
Merge #2925
2925: bugfix: laser_damage was removed from tunes of 0.7 protocol r=def- a=pure-luck-999

Before:

![image](https://user-images.githubusercontent.com/68428243/94279573-f7ec0f80-ff54-11ea-852f-f6a2a195f935.png)

After:

![image](https://user-images.githubusercontent.com/68428243/94279452-c96e3480-ff54-11ea-8af6-d12ef6b86312.png)


Co-authored-by: Pure luck <pure_luck@fastmail.com>
2020-09-25 14:49:13 +00:00
Learath 32c3cba4fa Fix scoreboard alignment issues 2020-09-25 17:44:37 +03:00
Pure luck 3cd0f30d55 laser_damage bugfix styling 2020-09-25 17:41:17 +03:00
Pure luck e7d830a01e bugfix: laser_damage was removed from tunes of 0.7 protocol 2020-09-25 17:25:59 +03:00
def 8cdc4066ff Don't str_copy into string itself
when reconnecting after server was full:

[2020-09-25 15:39:34][client]: offline error='This server is full'
Source and destination overlap in strncpy(0xd3328e2, 0xd3328e2, 255)
   at 0x483DFDC: strncpy (vg_replace_strmem.c:550)
   by 0x249180: str_copy (system.c:2328)
   by 0x27E1F5: CClient::Connect(char const*, char const*) (client.cpp:707)
   by 0x287864: CClient::Update() (client.cpp:2914)
   by 0x28891B: CClient::Run() (client.cpp:3216)
   by 0x28EDEC: main (client.cpp:4309)
2020-09-25 15:43:34 +02:00
bors[bot] 32c77faecc
Merge #2920
2920: stop disabling textinput during connecting r=def- a=TsFreddie

closes #2919 

Co-authored-by: TsFreddie <tsfreddiewang@gmail.com>
2020-09-25 05:51:32 +00:00
TsFreddie 712e9e90c0 stop disabling textinput during connecting 2020-09-25 01:08:48 +01:00