edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
20845 commits 1 branch 429 tags 412 MiB
Commit graph

288 commits

Author SHA1 Message Date
Jupeyy a663799188 uint64 -> uint64_t, int64 -> int64_t 2021-06-24 17:19:17 +02:00
Patiga ec53b8742e Fix duplicate uuid index in maps edited by tools 2021-05-03 12:02:18 +02:00
Patiga 9730e80e08 Fix duplication of ITEMTYPE_EX (uuid index) items 
Credits to heinrich5991 for his feeling that the UUID index duplication
could originate in this file.
 2021-05-02 17:22:15 +02:00
jupeyy 259629db9f Map optimizer 2020-11-21 12:10:20 +01:00
Jupeyy c989cd67f9 Check skin/sprite images for correctness 2020-11-18 07:59:15 +01:00
def 7a9a67c5d7 Enable most clang-tidy misc-* checks 2020-11-05 12:03:14 +01:00
def 165857a5a8 Fix variable names manually 2020-11-02 22:40:40 +01:00
def b1f0fd8969 Enable modernize-loop-convert clang-tidy check 
and run clang-format afterwards

https://clang.llvm.org/extra/clang-tidy/checks/modernize-loop-convert.html
 2020-11-02 22:40:24 +01:00
Dennis Felsing 333218e8c2
Merge pull request #3200 from Patiga/pr-remove-duplicate-function 
Use IntsToStr function from gamecore.h
 2020-10-27 13:18:59 +01:00
Patiga 1253215018 Fix style 2020-10-27 12:35:55 +01:00
Patiga cce91746da Use IntsToStr function from gamecore.h 2020-10-27 12:15:11 +01:00
bors[bot] a050370055
Merge #3197 
3197: 0.7 map converter - Stop embedding rgb images r=heinrich5991 a=Patiga

DDNet doesn't CMapItemTypeImage version 2, meaning it doesn't have
support yet for having rgb images in maps. Currently, trying that would result in
invalid map files.

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [x] Considered possible null pointers and out of bounds array indexing
- [x] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Patiga <dev@patiga.eu>
 2020-10-27 09:44:16 +00:00
Patiga 090b0942fb Stop embedding rgb images 
DDNet doesn't CMapItemTypeImage version 2, meaning it doesn't have
support yet for having rgb images in maps. Currently, trying that would result in
invalid map files.
 2020-10-26 17:08:52 +01:00
Dennis Felsing e55eecc88b Fix map_convert_07 
Broken in 5c1b8cd221 (diff-17a71d0838a3f107d2baf573a0885c3b7727266b432a13836525737e83a81a58)

Thanks to Jupstar for noticing
 2020-10-26 15:11:54 +01:00
def 87b06d307f Fix clang-analyzer-core.UndefinedBinaryOperatorResult 
/media/ddnet/src/game/client/animstate.cpp:54:27: warning: The left operand of '*' is a garbage value [clang-analyzer-core.UndefinedBinaryOperatorResult]
        pSeq->m_X += pAdded->m_X * Amount;
                                 ^
 2020-10-14 15:45:47 +02:00
def 5c1b8cd221 Fix clang-analyzer-deadcode.DeadStores 
/media/ddnet/src/game/client/components/statboard.cpp:288:3: warning: Value stored to 'tw' is never read [clang-analyzer-deadcode.DeadStores]
 2020-10-14 15:45:47 +02:00
def a4f13ed4a8 Fix clang-analyzer-optin.portability.UnixAPI 
and mark some false positives

/media/ddnet/src/engine/client/backend_sdl.cpp:329:30: warning: Call to 'malloc' has an allocation size of 0 bytes [clang-analyzer-optin.portability.UnixAPI]
 2020-10-14 15:45:43 +02:00
def 62dc12aacb Fix all Multiplication type alerts by CodeQL 
> Multiplication result converted to larger type

> A multiplication result that is converted to a larger type can be a
> sign that the result can overflow the type converted from.

Example: https://github.com/ddnet/ddnet/security/code-scanning/17?query=ref%3Arefs%2Fheads%2Fmaster
 2020-10-05 19:03:54 +02:00
def b0a3de60b2 Handle PNG read errors (fixes #2959) 
and print a more telling error message

I'll check all our existing maps for failures now:

$ find . -iname '*.map' | while read i; do echo $i; map_extract $i > /dev/null; find . -iname '*.png' | while read j; do dilate $j; rm -- $j; done; done

For skins Soreu and the skin DB team is already taking care.
 2020-09-30 18:23:52 +02:00
def 3be8a592e5 Run clang-format 
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:

$ python scripts/fix_style.py
 2020-09-26 21:50:15 +02:00
def 0bac9f0de8 Manual preparation for cleaner clang-format 
Also include what you use explicitly
 2020-09-26 21:41:01 +02:00
Jupeyy 0ec7f1e1dc Fix dilate threshold & automatically apply dilate on embedded textures in the editor 2020-09-21 19:17:38 +02:00
Jupeyy a1eb5dc114 Max images(for editor, clamp for client and warning for mapconvert) (fixes #2148) 2020-09-19 21:22:21 +02:00
def f9ec8c5696 map_convert_07: Check for width/height 0 
as suggested by Jupeyy
 2020-09-14 18:03:23 +02:00
Andrii bea30a879d
Apply suggestions from code review 
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-09-13 00:40:22 +03:00
Andrii 3835395591 allow to use config_retrieve on whole directory 2020-09-12 23:48:01 +03:00
bors[bot] 51483c2ff1
Merge #2789 #2797 
2789: Refresh server browser immediately when updated ddnet info arrived r=heinrich5991 a=def-

At the moment it only happens the next time you press refresh.

Before we had it so that it always reloaded once the ddnet info arrived,
causing a quick flickering and lots of packets having to be resent every
time someone pressed refresh, even if nothing changed.

The new approach combines the advantages of both without the
disadvantages. An even nicer way would be to compare the json objects,
so that news and version updates don't matter, but our json library
doesn't seem to support that.

2797: dilate: Don't crash if file doesn't exist r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-09-10 22:24:06 +00:00
def 80b7ceb3d7 dilate: Don't crash if file doesn't exist 2020-09-10 23:25:33 +02:00
def c839dc96d9 Remove tools we don't need anymore 
Following Jupeyys new renderer
 2020-09-10 23:15:28 +02:00
def 5d239bce80 Also check for divisibility by 16 of height (fixes #2687) 2020-08-31 14:01:34 +02:00
def 53c43536d5 map_convert_07: Support drag'n'drop 2020-08-16 23:21:00 +02:00
bors[bot] de328c1360
Merge #2301 
2301: map_convert_07: Check image width for divisibility by 16 r=heinrich5991 a=def-

As noticed on Sunny Land.

> [5:31 PM] redix: in theory it should be enough if width and height are divisible by 16

Now running this over our maps and fixing them manually.

Co-authored-by: def <dennis@felsin9.de>
 2020-06-23 23:30:34 +00:00
def ca094df46b map_extract: Only access map info if it exists 
Noticed on map Paranormal
 2020-06-21 00:57:14 +02:00
def 66917c4b24 map_convert_07: Check image dimensions for divisibility by 16 2020-06-20 23:32:08 +02:00
Learath 9a4b1f3615 Fix fake_server 2020-06-19 20:28:55 +03:00
def b0406e335b Remove debugging help 2019-12-29 13:35:19 +01:00
def 6da92b4b9c Fix map_convert_07 tool 2019-12-29 12:43:41 +01:00
def 8639c902ae map_convert_07: use regular paths 2019-12-08 23:14:56 +01:00
def 28aabc5b91 Add map_convert_07 tool 
Fixes https://github.com/ddnet/ddnet7/issues/20
 2019-12-08 22:44:25 +01:00
def faa3cc195d UTF8 nocase compare & use for chat TAB completion 
- As suggested by Arseniy Zarche
- Also updated confusables to Unicode 12
 2019-01-09 08:31:03 +01:00
def 76c32b2b1f fix tools 2018-12-17 22:23:50 +01:00
def 6846a6ecad Fixes and stress improvements 2018-12-17 20:05:50 +01:00
Dennis Felsing e585b1f2b8 Fix tools compilation 2018-12-17 14:46:17 +01:00
def 5d8d900643 Revert recvmmsg 2018-07-29 22:49:34 +02:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +02:00
Dennis Felsing d5dc951747 fix 2018-07-25 16:24:12 +02:00
heinrich5991 ca8fcc823c Use more secure hash function for map downloads 
SHA256 was chosen because it is reasonably standard, the file names
don't explode in length (this rules out SHA512) and it is supported by
basically all versions of OpenSSL (this rules out SHA512/256 and SHA3).

The protocol is changed in a backward compatible way: The supporting
server sends the SHA256 corresponding to the map in the `MAP_DETAILS`
message prior to sending the `MAP_CHANGE` message. The client saves the
SHA256 obtained from the `MAP_DETAILS` message until the next
`MAP_CHANGE` message.

For servers not supporting this protocol, the client falls back to
simply opening maps like in the previous scheme.

Remove the `map_version` tool, it is not being used and would have been
a little bit effort to update.

Use the OpenSSL implementation of SHA256 if it is supported, otherwise
fall back to a public domain one.

Fix #1127.
 2018-06-24 17:04:50 +02:00
heinrich5991 f8277267a0 Remove mem_alloc and mem_free, use standard C functions instead 
Replace `mem_free` by `free`, and `mem_alloc` by `malloc` or `calloc`
(the latter one being used to allocate a zeroed array of elements,
sometimes, this makes a call to `mem_zero` superfluous).

This results in having to remove `mem_stats` which previously recorded
the number of allocations and their size that the Teeworlds code did
directly.

Remove OOM handling in `src/game/client/components/binds.cpp`.

Remove needless copying in the CSV code in
`src/game/client/components/statboard.cpp`.
 2018-04-09 11:56:39 +02:00
bors[bot] c0fa444f3a Merge #1034 
1034: Try to find external GLEW, pnglite and Wavpack  r=Learath2 a=heinrich5991

Allow for newer versions of Wavpack, fixes #1023.

Fixes #1016.
 2018-02-13 02:02:07 +00:00
heinrich5991 94818ec1f0 Try to find external GLEW, pnglite and Wavpack 
Allow for newer versions of Wavpack, fixes #1023.

Fixes #1016.
 2018-02-12 23:29:45 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
Dennis Felsing eb2634ab0a Merge pull request #852 from heinrich5991/pr_ddnet_fix_extractname 
Add testing; fix, rename and test the `CEditor::ExtractName` function
 2017-08-30 22:09:17 +02:00
heinrich5991 22be1be389 Fix and rename the CEditor::ExtractName function 
Fixes #846.
 2017-08-30 13:59:42 +02:00
heinrich5991 2682480f8a Rename GetUncompressedDataSize to GetDataSize 
Also rename the old `GetDataSize` to `GetFileDataSize`. `GetDataSize`
now returns the actual data size, not the data size before
decompression.
 2017-08-30 08:36:17 +02:00
root 7cd95f63cf Fixing spaces and globals 2017-08-30 00:34:14 +02:00
root 2c748ebf70 Fixing PR over heinrich revision 2017-08-30 00:21:41 +02:00
sctt 0849fa6024 fixing map_resave and adding map_replace_image 
Update datafile.h

Update datafile.cpp

Update datafile.cpp

Update map_resave.cpp

Update datafile.h

Update map_resave.cpp

Update datafile.h

Update datafile.cpp

Update config_store.cpp

Update config_retrieve.cpp

Update io.cpp

Update gamecontext.cpp

Update config_store.cpp

Update CMakeLists.txt

Create map_replace_image.cpp

Update map_replace_image.cpp

fixing bug with height and witdth
 2017-08-29 16:21:16 +02:00
heinrich5991 33315452c3 Merge branch 'master' into leak_fix 2017-07-31 20:42:32 +02:00
Learath2 4622ab4cb6 Merge pull request #814 from heinrich5991/pr_ddnet_fix_cmake_mac 
Fix the CMake Mac build
 2017-07-30 11:38:12 +02:00
heinrich5991 6247aa0c7f Enable -Wextra and -Wformat=2 
Also annotate `dbg_msg`, `str_format` and `str_timestamp_ex` so that the
compiler can determine whether the format strings are correct.

Fix the compiler warnings generated by these extra warnings -- some of
them were security issues.
 2017-07-27 20:38:17 +02:00
heinrich5991 98f229c48b Fix a -Wunused-value warning in map_diff 2017-07-26 11:53:21 +02:00
HMH 1f7d216f28 also delete Kernel in map_version 2017-07-21 20:01:39 +02:00
def f2444b0de7 Add map_diff tool to compare tile layers of map versions 2017-07-12 20:15:00 +02:00
def f3e3d57a90 Always close files, cleaner demo recording, fix some other stuff 2017-07-08 13:39:20 +02:00
def 3aaf38cefb Fix map_extract usage a bit 2017-06-12 21:18:21 +02:00
def c943efbec0 Add tool to extract images and sounds from maps 2017-06-12 21:00:33 +02:00
heinrich5991 5ae37e6c72 Add protocol extension with UUIDs 
This system can easily be extended by independent authors without
collisions, something the old system with plain increasing integers did
not allow.

Do this by utilizing the previously unused message code `NETMSG_NULL`
which has a value of 0.

This works for engine and game messages, snapshot items and events.
 2017-05-25 00:52:43 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
heinrich5991 cd3b0ae855 Implement the confusable algorithm from Unicode more closely 
See UTS#39 "Unicode Security Mechanisms":
http://www.unicode.org/reports/tr39/

This means that characters with accents or other things around them are
now considered the confusable with the base character.

Fixes #557. Fixes #575.
 2016-10-30 13:45:55 +01:00
heinrich5991 b075f1ff1b Use a dummy map with background 2016-05-25 23:47:34 +02:00
heinrich5991 702ed7e023 Reduce dummy map size from 549 bytes to 191 bytes 
Also include a tool to generate said map; the map is generated without
any hacks. It could likely be made smaller using a few tricks.
 2016-05-24 01:47:04 +02:00
def 61e47422f6 Clean up debug messages a bit (lower case, no useless errors) 2016-05-02 21:35:32 +02:00
heinrich5991 3a069093d7 Fix settings compare 
It was just using a heuristic, comparing the first 24 bytes. Memory unsafety
for configs that were shorter than 24 bytes.
 2015-08-27 16:20:56 +02:00
heinrich5991 cc0d0fa728 Fix config_store for old maps that don't contain MAPITEMTYPE_INFO 
Just add one in this case.
 2015-08-27 15:46:51 +02:00
heinrich5991 a945cca8a5 Fix datafile building before the file is open 2015-08-27 12:55:35 +02:00
heinrich5991 53d7e0dd4c Fix file opening in config_* tools 2015-08-27 12:55:35 +02:00
heinrich5991 d13ebf93a2 Add config_store and config_retrieve tool 2015-08-27 12:55:35 +02:00
def db2256e827 Fix a few whitespace-at-end-of-file issues 2015-08-22 15:27:41 +02:00
def bd62b5da79 Clean up a few compile warnings 2014-12-31 13:04:31 +01:00
oy 4073520214 cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
heinrich5991 72d5ef329b added tileset_borderrem and renamed tileset_bordercopy -> tileset_borderset 2011-12-29 14:36:00 +01:00
heinrich5991 5722592916 added tileset_borderadd, aesthetical changes 2011-12-29 14:35:51 +01:00
heinrich5991 f76c7a8873 fixed a bug with constants, made the macro more readable 2011-12-29 14:35:45 +01:00
heinrich5991 41daa3b110 added tileset_bordercopy tool 2011-12-29 14:35:33 +01:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy fc13cc6c18 cleaned up last commit 2011-07-11 11:26:41 +02:00
Romain Labolle 1058fe27f2 Allow multi-file input for dilate and tilset_borderfix commands 2011-07-11 11:22:04 +02:00
Choupom f1df704d78 fixed pnglite requiring a std header include 2011-05-03 18:44:46 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy 3250beb146 removed old master server files as the new one supports 0.5 and older now 2011-04-05 18:42:50 +02:00
Sworddragon 0efa2634f7 Fixed some compiler warnings 2011-04-03 22:35:11 +02:00
oy 62884920d3 fixed compiling of tileset_borderfix 2011-04-01 17:25:02 +02:00
Choupom c2ed5f7093 refactored tileset_borderfix 2011-03-31 22:58:49 +02:00
Choupom 979eca0095 refactored packetgen 2011-03-31 22:58:23 +02:00
Choupom e9ab42795a refactored dilate 2011-03-31 22:58:06 +02:00
oy 2a72c0b38b added a mechanism to check for a valid standard map. Closes #132 2011-03-31 15:13:49 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 0ae19e1339 removed support for old server infos 2011-03-04 18:14:08 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy 4a365d41b6 added fix for crash when there is no datadir 2010-08-05 20:34:16 +02:00
oy 665205327d added lost datadir override feature 2010-08-05 20:26:03 +02:00
oy 5988b9d388 - show connecting players with rcon status command 
- make it possible to limit the number of clients with the same ip that can connect to the server
 2010-06-03 14:48:32 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen cdc5f26900 new font rendering system using freetype2. only compiles under linux for now 2009-06-07 14:36:54 +00:00
Magnus Auvinen 9d3fd4a282 continued work on prediction and game timer 2009-01-24 14:32:12 +00:00
Magnus Auvinen f0760ac0d3 improved crapnet so it changes between different ping configurations. improved the game timer 2009-01-21 19:12:09 +00:00
Magnus Auvinen 24899a13e8 improved the prediction timer to handle crappy connections better 2009-01-21 00:05:07 +00:00
Jakob Fries b00dcd6807 added font generator 2009-01-15 21:34:56 +00:00
Magnus Auvinen 39370635cc fixed a few debug messages that spammed a bit too much 2009-01-10 12:27:15 +00:00
Magnus Auvinen 8acf5ed788 upgraded the master server code so it can handle more servers 2008-11-15 13:29:56 +00:00
Magnus Auvinen 94648bc304 fixed some config options for crapnet 2008-11-08 14:04:16 +00:00
Magnus Auvinen 9cbfe9c462 improved crapnet to beable to do packet reodering /home/kma/code/teeworlds/trunk/src/tools/crapnet.cpp 2008-10-20 19:59:33 +00:00
Magnus Auvinen 119b5af3d3 fixed a lot of network troubles 2008-10-19 09:10:55 +00:00
Magnus Auvinen d711dd190c continued with clean up 2008-08-17 08:52:24 +00:00
Magnus Auvinen 817f431377 moved out e_system, e_detect, vmath and math to a little base library 2008-08-14 17:19:13 +00:00
Magnus Auvinen 9d632dd826 major update. server clean up and much added documentation 2008-07-06 11:21:21 +00:00
Magnus Auvinen 34c3a1c142 new network code. not perfect. connectionless packets is missing so no server discovery is possible. reduced network traffic by A LOT 2008-04-05 14:50:43 +00:00
Magnus Auvinen bc108df382 renamed everything. added the new license 2008-03-22 18:40:27 +00:00
Magnus Auvinen 944cd68add loads of small fixes everywhere 2008-03-18 01:30:47 +00:00
Magnus Auvinen 4739966e14 larger restructure to improve security 2008-02-24 16:03:58 +00:00
Magnus Auvinen 548a919ea3 merged 0.3.4 changes to trunk 2008-02-10 21:54:52 +00:00
Magnus Auvinen a2566b3ebd cleaned up code structure a bit 2007-12-15 10:24:49 +00:00
Magnus Auvinen a0e5181e42 added license info 2007-11-25 19:42:40 +00:00
Magnus Auvinen daf89a01ff added skins, tweaked prediction like hell 2007-11-04 00:19:41 +00:00
Magnus Auvinen dab34697e7 added nameplates 2007-10-28 19:28:09 +00:00
Magnus Auvinen 19aaea9bfd fixed sorting for the server browsing. added mass server script that starts alot of servers 2007-09-29 13:16:00 +00:00
Magnus Auvinen fa05b5e2de begun the work for the new server browse backend 2007-09-27 23:55:59 +00:00
Magnus Auvinen ebbe51718e loads of changes. better prediction. line drawing. some nice graphs :) 2007-09-23 18:27:04 +00:00
Magnus Auvinen 3f4587ede8 a lot of changes. client side prediction added 2007-09-09 18:21:14 +00:00
Magnus Auvinen 8b3c16e615 major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell 2007-08-22 07:52:33 +00:00
Magnus Auvinen 640b2bd953 made so that you can bind the server to a specific address 2007-08-05 14:19:13 +00:00
Magnus Auvinen 8233a44b60 an update :D 2007-07-29 22:09:15 +00:00
Magnus Auvinen 1d34666164 fixed latency stuff, some gfx stuff 2007-07-26 19:09:31 +00:00
Magnus Auvinen cd492f54e1 fixed dilate.c 2007-07-25 09:18:51 +00:00
Magnus Auvinen 5bd2c434f6 epic commit. removed tga support, removed BGR support. fixed one config for editor, server and client, optimized tilemap rendering (this needs some cleanup), added tools to fix alpha outline quirk and glitches in the tilemap reindering 2007-07-24 22:53:43 +00:00