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

13259 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] 19779ccf94
Merge #2027 
2027: Distance can't be negative r=def- a=fokkonaut

This removes code duplication and D can never be negative:

```template<typename T>
inline T distance(const vector2_base<T> &a, const vector2_base<T> &b)
{
	return length(a-b);
}
inline float length(const vector2_base<float> &a)
{
	return sqrtf(a.x*a.x + a.y*a.y);
}```

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2020-01-04 22:42:32 +00:00
fokkonaut e2b252b714 Distance can't be negative 2020-01-04 16:32:51 +01:00
sirius 0be4629cc1 forget to deal with pError 2020-01-04 17:44:12 +08:00
sirius 3967ddba00 replace same operations by call Demoplay_Play() when rendering video by render button 2020-01-04 17:08:00 +08:00
def 54d4aef145 Only start showing emoticons after their start tick has passed (fixes #2025) 
Since we can go back in time in demo player
 2020-01-04 10:07:14 +01:00
sirius 521e822bbb update map fix part when rendering video 2020-01-04 17:02:00 +08:00
sirius 5350a12185 fix wired sound 2020-01-04 10:17:16 +08:00
def 600a3b0bad Fix preprocessor 2020-01-03 22:07:02 +01:00
def 511c9d248e Fix alignment of pixels for reading to video recorder 2020-01-03 21:43:15 +01:00
def 1e36b4df15 Move some code out as a small optimization 2020-01-03 21:42:53 +01:00
def 8d716452ba Fix sizes so that we don't write too far 2020-01-03 21:42:19 +01:00
def 54ae929b2f Disallow resizing windows when videorecorder is compiled in 2020-01-03 21:40:41 +01:00
def a0362019f0 Initialize m_NextaFrame 2020-01-03 20:37:27 +01:00
bors[bot] af6d463fb6
Merge #2024 
2024: Fix demo bug r=def- a=Learath2

Since no one else was willing to fix it, I whipped up a quick patch. This isn't the correct way to do this though. We should probably add a function in storage to search for maps, so that things can't end up out of sync ever again.

Co-authored-by: Learath <learath2@gmail.com>
 2020-01-03 09:43:40 +00:00
Learath d2fad6c79a Fix demo bug 2020-01-03 12:13:40 +03:00
sirius 6803726209 extend sound buffer, try to solve segment fault problem 2020-01-03 10:26:10 +08:00
bors[bot] cfbe8f3a8d
Merge #2020 
2020: Bundled libs update r=heinrich5991 a=def-

- ogg 1.3.3 -> 1.3.4
- freetype 2.10.0 -> 2.10.1
- curl 7.65.0 -> 7.67.0, openssl 1.1.1c -> 1.1.1d

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2020-01-01 19:29:37 +00:00
bors[bot] 1649c566ab
Merge #2023 
2023: Move DDNet-custom json code out of external directory (fixes #2022) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-01-01 19:17:13 +00:00
def 017b8c3621 Move DDNet-custom json code out of external directory (fixes #2022) 2020-01-01 20:07:04 +01:00
def df807a7486 -DVIDEORECORDER=ON instead of -DFFMPEG=ON, fix README 
remove unused files
 2020-01-01 16:56:54 +01:00
sirius 7710b88670 Merge branch 'master' of https://github.com/ddnet/ddnet into demo_render2 2020-01-01 18:36:49 +08:00
Dennis Felsing 9816881a2a
Merge pull request #2017 from def-/pr-fix-websockets-warning 
Fix Websockets warning
 2019-12-31 10:38:49 +01:00
Dennis Felsing 45ad7be57c
Merge pull request #2021 from ElXreno/appdata 
Add AppData manifest
 2019-12-31 10:38:10 +01:00
ElXreno 73d91b7d1a
Updated screenshots 2019-12-31 12:37:19 +03:00
ElXreno 6c47ca7994
Removed the welcome 2019-12-31 11:58:19 +03:00
Artem Polishchuk 375e43e98b Add donation link (#2) 2019-12-31 10:56:29 +03:00
ElXreno 31b228e7dc
Fixed license naming 2019-12-31 10:48:45 +03:00
ElXreno 44adf1878d
Added AppData manifest 2019-12-31 10:06:44 +03:00
Dennis Felsing 93fa910e39 Bundled libs update 
- ogg 1.3.3 -> 1.3.4
- freetype 2.10.0 -> 2.10.1
- curl 7.65.0 -> 7.67.0, openssl 1.1.1c -> 1.1.1d
 2019-12-30 14:56:21 +01:00
Dennis Felsing a24a8c36ee Remove debugging help 2019-12-30 14:29:00 +01:00
Dennis Felsing 070d215ae0 Fix Travis Mac OSX build 
ABI check failed, CMAKE_SIZEOF_VOID_P was thus not set and we look for
libs in wrong directory. Something seems to be wrong with the C/C++
compilers Travis is using. Not sure how to figure out more closely.
 2019-12-30 13:19:33 +01:00
Dennis Felsing ba3b436139 Fix Websockets warning 2019-12-30 10:12:16 +01:00
Dennis Felsing 2a012ab251
Merge pull request #1994 from ChillerDragon/pr_circleci_cmakeflags 
Test mysql and websockets in circleci
 2019-12-30 09:47:22 +01:00
def b0406e335b Remove debugging help 2019-12-29 13:35:19 +01:00
def 0236f15018 Teamscore DDNet7 fix 2019-12-29 12:55:19 +01:00
def 6da92b4b9c Fix map_convert_07 tool 2019-12-29 12:43:41 +01:00
def 5f855b11b2 Version 12.8.1 2019-12-22 22:39:31 +01:00
Dennis Felsing 811ddb3283
Merge pull request #2008 from Learath2/dd_pr_demohotfix 
Fix (not) small bug with demos that don't include a map
 2019-12-22 22:38:22 +01:00
Learath a882cf5196 Fix bug with slices 2019-12-22 19:09:14 +03:00
def aa3e82cda7 Revert "Write out sql server prefix to failed_sql.sql" 
This reverts commit c1a7961359.
 2019-12-22 09:30:33 +01:00
def 8879f17341 Revert "Still pass in SqlServer even when writing to file since we need prefix" 
This reverts commit 6e294d938b.
 2019-12-22 09:28:14 +01:00
Dennis Felsing 83f2fc2669
Merge pull request #2012 from ChillerDragon/pr_func_style 
Style 'void foo() {' -> 'void foo()\n{'
 2019-12-21 18:18:49 +01:00
ChillerDragon 928e5407eb Style 'void foo() {' -> 'void foo()\n{' 2019-12-21 14:35:09 +01:00
Dennis Felsing 3e08d473ab
Merge pull request #2011 from heinrich5991/pr_ddnet_fix_comment 
Fix outdated comment
 2019-12-21 08:00:38 +01:00
heinrich5991 e70fb8e43d Fix outdated comment 2019-12-20 22:51:10 +01:00
jupeyy 8a8674b545 fix min mouse pos for follow factor 2019-12-19 00:26:54 +01:00
Learath 65ec25a8a1 Fix small bug with demos that don't include a map 2019-12-18 13:51:08 +01:00
Dennis Felsing 71857fdb80
Merge pull request #2007 from heinrich5991/pr_ddnet_rm_string_h 
Remove `strcmp` from file score
 2019-12-18 13:15:10 +01:00
heinrich5991 4aeeedbbea Remove strcmp from file score 2019-12-18 12:52:36 +01:00
Dennis Felsing 70e06d8889
Merge pull request #2005 from rffontenelle/patch-4 
Update brazilian_portuguese.txt
 2019-12-18 07:00:28 +01:00