oy
ef3bce204c
added some checks to snap handling
...
(cherry picked from commit a09d498bc9
2020-01-21 22:16:28 +01:00
bors[bot]
77a4cd5b01
Merge #2035
...
2035: Fix rotating rotatable tiles in switch layer r=def- a=12pm
Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2020-01-17 18:21:10 +00:00
12pm
82ac6091eb
Fix rotating rotatable tiles in switch layer
2020-01-17 18:22:41 +01:00
bors[bot]
f24369b8f6
Merge #2034
...
2034: Fix del key removing commands while in editbox r=def- a=archimede67
This fixes a problem in the editor server settings, if you were to press the del key in the editbox while having a command selected, it deletes it.
Now you can press that key in the editbox without any worry of deleting any selected command.
Co-authored-by: Corantin H <archi0670@gmail.com>
2020-01-16 14:11:29 +00:00
Corantin H
a73525361b
Fix del key removing commands while in editbox
2020-01-16 15:01:45 +01:00
Dennis Felsing
dcd8148d9a
Merge pull request #2033 from def-/pr-fix-crash
...
Fix crash on pDDNetCharacter
2020-01-16 12:41:42 +01:00
Dennis Felsing
fcc25dfc65
Fix crash on pDDNetCharacter
2020-01-16 12:35:26 +01:00
bors[bot]
693b085a9c
Merge #2032
...
2032: Restore rcon `rifle` compatibility shim r=def- a=heinrich5991
Two more lines to keep backward compatibility.
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-01-12 16:55:13 +00:00
heinrich5991
fe1cf90327
Restore rcon rifle compatibility shim
...
Two more lines to keep backward compatibility.
2020-01-12 13:59:55 +01:00
def
50f3023b34
Fix ddnet-libs subproject hash
2020-01-10 21:40:28 +01:00
Dennis Felsing
fd0b9bc8ba
Merge pull request #2013 from heinrich5991/pr_ddnet_stub_curl
...
Eliminate static libcurl dependency, second try
2020-01-10 21:38:43 +01:00
bors[bot]
68739eea1f
Merge #2029
...
2029: Properly display hdiutil status in CMake r=Learath2 a=heinrich5991
(cherry picked from commit cc2be456d4
2020-01-08 09:38:50 +00:00
bors[bot]
173ca2e179
Merge #2026
...
2026: Only start showing emoticons after their start tick has passed (fixes #2025 ) r=Learath2 a=def-
Since we can go back in time in demo player
Co-authored-by: def <dennis@felsin9.de>
2020-01-08 09:27:09 +00:00
bors[bot]
7d7b51011d
Merge #2030
...
2030: Move /list to ddracechat r=def- a=fokkonaut
Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2020-01-06 21:39:19 +00:00
fokkonaut
c27e28b7ad
Move /list to ddracechat
2020-01-06 17:29:31 +01:00
heinrich5991
c3b79c7d7f
Eliminate static libcurl dependency, second try
...
Last try was #1925 .
2020-01-05 17:59:37 +01:00
heinrich5991
96069f42a9
Add a script to generate a stub libcurl library
...
Linking to this library will make DDNet compatible with all distros that
ship libcurl.so.4 with arbitrary version data attached. Distros
sometimes add versioning information to the symbols exported by curl
that artificially (because they're compatible with each other) limit
where our releases can be executed if dynamically linked.
This should reduce release size a bit and let's us take advantage of
automatically updated libraries.
2020-01-05 17:58:52 +01:00
heinrich5991
2fa80d0a67
Properly display hdiutil status in CMake
...
(cherry picked from commit cc2be456d4
2020-01-05 17:51:19 +01:00
bors[bot]
77957c00b9
Merge #2028
...
2028: Simplify anti stuck code more r=def- a=fokkonaut
Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2020-01-05 14:53:47 +00:00
fokkonaut
f5b8bbc2ff
Simplify anti stuck code more
2020-01-05 11:49:21 +01:00
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
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
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
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
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
ChillerDragon