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

5655 commits

Author SHA1 Message Date
Dennis Felsing 3960dc36d8 Merge pull request #497 from BannZay/Int_step_edition 
PROPTYPE_INT_STEP mixed to PROPTYPE_INT_STEP + PROPTYPE_INT_SCROLL
 2016-07-03 23:31:12 +02:00
Dennis Felsing 45bf601570 Merge pull request #495 from heinrich5991/pr_ddnet_smaller_dummy_map 
Reduce dummy map size from 549 bytes to 191 bytes
 2016-07-03 23:26:42 +02:00
Dennis Felsing d68672009a Merge pull request #511 from heinrich5991/pr_ddnet_osx_monotonic 
Use the monotonic clock on OS X
 2016-07-03 23:25:39 +02:00
def 992c148dce Fix messages a bit 2016-07-03 23:23:33 +02:00
Dennis Felsing c323e178d9 Merge pull request #510 from timakro/pr_unlock_team_tile_msg 
Send chat message when team is unlocked by a tile
 2016-07-03 23:22:51 +02:00
def 866ffe8ef2 Fix mouse when opening editor with cl_editor 1 2016-07-03 23:16:43 +02:00
heinrich5991 d8e27027f8 Use the monotonic clock on OS X 2016-07-03 12:56:29 +02:00
Tim Schumacher 96d05e3370 Send chat message when team is unlocked by a tile 2016-06-30 17:55:34 +02:00
def 4681f69b1b Introduce cached ticks for client again, this time with workaround for 
particles. Hopefully not many other parts of the code will need this.
 2016-06-28 23:36:34 +02:00
def 071822d281 Use clock_gettime(CLOCK_MONOTONIC) instead of gettimeofday(). 
Seems to work fine. (The initial bugs I had with this were caused by my
system's clock being wrong)
 2016-06-28 23:30:35 +02:00
def 19feacb2ad Revert "Cache time on client as well" 
This reverts commit 987fad55cd.

Broke too many graphics animations, couldn't find a fix
 2016-06-28 02:51:26 +02:00
def 987fad55cd Cache time on client as well 
- Fixes FPS for me after suspend from 40 to 500 fps
- Should generally improve performance
- Might lead to a few problems where we need to call set_new_tick() in a
  few more positions, so test please
 2016-06-28 02:16:55 +02:00
H-M-H 35bd378a62 fixed RandomUnfinishedMap 
do not execute this function several times even after success
 2016-06-22 02:00:29 +02:00
def aeec3c6396 Add support for mousewheelleft and mousewheelright 2016-06-21 15:31:28 +02:00
def 8753620e42 Also use cl_reconnect_timeout on 'Too weak connection' 2016-06-19 02:17:23 +02:00
def e518a701a3 Clean up sql dbg_msg calls 2016-06-15 11:52:40 +02:00
def 3740deb89c Merge branch 'master' of github.com:ddnet/ddnet 2016-06-10 03:05:55 +02:00
def e0ec97174a Try to fix broken /map 2016-06-10 03:05:47 +02:00
heinrich5991 0244640aca Also don't send the token magic to unsupported clients 
Since only the client can initiate the secure session, there's basically
no reason to send this magic to clients which didn't advertise the
feature.
 2016-06-08 09:57:17 +02:00
Dennis Felsing 3dd2f23d45 Merge pull request #499 from heinrich5991/pr_ddnet_no_tokens_for_vanilla 
Don't send token to harmless vanilla clients
 2016-06-07 16:22:29 +02:00
heinrich5991 a2e64f0a16 Don't send token to harmless vanilla clients 2016-06-07 15:52:57 +02:00
def eef3980b18 Revert "Highlight own whispers in F1" 
This reverts commit 8d081140b0.
 2016-06-03 22:47:38 +02:00
def f1cdbe8696 More accurate ping by refreshing servers on second frame instead of first (might be caused by intial font rendering) 2016-06-03 19:50:49 +02:00
def d137d0c19d Merge branch 'master' of github.com:ddnet/ddnet 2016-06-03 11:30:33 +02:00
def 097b6cabf3 Fix cut off names in scoreboard (still overlap with clan though) 2016-06-03 11:30:20 +02:00
Andrew e6eb607cc8 PROPTYPE_ANGLE_SCROLL mixed 2016-06-02 17:53:52 +03:00
Andrew a624db90b4 editeable proptype_int_step 2016-06-02 14:50:06 +03:00
HMH bb9d23bb73 sql-save: forgot a line 2016-05-31 12:32:09 +02:00
HMH 28d116217b fixed resetting of saving-state of teams (was not reset always) 
destructor of CSqlTeamSave takes care of that now
while doing so the allocation of CSaveTeam has been moved to the stack
 2016-05-31 00:03:28 +02:00
H-M-H ada3b9a5db Merge pull request #378 from H-M-H/sqlmasters 
separate sqlwrite and sqlread server
 2016-05-28 23:00:16 +02:00
rbmz 8d081140b0 Highlight own whispers in F1 2016-05-27 08:33:43 -03:00
heinrich5991 4d6657e3f1 Fix CRC of dummy map 2016-05-26 11:06:56 +02: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
heinrich5991 e353aa80b2 Don't send uninitialized memory over the network 2016-05-23 11:48:23 +02:00
def 63b92b729e Fix completion rendering on new input 2016-05-22 21:31:35 +02:00
def 0217a76771 accept input when opening, but not at first frame to discard the input that caused the console to open (fixes #443 again) 2016-05-22 21:23:33 +02:00
def d1770e4aa5 Version 10.1.1 2016-05-22 12:17:59 +02:00
def c437170856 Fix cl_showhud_score 2016-05-22 12:12:02 +02:00
def f193099f94 Version 10.1 2016-05-22 02:20:51 +02:00
def 1d98ff031c Immediately accept input while console is still opening (fixes #484) 2016-05-22 02:12:52 +02:00
def 3d3827a57d Don't render brush when picker is shown 2016-05-22 02:01:22 +02:00
def 668b0b887d Clean up modifier button 2016-05-22 01:43:33 +02:00
Dennis Felsing ba012a353b Merge pull request #483 from BannZay/mixedButtons 
Switcher,speeduper,tuner,teleporter mixed to one button
 2016-05-22 01:30:17 +02:00
def 86495bbad0 Add support for old race server racetime messages in HUD, including checkpoint time difference 2016-05-22 01:26:15 +02:00
HMH ea5892b1ce don't clear sql-mapstring twice 2016-05-21 22:53:49 +02:00
def af8317c2e9 Don't allow restarting after touching finish line on solo server 2016-05-21 21:51:38 +02:00
H-M-H b648b530d5 Merge branch 'master' into sqlmasters 2016-05-20 23:40:29 +02:00
def 3c54f443b2 Make sv_join_vote_delay work for /map votes and make the number of seconds configurable 2016-05-20 20:05:47 +02:00
def aff85462aa Update messages a bit 2016-05-20 18:36:32 +02:00
def ede6a9f93f More uniform /times output (thanks Soreu) 2016-05-20 18:28:33 +02:00
Tim Schumacher 22ad56486a revert automatically add linebreaks in broadcasts 2016-05-19 21:53:01 +02:00
Tim Schumacher 96bcedec29 just set first char of ddnet filter to zero 2016-05-19 15:54:52 +02:00
Tim Schumacher dae855ee9f clear ddnet filter strings before appending 2016-05-19 15:51:48 +02:00
def 1645310750 Keep reading packets after invalid control packet 2016-05-17 23:44:57 +02:00
def bb634d7641 Reconnect to last server address, not the one selected in browser 2016-05-17 18:56:33 +02:00
HMH c4843868c4 do not log the sql-passwords 2016-05-16 15:41:52 +02:00
HMH a073d22509 set timeout for sql-reads/writes 2016-05-16 15:37:51 +02:00
Andrew adab934c99 Switcher,speeduper,tuner,teleporter mixed to one button 2016-05-15 18:17:57 +03:00
Tim Schumacher aeadffa585 calculate type height in ddnet browser type filter 2016-05-15 10:19:15 +02:00
Tim Schumacher 434b9345d8 automatically add linebreaks in broadcasts 2016-05-15 10:19:15 +02:00
def d2f5714042 Sort file names case-insensitively 2016-05-15 00:06:32 +02:00
def 475df14134 Fix editor popups a bit 2016-05-14 15:16:52 +02:00
def d6ca9dcb7b Version 10.0.3 2016-05-14 01:17:51 +02:00
def d1275f239a cl_show_ids also shows ID in chat (fixes #454) 2016-05-14 01:17:18 +02:00
def ff747953b4 Make envelopes unsynchronized by default and explain the setting better (fixes #479) 2016-05-14 00:42:40 +02:00
def b0b2774695 Clean up other paste code a bit 2016-05-11 18:00:27 +02:00
def b7d4beccea Fix buffer overflow when pasting text (thanks to Im 'corneum) 2016-05-11 17:51:27 +02:00
H-M-H 2bcbe52d14 fixed /load message 2016-05-11 15:54:09 +02:00
H-M-H 42fc8a0fe2 fixed use of Str and ClrStr 2016-05-11 15:26:16 +02:00
H-M-H 6a2438e1cf fixed includes 2016-05-11 15:01:53 +02:00
def 03a48dd09f Add code to remove unused tiles on game and front layers (commented out) 2016-05-11 12:13:54 +02:00
def 695bf346ac Make gfx_refresh_rate functional (fixes #255) 2016-05-10 17:43:27 +02:00
def 2fc2515e0f Fix DDNet server browser to refresh only once on start, not twice 2016-05-10 12:40:33 +02:00
H-M-H 3b6baaa8d3 made CSqlData const for threadfunctions and added a class for sqlstrings 
CSqlData is const for threadfunctions now to avoid modification from
within the threadfunctions as these might be called several times.
Previously this was a problem as ClearString could possibily be applied
multiple times to the same string.

To solve this the class CSqlString has been added. This class takes a
const char* and copies it. Additionally a clearstring is created from
the given const char*. This enables access to the original as well as
the cleared string safe for sql-statements.

sql_string_helpers got an own source file now.

A crashbug from CSqlServer has been fixed (pointer has not been set
back to 0)
 2016-05-09 23:35:23 +02:00
heinrich5991 fe3e05cee5 Merge pull request #474 from Henningstone/pr-ddnet-chat-input-jump 
Jump to special characters with CTRL+arrowkeys in chat input
 2016-05-09 18:07:41 +02:00
def 37e822ba0f Version 10.0.2 2016-05-08 19:41:06 +02:00
def f3a4069867 Set gfx_highdpi to 0 as default (needs someone to fix it on Win >= 8.1 and Mac) 2016-05-08 19:40:53 +02:00
Dennis Felsing 6c771f6bff Merge pull request #475 from east/timeoutprotfix 
Copy resendbuffer on timeout protection
 2016-05-07 23:41:54 +02:00
def 461a09451d Improve handling of multiple screens and missing screens 2016-05-07 23:19:46 +02:00
def 642e7f7671 Still hide window at start (fixes fullscreen in Gnome) 2016-05-07 21:16:31 +02:00
east 1cbaa0c4ef copy resendbuffer on timeout protection 2016-05-07 19:28:16 +02:00
def 9bd30ce447 Make high-dpi screen support optional 2016-05-07 17:47:05 +02:00
def 4631a7cfa6 Try to enable HighDPI (untested) 2016-05-07 16:35:31 +02:00
def e0ee7a2bb9 Merge branch 'master' of github.com:ddnet/ddnet 2016-05-07 16:12:41 +02:00
def bfcf0c4067 Fix auto reconnect abortion 2016-05-07 16:12:23 +02:00
def 25fda2751c Fix "vanilla skins only" setting in menu 2016-05-07 15:59:58 +02:00
def 340c4d2398 Leave it up to the WM where to position windows 2016-05-07 15:59:40 +02:00
def c325b08087 Add inp_mouseold for warped mouse input 2016-05-07 15:59:13 +02:00
Henningstone 6a10c96e02 Fix cursor behaviour when skipping backwards 2016-05-07 01:01:56 +02:00
Henningstone cdc37493c2 Removed the check for uppercase letters 2016-05-06 19:48:36 +02:00
Henningstone 997713f9a1 Jump to special characters with CTRL+arrowkeys in chat input 2016-05-06 17:16:31 +02:00
Tim Schumacher d80d2de134 fix tab 2016-05-06 16:45:30 +02:00
def f2100fbad7 Change window focus handling (disable input grab when focus lost) 2016-05-06 11:29:34 +02:00
def 939f2136c0 Nicer way of handling Mac fifo rewinding (just don't use high level file streams) 2016-05-05 23:32:55 +02:00
Dennis Felsing 838364b713 Merge pull request #469 from H-M-H/fifo_mac_fix 
always read fifo from start
 2016-05-05 21:23:52 +02:00
H-M-H 319729e207 ifdef for rewind as it is only required of OS X 2016-05-05 21:15:15 +02:00
H-M-H 491d878a64 always read fifo from start 2016-05-05 20:29:31 +02:00
def 41f34aa187 Add vanilla check for entities_clear 2016-05-05 20:21:34 +02:00
def 072eadbb99 Use DDNet entities by default, fixes seeing unhookable from start (thanks to kamillentee) 2016-05-05 20:17:13 +02:00
Dennis Felsing bc907f319d Merge pull request #467 from timakro/master 
rename some auto game tile placers
 2016-05-05 18:59:53 +02:00
Dennis Felsing 47455fa78b Merge pull request #468 from timakro/pr_fix_editor_gametiles_automapper_overlap 
fix editor gametiles automapper overlap
 2016-05-05 18:59:41 +02:00
Dennis Felsing e7af8cfdd7 Merge pull request #466 from Ryozuki/pr_showpred 
Fixed cl_showping (now cl_showpred)
 2016-05-05 18:59:01 +02:00
def 513c742197 Fix cl_antiping_players to be off on solo (thanks HMH) 2016-05-05 18:57:35 +02:00
def 14f1670fda Fix fifo console to remove newline character at end 2016-05-05 18:48:15 +02:00
Tim Schumacher 78f8c9978d fix editor gametiles automapper overlap 2016-05-05 18:40:38 +02:00
Tim Schumacher afd0e5a3eb rename some auto game tile placers 2016-05-05 18:23:04 +02:00
Ryozuki 82d2a994ed Fixed cl_showping (now cl_showpred) 2016-05-05 18:07:00 +02:00
H-M-H 4bf1a68292 do not write nullbytes to failed_sql.sql 2016-05-05 13:23:35 +02:00
Henningstone 77b584c12f Forbid showing /top5 from rank 0 on 2016-05-05 01:33:28 +02:00
H-M-H 931d99e4c2 also destroy locks created by CSqlServer 2016-05-04 23:39:16 +02:00
H-M-H 30ca8d8774 made writing to sql-failurefile threadsafe 2016-05-04 23:37:34 +02:00
gamertyp b479dd412c Removed a tab 2016-05-04 23:37:02 +02:00
gamertyp e9378973de Re-ordered the Gametiles-menu 2016-05-04 22:33:10 +02:00
gamertyp 7a3f96431a Re-ordered the Gametiles-menu 2016-05-04 22:30:16 +02:00
def 2df9c79483 proper str_copy size (fixes #461) 2016-05-04 18:43:54 +02:00
def 1b668047c8 Clean up auto reconnect and make it independent of rendering 2016-05-04 18:23:00 +02:00
H-M-H 5dc47ede58 put sql_string_helpers into an own namespace 2016-05-04 16:51:18 +02:00
H-M-H a7c0cd58ee fixed birthdaycheck and the format of sql-inserts for the failure-file 2016-05-04 16:47:53 +02:00
def 45971ee8e9 no player antiping when appropriate tunings set 2016-05-04 16:01:58 +02:00
H-M-H cd41220a44 wait for score-threads on shutdown 2016-05-04 15:32:24 +02:00
H-M-H 13688bbb2a fixed indentation 2016-05-04 00:27:03 +02:00
H-M-H e351080dd3 removed double semicolons 2016-05-04 00:24:54 +02:00
H-M-H a93e845e6d checkbirthday now also sends a broadcast to the 'birthdaychild' 2016-05-03 23:50:42 +02:00
H-M-H 94f163f094 added CSqlPlayerData for simple tasks like getting best time 2016-05-03 23:24:44 +02:00
H-M-H c9e65c7931 Merge branch 'master' into sqlmasters 2016-05-03 23:07:24 +02:00
H-M-H c9b64053d0 cleaned up structure of sql_score.cpp 2016-05-03 20:45:58 +02:00
H-M-H d0cebb576d sql-score can now handle mapchanges/reloads 2016-05-03 20:36:17 +02:00
Henningstone be010ff370 Fixed crashbug in fifo.cpp 2016-05-03 19:17:44 +02:00
Dennis Felsing 230784d234 Merge pull request #458 from Ryozuki/pr_showping 
Added cl_showping
 2016-05-03 16:12:30 +02:00
Ryozuki 5c7856ee59 Added cl_showping 2016-05-03 16:06:10 +02:00
def 43479e3768 Comment m_InpuIgnoredModifiers a bit 2016-05-03 15:30:46 +02:00
def bad26a3a8a Pressing shift makes slider move slower (fixes #455) 2016-05-03 15:11:52 +02:00
def a954241169 style 2016-05-02 23:37:40 +02:00
def 21ac41bfae Clean up fifo console 2016-05-02 23:36:21 +02:00
def 61e47422f6 Clean up debug messages a bit (lower case, no useless errors) 2016-05-02 21:35:32 +02:00
def a8ce73dffa Comment m_InpuIgnoredModifiers a bit 2016-05-02 18:21:54 +02:00
Tim Schumacher 50f9e37282 disable deepfly patch applied at wrong position 2016-05-02 16:25:34 +02:00
def 8af1e59fc6 Version 10.0.1 2016-05-01 23:11:11 +02:00
def a9ed7035ee Add inp_ignored_modifiers to ignore set of keyboard modifiers 2016-05-01 23:07:19 +02:00
def 7e7bfcddd2 Fix console autocompletion (fixes #451) 2016-05-01 20:30:34 +02:00
def 28571e9cb5 Damn Windows XP 2016-05-01 20:23:14 +02:00
def 0bab90aa20 ALT modifier has no special meaning for key input 2016-05-01 19:57:38 +02:00
def 487de16200 Anotehr WinXP fix 2016-05-01 19:56:18 +02:00
def dc45ecbe6d Try to fix du.bat 2016-05-01 19:56:13 +02:00
def c683703df0 Fix system.c for C89 2016-05-01 19:35:21 +02:00
def 2a92a171da Merge branch 'master' of github.com:ddnet/ddnet 2016-05-01 19:34:40 +02:00
def f6518e4d25 Remove unesed cl_version_server 2016-05-01 19:34:33 +02:00
def a4840cdfd3 Fix ed_showkeys with mousewheel 2016-05-01 19:34:16 +02:00
Dennis Felsing 07aa6c6d9b Merge pull request #449 from timakro/master 
added auto game tile placer for hookthrough & show button to mapper when placing unused tiles
 2016-05-01 18:18:30 +02:00
Tim Schumacher aeea3777a3 show button to mapper when placing unused tiles 2016-05-01 18:12:20 +02:00
Tim Schumacher e61456f381 added auto game tile placer for hookthrough 2016-05-01 17:44:02 +02:00
def b6733a1827 Update credits 2016-05-01 17:14:02 +02:00
def faa576e73d Another mouse fix try 2016-05-01 15:34:36 +02:00
def 981533e177 More mouse fixes with SDL2 2016-05-01 15:20:52 +02:00
def 143fd88c2a Ignore relative mouse movement when in absolute mouse mode 2016-05-01 15:02:08 +02:00
def 644a23ba57 Fix folder creation 2016-05-01 14:45:47 +02:00
def ab13a0086d Updater: Support downloading files into new directories 2016-05-01 14:20:55 +02:00
def 779c6d2508 Only move cursor when window has mouse focus 2016-05-01 14:00:53 +02:00
def 32db2e6915 Updater: Support DLLs for win32 and win64 2016-05-01 13:11:51 +02:00
def 88780b8fbc Use new ddnet update server 2016-05-01 12:09:02 +02:00
def 29a26a6633 Version 10.0 2016-05-01 12:07:16 +02:00
def 15fa9f7b74 minor fix: false instead of SDL_FALSE 2016-05-01 11:39:40 +02:00
def 6b3e0981a1 Case-insensitive 2016-05-01 11:23:56 +02:00
def 53a7623191 Updater special handling for ttf files (same as dll) 2016-05-01 11:23:32 +02:00
def a1151fd296 ban -> Timeout 2016-05-01 11:15:45 +02:00
def 13143eac23 Reconnect for timeout instead of bans, some simplification 2016-05-01 11:12:07 +02:00
Dennis Felsing bd40eec54f Merge pull request #446 from timakro/pr_improve_hookthrough_shortcut 
hookthrough shortcut now works for game and front
 2016-05-01 10:13:33 +02:00
def f6399654c1 Merge branch 'master' of github.com:ddnet/ddnet 2016-05-01 03:28:52 +02:00
def cc002d244d Fix gfx_resizable to be on by default with X11 2016-05-01 03:28:41 +02:00
Dennis Felsing 1ccbc7a69b Merge pull request #447 from timakro/pr_dont_remove_unused_tiles 
dont remove unused tiles
 2016-05-01 02:50:09 +02:00
Tim Schumacher 01024252b5 fix editor buttons for 5:4 resolutions 2016-05-01 02:34:06 +02:00
Tim Schumacher 04887e44f8 remove useless function 2016-05-01 01:54:37 +02:00
Tim Schumacher 70ffbbbbf9 hookthrough shortcut now works for game and front 2016-05-01 01:47:29 +02:00
def 915bce38fc Toggling console with custom bind doesn't print that key on console (fixes #443) 2016-05-01 00:26:03 +02:00
def 72a6e20ba8 Split CInput::NextFrame() from CInput::Update() (fixes #444) 2016-05-01 00:18:25 +02:00
def a0a7d96ca0 Fix statboard bind 2016-04-30 23:39:42 +02:00
def d1b87e6794 Fix resolution on Mac OSX (fixes #445) 2016-04-30 23:10:09 +02:00
def f79bdf69a5 typo 2016-04-30 22:55:21 +02:00
Tim Schumacher f1b6848d85 dont remove unused tiles 2016-04-30 22:37:17 +02:00
Dennis Felsing 44d16d2374 Merge pull request #441 from timakro/master 
fix hooktele on unhook, broke with new hookthrough
 2016-04-30 21:29:27 +02:00
def 2cc236cb8c Make spectator work again 2016-04-30 21:28:44 +02:00
Tim Schumacher 3378811ecf fix hooktele on unhook, broke with new hookthrough 2016-04-30 21:13:54 +02:00
Dennis Felsing f016a0eb1f Merge pull request #436 from timakro/pr_other_gametype_entities_clear 
added entities clear for other gametypes
 2016-04-30 20:28:27 +02:00
def 0385c3b520 Workaround for global hotkeys causing SDL keydown events 2016-04-30 20:27:47 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 1446adee2c Window resizing only with X11 (not on Windows and Mac OS X) 2016-04-30 19:19:19 +02:00
def 0667864657 Fix double click in demos menu 2016-04-30 18:18:22 +02:00
def df12171040 Merge branch 'master' of github.com:ddnet/ddnet 2016-04-30 18:00:08 +02:00
def 644fec7e55 Resize window without restarting client 2016-04-30 17:59:58 +02:00
Tim Schumacher 0a972185dc prevent placing unused entity tiles in game layer 2016-04-30 11:02:00 +02:00
def 74f4ad77d6 fixed utf8 text input from tw master 2016-04-30 04:02:32 +02:00
def 502c5aa3cb Ignore keys after window regained focus 2016-04-30 03:32:23 +02:00
def 26c9c39004 Disable HighDPI displays 2016-04-30 03:32:01 +02:00
def 9b20d3a0ad Fix relative mouse 2016-04-30 02:06:41 +02:00
def 2a7aa33830 Normal mouse speed again 2016-04-30 00:52:43 +02:00
def 7a5b79e48a More SDL2 graphics goodness, partially from TW master 2016-04-30 00:43:11 +02:00
def 11e3fd55db seperated ingame input handling from rendering (from TW master) 2016-04-29 23:05:20 +02:00
def abbf2f7e69 Merge branch 'master' of github.com:ddnet/ddnet 2016-04-29 22:56:20 +02:00
def 1727dd5a72 Some early SDL2 Android fixes 2016-04-29 22:56:13 +02:00