edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 18:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
9998 commits 1 branch 424 tags 417 MiB
Commit graph

9998 commits

This branch
This branch
All branches
Author SHA1 Message Date
def fd67259b77 Silence GCC warning 
src/game/editor/auto_map.h:47:9: warning: ‘*((void*)& NewConf +16)’ may be used uninitialized in this function [-Wmaybe-uninitialized]

I don't think it's an actual problem
 2020-05-23 18:11:35 +02:00
bors[bot] bdc309ad02
Merge #2201 
2201: Remove unused declaration r=heinrich5991 a=Zwelf



Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-05-22 14:56:34 +00:00
Zwelf 32085a091d Remove unused declaration 2020-05-22 16:38:20 +02:00
bors[bot] 3623f5e4cd
Merge #2200 
2200: Break save/load string into multiple lines r=def- a=Zwelf

I checked if the format string has changed with this c file: https://gist.github.com/Zwelf/12eb85c47e3ca0691db7710bec497bd6

```bash
$ gcc check.c 
$ ./a.out 
load string compare: 0
get string compare: 0
```

I also checked if the variable names matched with vim (by concatenating the lines with J) and the browser search functionality.

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-05-21 19:07:20 +00:00
Zwelf 8bdf41c1b5 Break save/load string into multiple lines 2020-05-21 18:04:15 +02:00
Andrii e78b8ac6d8 fix format issues 2020-05-21 00:44:52 +02:00
Andrii ed0b15859a follow naming convention 2020-05-21 00:44:52 +02:00
Andrii 0505a0b577 code formatting 2020-05-21 00:44:52 +02:00
Andrii ab79036873 Set camera position on LoadCurrentMap 2020-05-21 00:44:52 +02:00
Andrii e1828b88ab fix more format failures 2020-05-21 00:44:41 +02:00
Andrii 4f62389eda follow naming convention 2020-05-21 00:44:41 +02:00
Andrii 1ae3d5e69c add key binding description to find empty slot button 2020-05-21 00:44:41 +02:00
Andrii e132fac612 hide Entities popup after item selected 2020-05-21 00:44:41 +02:00
Andrii df6e7ef454 add condition for animations 2020-05-21 00:44:41 +02:00
Andrii b24f12cec8 fix previously made mistake 2020-05-21 00:44:41 +02:00
Andrii 29f093841c add switch empty slot finder button 2020-05-21 00:44:41 +02:00
Andrii 192d118c85 add binding for teleFindEmpty button 2020-05-21 00:44:41 +02:00
Andrii 1c870a3e1b fix some tele number picker issues 2020-05-21 00:44:41 +02:00
Andrii 1a5f0ed6a2 use shift instead of alt for load current map 2020-05-21 00:44:41 +02:00
Andrii 0f1af41911 add binding for tele/switch/speedup/tune button 2020-05-21 00:44:41 +02:00
Andrii d3df450715 add more conditions to menu rendering 2020-05-21 00:44:41 +02:00
Andrii c9afec083d add toggle grid key binding 2020-05-21 00:44:41 +02:00
Andrii f71c886e34 minor refactor 2020-05-21 00:44:41 +02:00
Andrii 63f185fe94 add LoadCurrentMap key binding 2020-05-21 00:44:41 +02:00
Zwelf 71b687cbd6 Remove unused ConSaveTeam, ConLoadTeam declarations 2020-05-21 00:44:30 +02:00
bors[bot] 2a3515200d
Merge #2195 
2195: BlockWorlds Entities r=heinrich5991 a=MikiGamer



Co-authored-by: MikiGamer <35080830+MikiGamer@users.noreply.github.com>
 2020-05-20 20:36:29 +00:00
bors[bot] 767e384f7b
Merge #2199 
2199: Fix storing incomplete game uuid on /save r=heinrich5991 a=Zwelf

Previously the formatted game uuid was cut off after 15 bytes. Therefore only 52 out of 128 bit of the uuid were stored.

introduced in 69fd7f1767

Tested /save and /load afterwards. /load shouldn't be affected at all, because the uuid isn't parsed anyway.

Co-authored-by: Zwelf <zwelf@strct.cc>
 2020-05-20 20:29:04 +00:00
Zwelf 61787168a6 Rename aGameUuid to m_aGameUuid for consistency 2020-05-20 22:22:02 +02:00
Zwelf cd015c5e37 Fix storing incomplete game uuid on /save 
Previously the formatted game uuid was cut off after 15 bytes.
Therefore only 52 out of 128 bit of the uuid were stored.

introduced in 69fd7f1767
 2020-05-20 22:18:14 +02:00
MikiGamer 015406d280 Changes 2.0 2020-05-20 16:16:41 +02:00
MikiGamer d5c5235c18 Changes 2020-05-19 17:13:34 +02:00
patiga 3f8bebd7af boundary check on curve type label in editor, avoids client crash 2020-05-19 16:52:30 +02:00
MikiGamer 95c419d684 BlockWorlds Entities 2020-05-19 16:49:28 +02:00
Dennis Felsing ffd0228191
Merge pull request #2188 from def-/pr-pred-collision-switch-0 
Fix crash in prediction when touching switch tile with number 0 (fixes #2182)
 2020-05-19 08:43:35 +02:00
heinrich5991 bb8f69d429 Appdata: Append content_rating tag 2020-05-19 01:55:08 +02:00
ElXreno 62ea622607 Appdata: Append releases tag 2020-05-19 01:55:08 +02:00
bors[bot] 6c1728f3b8
Merge #2192 
2192: Reserve bytes for the type and token r=heinrich5991 a=Learath2

I'm guessing this also caused #2149 

It just required a weird combination of players and name length to trigger (or max packet)...

Co-authored-by: Learath <learath2@gmail.com>
 2020-05-18 18:46:25 +00:00
Learath 850e4e84e4 Reserve bytes for the type and token 2020-05-18 21:13:15 +03:00
Learath 788fc8bb5f Update can happen when the gameserver doesn't exist 2020-05-18 16:17:06 +03:00
bors[bot] 6ac77b1e88
Merge #2191 
2191: write automapper version, was not initialized r=heinrich5991 a=Patiga

write automapper version, was not initialized

Co-authored-by: patiga <patigatus21@gmail.com>
 2020-05-17 22:41:07 +00:00
patiga 4bbd019423 fix whitespaces 2020-05-18 00:33:35 +02:00
heinrich5991 044aee2846 Fix compilation with mysql enabled 
Caused by #2171's 850f8e3f27.
 2020-05-18 00:29:15 +02:00
heinrich5991 bd022b77d0 Test antibot, mysql, websockets compilation on CI 2020-05-18 00:29:15 +02:00
patiga 359257f73a write automapper version, was not initialized 2020-05-17 23:28:10 +02:00
def 21c4df0771 Fix crash in prediction when touching switch tile with number 0 (fixes #2182) 
Just took the same code that we have on server side already
 2020-05-17 08:52:21 +02:00
bors[bot] e8a59482c3
Merge #2184 
2184: Don't Destroy if we didn't Init r=heinrich5991 a=Learath2



Co-authored-by: Learath <learath2@gmail.com>
 2020-05-16 20:14:38 +00:00
Learath 1426392ae7 Don't Destroy if we didn't Init 2020-05-16 23:10:42 +03:00
Dennis Felsing 898b4ce4b9
Merge pull request #2171 from Chairn/pr_loadsaveprintname 
Print name of requester when saving or loading team
 2020-05-16 17:41:34 +02:00
Chairn 850f8e3f27 Store client name in CSqlTeamSave/Load to ensure correctness of requester's name 2020-05-16 16:36:16 +02:00
bors[bot] 3c573cfd2f
Merge #2181 
2181: Some antibot fixes r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2020-05-16 08:06:53 +00:00