edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-05 15:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
9930 commits 1 branch 428 tags 411 MiB
Commit graph

9930 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] 295a479db5
Merge #2164 
2164: Fix empty sound (fixes #2163) r=heinrich5991 a=def-

The problem was that the string is empty after going through the trim, thus the main displaying loop doesn't run, but the sound still does. Verified that it works.

Co-authored-by: def <dennis@felsin9.de>
 2020-05-06 08:48:24 +00:00
def 741c97ccc7 Fix empty sound (fixes #2163) 
The problem was that the string is empty after going through the trim,
thus the main displaying loop doesn't run, but the sound still does.
 2020-05-06 08:15:23 +02:00
bors[bot] 65284f3a28
Merge #2159 
2159: Make the dummy always press fire when cl_dummy_hammer is active r=heinrich5991 a=trml



Co-authored-by: trml <trml@users.noreply.github.com>
 2020-05-01 23:20:22 +00:00
bors[bot] 2067a1af65
Merge #2160 
2160: Don't load m_Ammo to fix loads (following #2086) r=heinrich5991 a=def-

As reported by Konsti, thanks to heinrich5991 for remembering #2086

Co-authored-by: def <dennis@felsin9.de>
 2020-05-01 21:52:27 +00:00
def 7ae8988dd0 Don't load m_Ammo to fix loads (following #2086) 
As reported by Konsti, thanks to heinrich5991 for remembering #2086
 2020-05-01 23:51:01 +02:00
trml bcf9e003d7 Make dummy hold fire with cl_dummy_hammer 1 2020-05-01 16:23:42 +02:00
Learath 6d433fc591 Revert "Allow macOS CI to fail for merging" 
This reverts commit 7847e458c3.
 2020-05-01 16:44:58 +03:00
Emir Marincic 52d9c186b0
Merge pull request #2158 from def-/pr-macos-action 
Fix macos github action
 2020-05-01 16:43:44 +03:00
def 6f040e4b8c Try to fix macos action 2020-05-01 15:18:56 +03:00
def df278aa5cb Make the github workflow badge link to appropriate page 2020-05-01 10:25:36 +02:00
def a723299cb9 Update ddnet-libs (rebuild mac libs again) 2020-05-01 09:58:39 +02:00
def c9dfcb2b11 Fix Mac OS X notifications linking 2020-04-30 21:30:21 +02:00
def d1b7e84488 Version 13.1 2020-04-30 18:34:51 +02:00
def 8c5de9b7c4 Update ddnet-libs (rebuild mac libs) 2020-04-30 18:31:19 +02:00
bors[bot] e5442c4d74
Merge #2155 
2155: Don't require notify on Linux r=heinrich5991 a=def-

Especially when only building server and not client

Co-authored-by: def <dennis@felsin9.de>
 2020-04-30 13:22:50 +00:00
def 7fe8afefa5 Don't require notify on Linux 
Especially when only building server and not client
 2020-04-30 15:05:49 +02:00
Learath 09fad44b87 Strip rpath before adding the correct one 2020-04-30 15:04:51 +02:00
Learath 17d1bccf2b Some osx cleanup 2020-04-30 15:04:51 +02:00
bors[bot] bd3b72e493
Merge #2152 
2152: Fix whispering to players with quotes (fixes #2151) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-04-30 10:57:29 +00:00
bors[bot] d0cf8c08af
Merge #2154 
2154: cl_showchat 2 to always show large chat area (fixes #2153) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-04-30 10:50:58 +00:00
Dennis Felsing 5e213a2619
Merge pull request #2086 from fokkonaut/master 
Remove setting ammo for freeze to 0
 2020-04-30 12:44:40 +02:00
fokkonaut d460470265
Move comment aswell 2020-04-30 11:49:04 +02:00
def 76eda61c99 cl_showchat 2 to always show large chat area (fixes #2153) 2020-04-28 22:35:56 +02:00
Dennis Felsing f5c21466a0
Merge pull request #2150 from trml/pr_predict_dummy 
Add dummy prediction, and use FreezeEnd in prediction
 2020-04-28 17:20:03 +02:00
def 65a4eb775b Fix whispering to players with quotes (fixes #2151) 2020-04-28 08:54:24 +02:00
bors[bot] 974df08539
Merge #2146 
2146: Update ddnet-libs r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-04-19 17:10:03 +00:00
trml fe1a7fb1e0 Predict directinput order for dummy and main 2020-04-19 12:50:37 +02:00
trml cae7fad901 Use freeze end tick in prediction 2020-04-19 12:50:06 +02:00
trml a4a0b6e9ed Add config flag for dummy prediction and fix compilation 2020-04-18 23:28:40 +02:00
trml 99baf219d0 Revert "Remove the dummy prediction" 
This reverts commit 681f30950c.
 2020-04-18 22:16:25 +02:00
def 74e943e88d Update ddnet-libs 2020-04-17 16:30:44 +02:00
bors[bot] 56c55d4081
Merge #2145 
2145: Renew the ffmpeg lib version in cmake/FindFFMPEG.cmake for windows OS… r=def- a=QingGo

Renew the ffmpeg lib version in cmake/FindFFMPEG.cmake for windows OS building

Co-authored-by: 清歌 <zyqingjohn@qq.com>
 2020-04-17 14:25:26 +00:00
清歌 8ee6e469de
Renew the ffmpeg lib version in cmake/FindFFMPEG.cmake for windows OS building 
Renew the ffmpeg lib version in cmake/FindFFMPEG.cmake for windows OS building
 2020-04-16 09:49:32 +08:00
bors[bot] 6fe6ff70b1
Merge #2143 
2143: Don't push notification when active r=Ryozuki a=ardadem

In the game we already have highlighted text and sounds, we don't need to bother with notifications.

Co-authored-by: Arda Demir <ddmirarda@gmail.com>
 2020-04-14 22:00:51 +00:00
Arda Demir 8648b1a7dc Don't push notification when active 2020-04-15 00:37:58 +03:00
bors[bot] 602bd2731f
Merge #2142 
2142: Fix CMake LibNotify warning (fixes #2141) r=heinrich5991 a=def-

The LibNotify name is not used anywhere?

Co-authored-by: def <dennis@felsin9.de>
 2020-04-14 16:52:56 +00:00
def 48118f6d83 Fix CMake LibNotify warning (fixes #2141) 
The LibNotify name is not used anywhere?
 2020-04-14 18:45:34 +02:00
Arda Demir b7d452d2a0
Libnotify support for linux client (#2099) 
Add libnotify support for linux client

Also unify notification management

Make libnotify mandatory for the client. It is installed on 100% of Arch
Linux systems and on 70% of Debian systems. I'd guess the remaining
Debian systems are servers.

Detect dependent libraries of `libnotify` using `pkg-config`. Remove
library-specific code from the game module. Decrement refcount for
libnotify notification object before leaving the function.
 2020-04-14 17:53:53 +02:00
Dennis Felsing 6e44394342
Merge pull request #2140 from Ryozuki/pr_fix_endless_loop 
prevent endless loop
 2020-04-14 12:58:30 +02:00
Ryozuki ea7f3f0a62
prevent endless loop 2020-04-14 12:51:48 +02:00
bors[bot] 164a887214
Merge #2136 
2136: Fix type of os_is_winxp_or_lower function (fixes #2135) r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-04-12 19:43:09 +00:00
def a951845083 Surprise: void x(); accepts any parameter in C! 
Prevents accidentally passing parameters that would then be ignored.

C++ is more reasonable, so nothing to do there.
 2020-04-12 20:06:38 +02:00
bors[bot] ffc1078783
Merge #2137 
2137: Rename antibot -> ddnet-antibot and install it on cmake r=heinrich5991 a=Ryozuki

Fixes #2134

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
 2020-04-12 15:15:11 +00:00
Ryozuki e2a85345e4
Rename antibot -> ddnet-antibot and install it on cmake 2020-04-12 17:13:47 +02:00
def 4c00e4533c Fix type of os_is_winxp_or_lower function (fixes #2135) 2020-04-12 10:23:08 +02:00
bors[bot] 58f763c80e
Merge #2128 
2128: Fix memory leaks and related. r=heinrich5991 a=Ryozuki

Don't merge yet.

I want to use this pr to fix several leaks and stuff, if you find something you can report it here.

[valgrind-out.txt](https://github.com/ddnet/ddnet/files/4451261/valgrind-out.txt)


Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
 2020-04-11 11:45:24 +00:00
Ryozuki 588f8a833f
Fix snapshot storage leak 2020-04-11 13:38:02 +02:00
Ryozuki 5f565a5eb5
check for WavpackCloseFile 2020-04-11 13:17:21 +02:00
Ryozuki 7d51a0992a
fix memory leak on sound decoding 2020-04-11 13:17:21 +02:00
Ryozuki b4f072faf3
some valgrind suppressions 2020-04-11 13:17:21 +02:00