Commit graph

9782 commits

Author SHA1 Message Date
def 964279a699 Reset quad rotation/color in damageind (fixes #2062)
Removed in 7ae4b39574
2020-02-13 22:55:32 +01:00
bors[bot] f343b3871c
Merge #2065
2065: Fix build error for Fedora Rawhide r=def- a=ElXreno

This PR fixes build error while building DDNet for Fedora Rawhide.
Build error seems like this:
```
FAILED: CMakeFiles/DDNet.dir/src/game/client/components/background.cpp.o
/usr/bin/c++  -DCONF_OPENSSL -DCONF_WAVPACK_OPEN_FILE_INPUT_EX -DGLEW_STATIC -D_FORTIFY_SOURCE=2 -I/usr/include/freetype2 -I/usr/include/ogg -I/usr/include/opus -I/usr/include/SDL2 -I/usr/include/wavpack -Isrc -I../src -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -flto -O2 -g -DNDEBUG   -fdiagnostics-color=always -fstack-protector-all -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wformat=2 -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -std=gnu++11 -MD -MT CMakeFiles/DDNet.dir/src/game/client/components/background.cpp.o -MF CMakeFiles/DDNet.dir/src/game/client/components/background.cpp.o.d -o CMakeFiles/DDNet.dir/src/game/client/components/background.cpp.o -c ../src/game/client/components/background.cpp
In file included from ../src/game/client/components/background.cpp:8:
../src/game/client/components/maplayers.h:15:9: error: 'uintptr_t' does not name a type; did you mean 'uint64_t'?
   15 | typedef uintptr_t offset_ptr;
      |         ^~~~~~~~~
      |         uint64_t
../src/game/client/components/maplayers.h:61:4: error: 'offset_ptr' does not name a type; did you mean 'offset_ptr32'?
   61 |    offset_ptr IndexBufferByteOffset()
      |    ^~~~~~~~~~
      |    offset_ptr32
In file included from ../src/game/client/components/background.cpp:8:
../src/game/client/components/maplayers.h:105:4: error: 'offset_ptr' does not name a type; did you mean 'offset_ptr32'?
  105 |    offset_ptr m_IndexBufferByteOffset;
      |    ^~~~~~~~~~
      |    offset_ptr32
../src/game/client/components/maplayers.h: In constructor 'CMapLayers::SQuadLayerVisuals::SQuadVisual::SQuadVisual()':
../src/game/client/components/maplayers.h:103:20: error: class 'CMapLayers::SQuadLayerVisuals::SQuadVisual' does not have any field named 'm_IndexBufferByteOffset'
  103 |    SQuadVisual() : m_IndexBufferByteOffset(0) {}
      |                    ^~~~~~~~~~~~~~~~~~~~~~~
```

Full build log you can find here (available for 14 days after build): https://download.copr.fedorainfracloud.org/results/elxreno/ddnet/fedora-rawhide-x86_64/01238446-ddnet/build.log.gz

Co-authored-by: ElXreno <elxreno@gmail.com>
2020-02-13 14:34:04 +00:00
ElXreno 1799edc049
Fix build error
./src/game/client/components/maplayers.h:15:9: error: 'uintptr_t' does not name a type; did you mean 'uint64_t'?
   15 | typedef uintptr_t offset_ptr;
      |         ^~~~~~~~~
      |         uint64_t
../src/game/client/components/maplayers.h:61:4: error: 'offset_ptr' does not name a type; did you mean 'offset_ptr32'?
   61 |    offset_ptr IndexBufferByteOffset()
      |    ^~~~~~~~~~
      |    offset_ptr32
In file included from ../src/game/client/components/background.cpp:8:
../src/game/client/components/maplayers.h:105:4: error: 'offset_ptr' does not name a type; did you mean 'offset_ptr32'?
  105 |    offset_ptr m_IndexBufferByteOffset;
      |    ^~~~~~~~~~
      |    offset_ptr32
../src/game/client/components/maplayers.h: In constructor 'CMapLayers::SQuadLayerVisuals::SQuadVisual::SQuadVisual()':
../src/game/client/components/maplayers.h:103:20: error: class 'CMapLayers::SQuadLayerVisuals::SQuadVisual' does not have any field named 'm_IndexBufferByteOffset'
  103 |    SQuadVisual() : m_IndexBufferByteOffset(0) {}
      |                    ^~~~~~~~~~~~~~~~~~~~~~~
2020-02-13 17:27:39 +03:00
Dennis Felsing 8d5762787e
Merge pull request #2064 from heinrich5991/pr_ddnet_unbundlecurl_openssl
Don't look for libcrypto if bundling libcurl
2020-02-13 10:46:56 +01:00
heinrich5991 e912cc4510 Don't look for libcrypto if bundling libcurl
This prevents accidental dependence on one specific version of
libcrypto.
2020-02-13 10:43:16 +01:00
Dennis Felsing cd44d6dba7 Version 12.9 2020-02-13 09:20:00 +01:00
bors[bot] 43ecec1f2f
Merge #2061
2061: use pid in file names of temporary files r=heinrich5991 a=def-

to prevent race conditions with multiple clients running when saving maps, config on quit, during upgrade


Co-authored-by: def <dennis@felsin9.de>
2020-02-13 00:03:23 +00:00
bors[bot] fefcf130ba
Merge #2063
2063: Pr success equal r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2020-02-12 23:57:11 +00:00
def 31ae4c4d5a use pid in file names of temporary files
to prevent race conditions with multiple clients running when saving
maps, config on quit, during upgrade
2020-02-12 23:14:30 +01:00
def 00b74d2acb Don't overcomplicate Success = false 2020-02-12 22:45:09 +01:00
Dennis Felsing 5929517941
Merge pull request #2058 from def-/pr-fix-compilation
Fix GCC 9.2.0 compilation
2020-02-11 18:17:40 +01:00
def 598ec52892 Fix GCC 9.2.0 compilation
src/game/server/ddracechat.cpp:623:39: error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
2020-02-05 08:22:04 +01:00
bors[bot] 6fddf4aa9e
Merge #2054
2054: Remove leading whitespaces from save codes r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2020-01-31 23:00:09 +00:00
12pm f3b82273d4 Remove leading whitespaces from save codes 2020-01-30 18:53:00 +01:00
bors[bot] 72fcf9caa8
Merge #2050
2050: Fix race condition. Closes #2004 r=def- a=Learath2

I guess a new state is better then a global variable

Co-authored-by: Learath <learath2@gmail.com>
2020-01-26 15:49:30 +00:00
Learath cc8dea393d Address feedback 2020-01-25 21:05:33 +01:00
Dennis Felsing 50d848ec43
Merge pull request #1928 from sirius1242/demo_render2
Demo to video converter function.
2020-01-25 21:01:08 +01:00
Learath 40dc9692aa Fix race condition. Closes #2004 2020-01-25 17:48:32 +01:00
bors[bot] 7a3ebd5948
Merge #2041
2041: Strip spaces in browser (server name) r=heinrich5991 a=ChillerDragon

before:
![image](https://user-images.githubusercontent.com/20344300/72688976-b45f1d00-3b0c-11ea-8920-5328c6d721f7.png)
after:
![image](https://user-images.githubusercontent.com/20344300/72688970-9db8c600-3b0c-11ea-8636-330218d75ca1.png)


Co-authored-by: KillaBilla <robomastermail@googlemail.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2020-01-25 12:45:36 +00:00
bors[bot] 749929431a
Merge #2040
2040: fixed faulty message id r=heinrich5991 a=ChillerDragon

(cherry picked from commit 9023796d27)

Co-authored-by: oy <Tom_Adams@web.de>
2020-01-25 12:40:14 +00:00
sirius 97064a1b09 Keep trying to solve fluency issues 2020-01-25 19:14:45 +08:00
def 8779be6bd8 Looks like my comment was wrong... 2020-01-25 07:37:28 +01:00
bors[bot] 2fc883f091
Merge #2049
2049: Allow filtering by name in status r=def- a=12pm

Easier to find players when the server is full

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2020-01-24 13:59:54 +00:00
12pm ec42291756 Allow filtering by name in status
Easier to find players when the server is full
2020-01-24 14:44:54 +01:00
bors[bot] 8ab8834ccb
Merge #2048
2048: Display envelope name in popups r=12pm a=Learath2

A dropdown would've worked better, but we don't have one

Co-authored-by: Learath <learath2@gmail.com>
2020-01-23 20:54:49 +00:00
Learath e567fde9d7 Names aren't unique, thinner popup 2020-01-23 21:24:48 +01:00
Learath a2eee9a8db Truncate properly 2020-01-23 20:48:42 +01:00
Emir Marincic 5c4fd72073
Merge pull request #2046 from 12pm/pr_fix_env_append
Modify envelope index when appending maps
2020-01-23 20:28:04 +01:00
Learath 2abe4fbcfb Display envelope name 2020-01-23 20:27:01 +01:00
bors[bot] 4ef9866b84
Merge #2047
2047: Try fix bors r=Learath2 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
2020-01-23 18:31:39 +00:00
Learath 62105bc3d7 Try fix bors 2020-01-23 19:29:58 +01:00
12pm 9dcfcc8f10 Modify envelope index when appending maps
fixes #2044
2020-01-23 18:30:55 +01:00
Emir Marincic 87c71b8270
Update badges 2020-01-23 16:32:42 +01:00
Emir Marincic 2335959161
Merge pull request #2045 from Learath2/dd_pr_actions
Migrate to github actions
2020-01-23 16:25:05 +01:00
Learath 696532689c Fix package names 2020-01-23 16:13:54 +01:00
Learath 4451fed535 Fix missing include 2020-01-23 16:07:40 +01:00
Learath a9e3a4029a Migrate to Github Actions 2020-01-23 16:01:52 +01:00
bors[bot] a47a94ee0e
Merge #2042
2042: Check snap r=def- a=ChillerDragon



Co-authored-by: oy <Tom_Adams@web.de>
Co-authored-by: ChillerDragon <ChillerDragon@gmail.com>
2020-01-22 13:02:04 +00:00
ChillerDragon 610976eddd Fix max snapshot size 2020-01-22 13:44:05 +01:00
ChillerDragon ee825f42e9 Add snap check for dummy 2020-01-21 22:20:09 +01:00
oy 49168da784 fixed typo
(cherry picked from commit 3deb58d409)
2020-01-21 22:17:20 +01:00
oy ef3bce204c added some checks to snap handling
(cherry picked from commit a09d498bc9)
2020-01-21 22:16:28 +01:00
heinrich5991 8c4569991d Fix indentation and formatting of str_clean_whitespaces
(cherry picked from commit b9c4086382)
2020-01-19 22:38:08 +01:00
KillaBilla 75d076b3bc changed str_clean_whitespace implementation to pkoerner's one
(cherry picked from commit a9cc1e8de2)
2020-01-19 22:37:57 +01:00
KillaBilla ba1abac52f remove leading and trailing space from server name and forbit the use of multiple spaces
(cherry picked from commit a9cc1e8de2)
2020-01-19 22:28:19 +01:00
oy 1b4131a7fd fixed faulty message id
(cherry picked from commit 9023796d27)
2020-01-19 21:30:12 +01:00
bors[bot] 1e257deb26
Merge #2039
2039: Add set_src to be more teeworlds compatible r=heinrich5991 a=ChillerDragon

thanks to @heinrich5991

Co-authored-by: ChillerDragon <ChillerDragon@gmail.com>
2020-01-19 19:38:54 +00:00
ChillerDragon 01f42089f3 Add set_src to be more teeworlds compatible
thanks to @heinrich5991
2020-01-19 20:38:11 +01:00
bors[bot] 8f9fc8c3d4
Merge #2038
2038: Overkill optimize editor code runs 200 fps faster r=Learath2 a=ChillerDragon



Co-authored-by: ChillerDragon <ChillerDragon@gmail.com>
2020-01-19 17:09:59 +00:00
ChillerDragon 949aa124e9 Overkill optimize editor code runs 200 fps faster 2020-01-19 17:48:07 +01:00