Commit graph

9555 commits

Author SHA1 Message Date
Dennis Felsing 0498df2508 Update localizations (Thanks to Cellegen for report)
- Remove duplicate laser entries
- Update menus_settings.cpp comment for scripts
- Update instructions for scripts
- Run script to get updated localizations
2019-12-02 09:09:01 +01:00
bors[bot] 33d88f647c
Merge #1974
1974: more typesafty in the graphics. introduced the IGraphics::CTextureHandle r=def- a=ChillerDragon

Edited by @ChillerDragon to fit in ddnet
(cherry picked from commit cb95e8dfe8)

Co-authored-by: Magnus Auvinen <magnus.auvinen@gmail.com>
2019-11-27 17:55:45 +00:00
bors[bot] d589f266dc
Merge #1973
1973: Rename rifle to laser r=def- a=ChillerDragon

This makes it easier to copy code from/to 0.7
23df3c609e

For the user only the rcon command to give/remove ``laser``/``unlaser`` changes.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-11-27 17:36:03 +00:00
Magnus Auvinen 6a6a5f00c9 more typesafty in the graphics. introduced the IGraphics::CTextureHandle
Edited by @ChillerDragon to fit in ddnet
(cherry picked from commit cb95e8dfe8)
2019-11-22 18:08:37 +01:00
ChillerDragon 96c9b1ab73 Rename rifle to laser
This makes it easier to copy code from/to 0.7
23df3c609e
2019-11-22 15:37:18 +01:00
bors[bot] c0eb81f603
Merge #1971
1971: Fix a few names in popups r=Learath2 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-11-22 12:26:33 +00:00
ChillerDragon 227a223c32 Fix a few names in popups 2019-11-22 12:28:34 +01:00
bors[bot] f7b7c3afb0
Merge #1970
1970: Save selected UI settings page r=def- a=ChillerDragon

Inspired by @SushiTee's teeworlds commit:
65cc8f7fd9

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-11-17 18:33:19 +00:00
ChillerDragon 0f76c89d8a Save selected UI settings page
Inspired by @SushiTee's teeworlds commit:
65cc8f7fd9
2019-11-17 18:11:33 +01:00
bors[bot] c26ac8af86
Merge #1965
1965: Use an enum for netclient indices r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-11-11 16:55:17 +00:00
Dennis Felsing 727fa3dbba
Merge pull request #1964 from trml/pr_optimize_evolve
Optimize character evolve
2019-11-10 19:25:23 +01:00
ChillerDragon 9c3447dd17 Use an enum for netclient indices 2019-11-10 13:46:27 +01:00
trml 3986925761 Optimize character evolve 2019-11-09 22:49:53 +01:00
bors[bot] 501f1061a9
Merge #1961
1961: Add help text for negative parameter for worst players r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2019-11-06 11:21:33 +00:00
def 975a0bc9b3 Add help text for negative parameter for worst players 2019-11-05 18:28:34 +01:00
bors[bot] 4e697ee738
Merge #1960
1960: Fix typo 'user' -> 'use' r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-11-05 08:19:32 +00:00
ChillerDragon 1a957f0abe Fix typo 'user' -> 'use' 2019-11-05 09:16:54 +01:00
bors[bot] c0b3604fa2
Merge #1959
1959: Expire server info on connected/drop events r=Learath2 a=def-



Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2019-11-04 15:22:56 +00:00
Dennis Felsing 785ec3d345 Expire server info on connected/drop events 2019-11-04 15:45:55 +01:00
Learath2 c2bcd3bd4d Fix bug 2019-11-04 01:06:52 +01:00
bors[bot] 0de012572b
Merge #1955
1955: Cache serverinfo responses r=def- a=Learath2

I'm not sure I like it but it works

Co-authored-by: Learath2 <learath2@gmail.com>
2019-11-03 20:09:21 +00:00
Learath2 c0b0f48d16 Oops 2019-11-03 20:58:35 +01:00
bors[bot] 7d07b311fd
Merge #1956
1956: Fix uninitialized variable r=Learath2 a=def-

As reported by valgrind --tool=memcheck:

==344082== Conditional jump or move depends on uninitialised value(s)
==344082==    at 0x483BC85: strlen (vg_replace_strmem.c:461)
==344082==    by 0x5B9E61D: __vfprintf_internal (in /usr/lib/libc-2.30.so)
==344082==    by 0x5BB0409: __vsnprintf_internal (in /usr/lib/libc-2.30.so)
==344082==    by 0x222AE7: str_format (system.c:2350)
==344082==    by 0x2196AB: CStorage::GetPath(int, char const*, char*, unsigned int) (storage.cpp:274)
==344082==    by 0x219DDD: CStorage::RemoveFile(char const*, int) (storage.cpp:409)
==344082==    by 0x255D3C: CClient::DemoRecorder_Stop(int, bool) (client.cpp:3546)
==344082==    by 0x2569E7: CClient::ConchainReplays(IConsole::IResult*, void*, void (*)(IConsole::IResult*, void*), void*) (client.cpp:3727)
==344082==    by 0x1F4659: CConsole::Con_Chain(IConsole::IResult*, void*) (console.cpp:1169)
==344082==    by 0x1E4C2C: CConsole::ExecuteLineStroked(int, char const*, int, bool) (console.cpp:504)
==344082==    by 0x1E4F37: CConsole::ExecuteLine(char const*, int, bool) (console.cpp:558)
==344082==    by 0x1E5240: CConsole::ExecuteFile(char const*, int, bool, int) (console.cpp:604)

Co-authored-by: def <dennis@felsin9.de>
2019-11-03 19:58:09 +00:00
def fdaafea6b5 Also init m_aClients[*].m_Latency
as reported by valgrind --tool=memcheck:

==376722== Conditional jump or move depends on uninitialised value(s)
==376722==    at 0x1CDBDB: int maximum<int>(int, int) (math.h:79)
==376722==    by 0x216A46: CPlayer::Tick() (player.cpp:174)
==376722==    by 0x1FB308: CGameContext::OnTick() (gamecontext.cpp:658)
==376722==    by 0x1C60AF: CServer::Run() (server.cpp:2046)
==376722==    by 0x1CB099: main (server.cpp:3040)
==376722==
==376722== Conditional jump or move depends on uninitialised value(s)
==376722==    at 0x183F27: int minimum<int>(int, int) (math.h:77)
==376722==    by 0x216A65: CPlayer::Tick() (player.cpp:175)
==376722==    by 0x1FB308: CGameContext::OnTick() (gamecontext.cpp:658)
==376722==    by 0x1C60AF: CServer::Run() (server.cpp:2046)
==376722==    by 0x1CB099: main (server.cpp:3040)
2019-11-03 18:54:25 +01:00
bors[bot] f0245b1723
Merge #1957
1957: Don't access m_aClients wiht invalid ClientID r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
2019-11-03 17:36:26 +00:00
Learath2 c4d18118c1 Use automatic storage for the data 2019-11-03 18:31:05 +01:00
def f9598c8ba8 Don't access m_aClients wiht invalid ClientID 2019-11-03 18:10:30 +01:00
def 258eaf5a98 Fix uninitialized variable
As reported by valgrind --tool=memcheck:

[201==344082== Conditional jump or move depends on uninitialised value(s)
==344082==    at 0x483BC85: strlen (vg_replace_strmem.c:461)
==344082==    by 0x5B9E61D: __vfprintf_internal (in /usr/lib/libc-2.30.so)
==344082==    by 0x5BB0409: __vsnprintf_internal (in /usr/lib/libc-2.30.so)
==344082==    by 0x222AE7: str_format (system.c:2350)
==344082==    by 0x2196AB: CStorage::GetPath(int, char const*, char*, unsigned int) (storage.cpp:274)
==344082==    by 0x219DDD: CStorage::RemoveFile(char const*, int) (storage.cpp:409)
==344082==    by 0x255D3C: CClient::DemoRecorder_Stop(int, bool) (client.cpp:3546)
==344082==    by 0x2569E7: CClient::ConchainReplays(IConsole::IResult*, void*, void (*)(IConsole::IResult*, void*), void*) (client.cpp:3727)
==344082==    by 0x1F4659: CConsole::Con_Chain(IConsole::IResult*, void*) (console.cpp:1169)
==344082==    by 0x1E4C2C: CConsole::ExecuteLineStroked(int, char const*, int, bool) (console.cpp:504)
==344082==    by 0x1E4F37: CConsole::ExecuteLine(char const*, int, bool) (console.cpp:558)
==344082==    by 0x1E5240: CConsole::ExecuteFile(char const*, int, bool, int) (console.cpp:604)
2019-11-03 18:05:42 +01:00
Learath2 52cca29cd9 Use a std::list, improve variable naming 2019-11-03 15:39:32 +01:00
Learath2 3d495a9936 Initialize variables 2019-11-03 01:53:50 +01:00
Learath2 79e4651d5b Only update serverinfo when needed 2019-11-03 01:07:10 +01:00
Learath2 7f0589bff7 Cache serverinfo responses 2019-11-03 00:33:30 +01:00
Dennis Felsing 516bc98436 Version 12.7.3 2019-10-31 14:37:09 +01:00
Dennis Felsing 40f815a746
Merge pull request #1954 from WsYFU/master
change filter logic
2019-10-31 14:29:35 +01:00
WsYFU 1a16f5b5f0
Update serverbrowser.cpp 2019-10-31 16:16:35 +03:00
bors[bot] 45cfebc5e6
Merge #1953
1953: Fix crash when switch (un)deep number is 0 r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-10-27 15:32:20 +00:00
12pm f66dc75400 Fix crash when switch (un)deep number is 0 2019-10-27 14:28:40 +01:00
bors[bot] c3e4bbcb4b
Merge #1952
1952: Remove for loop in camera r=def- a=Ryozuki

I don't know if this makes it faster, probably not even noticable, but i like it more this way.

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
2019-10-27 12:06:55 +00:00
Ryozuki 2bf76aac67
remove for loop in camera 2019-10-27 13:04:08 +01:00
bors[bot] 4717b21844
Merge #1934
1934: repair the problem that class selector appear when demo playing r=def- a=sirius1242

I think this problem is solved, but this may be a little hack, I don't know the effect of this if-else condition.

![2019-10-12-12-27-ScreenShot2](https://user-images.githubusercontent.com/32300858/66710842-eac12980-edb2-11e9-8866-cf3a1348616b.png)


Co-authored-by: sirius <sirius.ustc@gmail.com>
2019-10-27 08:31:41 +00:00
bors[bot] dc6a2959be
Merge #1949
1949: Add cl_dummy_resetonswitch 2 r=Learath2 a=d3fault

Idea by @ChillerDragon :
Only resets the active tee. So if you hold right and switch your
dummy keeps walking. But if you switch back you don't have
to press right twice to walk again.

Fix #1854

Co-authored-by: d3fault <d3fault@d3fault.net>
2019-10-25 11:31:19 +00:00
bors[bot] 4fc907933e
Merge #1946
1946: Don't locally render your own dummy's afk emote. Other players will still see it r=Learath2 a=d3fault

Afk emote on your own dummy is pointless and annoying, esp on dummy maps.

Co-authored-by: d3fault <d3fault@d3fault.net>
2019-10-25 01:21:21 +00:00
d3fault ecf48a89e9 Add cl_dummy_resetonswitch 2
Idea by ChillerDragon:
Only resets the active tee. So if you hold right and switch your
dummy keeps walking. But if you switch back you don't have
to press right twice to walk again.

Fix #1854
2019-10-24 18:11:42 -07:00
bors[bot] 7cfcfbcfa2
Merge #1948
1948: Fix objc_msgSend() xcode11 error r=def- a=ChillerDragon

Fix by @heinrich5991
from the documentation of objc_msgSend in <objc/message.h>
```
/* Basic Messaging Primitives
 *
 * On some architectures, use objc_msgSend_stret for some struct return types.
 * On some architectures, use objc_msgSend_fpret for some float return types.
 * On some architectures, use objc_msgSend_fp2ret for some float return types.
 *
 * These functions must be cast to an appropriate function pointer type
 * before being called.
 */
OBJC_EXPORT void
objc_msgSend(void /* id self, SEL op, ... */ )
    OBJC_AVAILABLE(10.0, 2.0, 9.0, 1.0, 2.0);

OBJC_EXPORT void
objc_msgSendSuper(void /* struct objc_super *super, SEL op, ... */ )
    OBJC_AVAILABLE(10.0, 2.0, 9.0, 1.0, 2.0);
```

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-10-23 16:43:52 +00:00
ChillerDragon 47b41f35ff Fix objc_msgSend() xcode11 error
Fix by @heinrich5991
from the documentation of objc_msgSend in <objc/message.h>
```
/* Basic Messaging Primitives
 *
 * On some architectures, use objc_msgSend_stret for some struct return types.
 * On some architectures, use objc_msgSend_fpret for some float return types.
 * On some architectures, use objc_msgSend_fp2ret for some float return types.
 *
 * These functions must be cast to an appropriate function pointer type
 * before being called.
 */
OBJC_EXPORT void
objc_msgSend(void /* id self, SEL op, ... */ )
    OBJC_AVAILABLE(10.0, 2.0, 9.0, 1.0, 2.0);

OBJC_EXPORT void
objc_msgSendSuper(void /* struct objc_super *super, SEL op, ... */ )
    OBJC_AVAILABLE(10.0, 2.0, 9.0, 1.0, 2.0);
```
2019-10-23 17:23:51 +02:00
bors[bot] 3b5a085de7
Merge #1947
1947: Optimize CCollision::MoveBox to stop looping once velocity is 0 r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2019-10-22 20:42:21 +00:00
def 8702af19b5 Optimize CCollision::MoveBox to stop looping once velocity is 0 2019-10-22 13:48:05 +02:00
d3fault 2943eb0d4f Don't locally render your own dummy's afk emote. Other players will still see it 2019-10-19 21:03:08 -07:00
Dennis Felsing e5acf8b3ff
Merge pull request #1944 from def-/pr-array-bounds-false-positive
Disable warning for false positive
2019-10-16 16:33:47 +02:00
Dennis Felsing ae4f632bbd Disable warning for false positive 2019-10-16 14:33:58 +02:00