edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
9050 commits 1 branch 424 tags 415 MiB
Commit graph

9050 commits

This branch
This branch
All branches
Author SHA1 Message Date
Learath 5d4461981a Fix solo bug 2019-04-23 19:46:51 +03:00
bors[bot] 8c85d0d2a7 Merge #1661 
1661: Disable demo shortcuts in console r=def- a=12pm

As reported here: https://forum.ddnet.tw/viewtopic.php?f=3&p=67807#p67807

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-23 14:30:58 +00:00
12pm 808bb1303a Disable demo shortcuts in console 
As reported here: https://forum.ddnet.tw/viewtopic.php?f=3&p=67807#p67807
 2019-04-23 14:52:32 +02:00
def fc68f3add1 Version 12.2 2019-04-20 12:40:55 +02:00
Dennis Felsing b2a87664fb
Merge pull request #1650 from Ryozuki/pr_add_character_related_stuff 
Add all character flags to DDNet Network Character
 2019-04-20 12:39:30 +02:00
Ryozuki eaef31d4a0
fix wording and add/fix no col and no hook 2019-04-19 11:59:09 +02:00
Ryozuki 0f3411f8fa
fix wording 2019-04-19 11:46:54 +02:00
Ryozuki f37f8a8268
add all character flags to ddnetnetwork character 2019-04-19 11:17:28 +02:00
bors[bot] bbf485a9ac Merge #1628 
1628: Make client know about other solo players, fixes #258 r=heinrich5991 a=Ryozuki

When another player is in solo and you are not, you could notice a weird collision and also the hook moving a little towards the solo player. This as been fixed.

It also applies m_ClShowOthersAlpha to other players whenever you are on solo or others are.

It uses the protocol extension thingy.

fixes #258 

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
Co-authored-by: Learath <learath2@gmail.com>
 2019-04-18 23:03:52 +00:00
bors[bot] f15dd6303e Merge #1648 
1648: Fix mute typo r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-18 20:00:53 +00:00
12pm 997e01bf31 Fix mute typo 2019-04-18 20:54:22 +02:00
Learath 2398a509c7 Fix nits 2019-04-18 13:56:32 +02:00
Dennis Felsing 04ac4932c6
Merge pull request #1645 from def-/pr-str_copy_num 
str_num_copy -> str_truncate, as in Vanilla 0.7
 2019-04-18 10:25:25 +02:00
Dennis Felsing 00c87c121a str_num_copy -> str_truncate, as in Vanilla 0.7 2019-04-18 10:25:01 +02:00
Learath d6bfef2cc0 Use a NetObj instead of a system message 2019-04-17 23:47:32 +02:00
bors[bot] 957101fe54 Merge #1646 
1646: Add editor copy & paste r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-17 21:11:44 +00:00
12pm 7901cc26ad More reasonable layer size limits 2019-04-17 21:48:23 +02:00
12pm 50236ca45c Add editor copy & paste 2019-04-17 21:47:52 +02:00
Dennis Felsing 6e74d9d728 remove debugging 2019-04-17 14:12:35 +02:00
Dennis Felsing b425495f45 Fix draggers 2019-04-17 12:58:53 +02:00
def 9f3df78cae Fix typo 2019-04-16 20:37:12 +02:00
Dennis Felsing e01dce9243
Merge pull request #1644 from Learath2/dd_pr_statboard 
Clean statboard chat parsing a bit
 2019-04-16 08:07:23 +02:00
Learath 843dc29a88 Names can include quotes :/ 2019-04-16 02:39:22 +02:00
Learath dd62629ee9 Clean statboard chat parsing a bit 2019-04-16 01:47:12 +02:00
bors[bot] de5970579b Merge #1642 
1642: Add some demo player shortcuts r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-15 19:22:10 +00:00
12pm 6e880644af Add some demo player shortcuts 2019-04-15 21:08:12 +02:00
bors[bot] 091e41206c Merge #1635 
1635: Editor save menu improvements r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-15 18:40:34 +00:00
bors[bot] 01560b1609 Merge #1639 
1639: File score: Implement negative top5 (fixes #1631) r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-15 18:26:51 +00:00
def 9dddb290dd File score: Implement negative top5 (fixes #1631) 2019-04-15 18:55:33 +02:00
Dennis Felsing 3ac2e0a06a
Merge pull request #1617 from def-/pr-ninja-compiler-color 
Add compiler colors when using ninja
 2019-04-14 22:00:53 +02:00
Dennis Felsing aad18ebb86
Merge pull request #1624 from ChillerDragon/pr_refactor_mute 
Refactor mute and vote mute code
 2019-04-13 17:52:55 +02:00
Dennis Felsing 0178080097
Merge pull request #1637 from FallenKN/fix-ClMouseMinDistance 
Fix #1636
 2019-04-13 17:51:51 +02:00
FallenKN c69c4727ef removed unnecessary brackets 2019-04-13 15:22:31 +02:00
FallenKN 83b385f8a5 Fix #1636 2019-04-13 14:33:25 +02:00
def f1cf222e95 Editor: Don't enter directory name in filename in save menu 2019-04-13 13:21:05 +02:00
def 598c8cf1c6 Editor: Left align "New folder" button in save menu 2019-04-13 13:21:00 +02:00
def 87f588d8a3 Editor: Don't jump to first entry in file list when editing 
Fixes saving a new map when a subdirectory already exists
 2019-04-13 13:20:56 +02:00
ChillerDragon deaab4bb4b Add functions instead of goto 2019-04-12 19:50:02 +02:00
Ryozuki fb84bd1f0b
fix prediction when antiping is on 2019-04-12 17:08:06 +02:00
Ryozuki c686ceea53
Merge branch 'master' into pr_fix_solo 2019-04-12 16:34:43 +02:00
Ryozuki aa6852c758
shouldn't have edited this 2019-04-12 16:32:50 +02:00
Ryozuki 3556830b9a
fix solo prediction 2019-04-12 16:29:13 +02:00
Ryozuki 7e43120b6e
make the client aware of other players solo status 2019-04-12 16:16:21 +02:00
bors[bot] 826a7781ae Merge #1621 
1621: Actually enable -Wuseless-cast r=heinrich5991 a=def-

It's not supported in C and we only checked using a C compiler.

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-12 00:08:19 +00:00
bors[bot] 32551d2485 Merge #1626 
1626: Actually add crypto includes to the target r=def- a=Learath2

Seems like an oversight.

I'm guessing it compiled fine on most configurations because openssl include directory ends up being in `/usr/include` but on macOS when installed with brew/macports the directory ends up in `/usr/local/include`.

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-11 20:13:17 +00:00
Learath b342048dad Actually add crypto includes to the target 2019-04-11 22:00:33 +02:00
bors[bot] 0251038b77 Merge #1625 
1625: Fix non destructive drawing with hookthrough shortcut r=def- a=12pm

Fixes #1623

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-11 19:51:32 +00:00
12pm a1dd2e45a5 Fix non destructive drawing with hookthrough shortcut 
Fixes #1623
 2019-04-11 21:43:22 +02:00
ChillerDragon a6d00973e1 Refactor mute and vote mute code 2019-04-11 20:10:04 +02:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast 
But don't enable it yet because I'm not sure what the best way is.
 2019-04-11 19:54:43 +02:00