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

15714 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] 64f78fced9
Merge #2205 
2205: Implement /unlock & clarify the /help lock text r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-05-24 20:24:02 +00:00
heinrich5991 f339fea748
Merge pull request #2139 from edg-l/pr_add_upnp 
Add UPnP support
 2020-05-24 22:23:20 +02:00
Edgar 3569e174f2
refactor upnp code 2020-05-24 11:36:43 +02:00
bors[bot] f18c42c5ba
Merge #2208 
2208: Implement /load without params to show some info r=Learath2 a=def-

about your existing saves. Not the code of course, but only how many saves you have and when you last saved on this map.

Co-authored-by: def <dennis@felsin9.de>
 2020-05-23 20:20:12 +00:00
bors[bot] 5cddef7efe
Merge #2209 
2209: singular player in team start message r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-05-23 20:12:36 +00:00
bors[bot] a1f405aa5c
Merge #2210 
2210: Fix name schema for char-arrays r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2020-05-23 20:06:42 +00:00
def a412773e5a Fix name schema for char-arrays 2020-05-23 21:55:22 +02:00
def 7c966bebc3 singular player in team start message 2020-05-23 21:53:12 +02:00
def c45995a010 Implement /load without params to show some info 
about your existing saves. Not the code of course, but only how many
saves you have and when you last saved on this map.
 2020-05-23 19:46:12 +02:00
bors[bot] 8c5bf3eb38
Merge #2207 
2207: Silence GCC warning r=heinrich5991 a=def-

```
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

Co-authored-by: def <dennis@felsin9.de>
 2020-05-23 16:20:51 +00:00
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
def 37e0a33da2 Also introduce /unlock as an alias of /lock 0 2020-05-23 17:55:56 +02:00
def d4452dd6e0 Clarify the /help lock text 2020-05-23 17:15:04 +02:00
heinrich5991 0d7872c79e Send DDNet version early in the connection process 
This gets rid of the problem that we don't know whether we should send
full snapshots to clients because they haven't told us about them being
DDNet yet.
 2020-05-22 17:58:41 +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