edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10267 commits 1 branch 429 tags 411 MiB
Commit graph

10267 commits

This branch
This branch
All branches
Author SHA1 Message Date
Learath 84f1542f43 Add a limit to GetNearestAirPos. Fix #1931 2019-10-13 16:34:03 +02:00
sirius d347ded43e change the time() in chat.cpp back to CComponent::time() 2019-10-13 22:01:08 +08:00
sirius d9d6569580 add button to set whether show chat when rendering video 2019-10-13 20:29:55 +08:00
sirius f5d0018ba9 solve the problem that chat message not show after a period of time when rendering 2019-10-13 19:57:24 +08:00
sirius 5b514e5c7f repair the problem that class selector appear when demo playing 2019-10-13 12:09:20 +08:00
sirius d89ae6c18c repair the problem that class selector appear when demo playing 2019-10-13 00:27:44 +08:00
bors[bot] fdf2ec37e7
Merge #1930 
1930: Fix #1888 r=heinrich5991 a=Learath2

I didn't see a better fix for it

Co-authored-by: Learath <learath2@gmail.com>
 2019-10-07 22:44:51 +00:00
bors[bot] f2fd9f4a8a
Merge #1932 
1932: Add toggle keyboard shortcuts button to demo player r=heinrich5991 a=12pm

Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi

![image](https://user-images.githubusercontent.com/30786226/66257525-ae7e3f80-e79a-11e9-9688-85946be366f3.png)
![image](https://user-images.githubusercontent.com/30786226/66257527-b50cb700-e79a-11e9-9cd4-9cefc2f72207.png)


Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-10-07 22:32:59 +00:00
heinrich5991 34087e1a7b Only get double jump when falling onto a stopper 
Another unintentional behavior change found by Zwelf.
 2019-10-06 13:54:16 +02:00
heinrich5991 eab0815ddc Fix unintentional behavior change with blockers 
Could be seen on "Insane 3", on teleporter 37. Thanks to Zwelf for
reporting.
 2019-10-06 13:51:16 +02:00
12pm 36df86fcd2 Add toggle keyboard shortcuts button to demo player 
Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi
 2019-10-05 18:06:58 +02:00
bors[bot] 112d0432e2
Merge #1923 
1923: Properly force spawn order of teams. Fix #1828 r=Learath2 a=d3fault

Mimic old behavior of having a respawn tick > 0 ticks after current tick. 2 ticks later is still "instant enough".

The code below the change mentions strong spawning, so without deciphering it we simply give 2 extra ticks to make sure that it executes before spawning (2 instead of 1 so that it definitely executes for both primary and dummy).

Co-authored-by: d3fault <d3fault@d3fault.net>
 2019-10-03 12:11:50 +00:00
sirius 1090953b7d update CMakeLists to make no ffmpeg need when ffmpeg off 2019-10-03 19:01:25 +08:00
bors[bot] 80efc085f6
Merge #1927 
1927: Add show text entities button to settings r=Learath2 a=12pm

Fixes #1897

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-10-02 22:02:12 +00:00
Learath 49a2a47dc8 Fix #1888 2019-10-02 20:44:03 +03:00
bors[bot] e7ea336a94
Merge #1925 #1929 
1925: Don't bundle libcurl for Linux r=Learath2 a=heinrich5991

It's installed basically everywhere and just increases release size.
They're serious about backward compatibility and haven't had a breaking
change in ages.

1929: Remove space at end of cfg description r=Learath2 a=ChillerDragon

Happy hacktoberfest :octocat: 

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-10-02 17:25:02 +00:00
bors[bot] 6b9d65f746
Merge #1926 
1926: Remove unused variables r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-10-02 17:09:07 +00:00
ChillerDragon 3777021383 Remove space at end of cfg description 2019-10-02 17:15:42 +02:00
12pm bc62167131 Add show text entities button to settings 
Fixes #1897
 2019-10-02 13:57:39 +02:00
heinrich5991 9a5de9eff8 Remove unused variables 2019-10-02 10:28:34 +02:00
sirius 4f3f3d2a61 add two video settings: showhookcollother and showdirection 2019-10-02 13:33:55 +08:00
sirius 9467bef192 add button to set whether show hud when rendering video 2019-10-02 13:11:58 +08:00
sirius 6acae69d96 repair the segment fault bug in con_startvideo 2019-10-02 09:52:54 +08:00
sirius ca583ba2a9 solve the problem about disorder of frames, reason is that no glReadBuffer() before glReadPixel() 2019-10-02 09:52:47 +08:00
sirius b0ee5671ff rebased to ef32fc4 2019-10-02 09:51:33 +08:00
d3fault 5f193d009e Properly force spawn order of teams, so dummy doesn't get strong hook. Fix #1828 
Mimic old behavior of having a respawn tick > 0 ticks after current tick.
2 ticks later is still "instant enough".
The code below the change mentions strong spawning,
so without deciphering it we simply give 2 extra ticks to make sure that
it executes before spawning (2 instead of 1 so that it definitely
executes for both primary and dummy).
 2019-09-30 15:42:09 -07:00
d3fault 718eebd9ce Revert "Force spawn order of teams. Fix #1828" 
This broke respawn rate limiting and didn't even fix #1828.
When primary tee hits kill tiles, dummy still gets strong hook.

This reverts commit 02f5723321.
 2019-09-30 15:38:35 -07:00
sirius e4fdeefdd4 remove first two frames to forbid from interface before playback being rendered to video 2019-09-30 20:55:23 +08:00
sirius 605da124d4 add button to adjust render speed 2019-09-30 20:54:42 +08:00
sirius 1c150106f8 demoplayer disconnect when render finished 2019-09-30 20:54:42 +08:00
sirius 628f1eb777 update README 2019-09-30 20:54:42 +08:00
sirius d9d1e8b309 add if defined to newly added lines 2019-09-30 20:54:19 +08:00
sirius 14ed79972b check if video exist when render 2019-09-30 20:52:25 +08:00
sirius 562dffe800 segment fault repaired (don't nest others' function thoughtless) 2019-09-30 20:52:25 +08:00
sirius a71339366b add function to appoint video name, but will segment fault 2019-09-30 20:52:25 +08:00
sirius 1375fbb95d add a button to render whole demo 2019-09-30 20:52:24 +08:00
HMH 461da64021 Basic cmake support for videorecorder 2019-09-30 20:49:35 +08:00
HMH 41da2f4497 removed superfluous const 2019-09-30 20:48:50 +08:00
H-M-H ef43af8709 videorecorder should be disabled by default 2019-09-30 20:48:50 +08:00
H-M-H 1abd84ce10 remove lib-prefix 2019-09-30 20:48:50 +08:00
H-M-H e8c80fae19 add the flag for actually linking against ffmpeg libs... 2019-09-30 20:48:50 +08:00
H-M-H 78e851c52c hopefully made msvc happy now 2019-09-30 20:48:50 +08:00
H-M-H 9177259800 also add includepath if using bundled ffmpeglibs 2019-09-30 20:48:50 +08:00
H-M-H 186938e153 add the actuall dlls for windows 2019-09-30 20:48:50 +08:00
H-M-H b098fa1e43 more stuff for windows 2019-09-30 20:48:47 +08:00
H-M-H 4b86630b42 fps for videos configurable and videos are stored at a proper location 2019-09-30 20:48:47 +08:00
H-M-H 98568eba43 no audio for now 2019-09-30 20:48:47 +08:00
H-M-H 2f71720fb1 correct time after stopping recording a video 2019-09-30 20:48:47 +08:00
H-M-H d4a842aa34 hopefully made compiling with ffmpeg work for windows 2019-09-30 20:48:47 +08:00
H-M-H ab9e716444 fixed compiling on linux 2019-09-30 20:48:47 +08:00