Commit graph

17962 commits

Author SHA1 Message Date
ACTom 02107fd2c9 Merge pull request #1 from ddnet/master
Merge ddnet/ddnet
2016-09-01 21:08:53 +08:00
Dennis Felsing f3f6338ed1 Merge pull request #540 from Speedy-Consoles/master
Reliable 1-tick unfreeze
2016-08-28 10:10:06 +02:00
Speedy Consoles 39704a04a7 made 1-tick unfreeze reliable 2016-08-27 18:03:50 +02:00
Dennis Felsing e552e2df69 Merge pull request #538 from ACTom/master
Fix editor cannot input
2016-08-26 23:59:15 +02:00
ACTom 363d0f81a4 Fix editor cannot input
fix bug that press ctrl+shift+e enter editor and cannot input anything.
fixed by TsFreddie
2016-08-27 02:29:57 +08:00
Dennis Felsing 1b9c695652 Version 10.3 2016-08-24 11:11:20 +02:00
BannZay 6f99d05ef6 Merge remote-tracking branch 'upstream/master' into openCurrentMap 2016-08-23 14:40:13 +03:00
BannZay c658411f15 Load Current Map button added 2016-08-23 14:29:53 +03:00
Dennis Felsing d3f04a9470 Remove accidental code 2016-08-23 12:42:01 +02:00
Dennis Felsing 5b419914fa Merge pull request #534 from BannZay/disabling-dCopyMoves-after-disconnect
dCopyMoves disabling when Dummy disconnecting
2016-08-23 08:09:43 +02:00
def c91ef1ea81 str_append instead of strcat 2016-08-21 21:14:41 +02:00
def 2aa3303884 Longer team ranks 2016-08-21 21:06:12 +02:00
BannZay d78c565f8a dCopyMoves disabling when Dummy disconnecting 2016-08-21 16:22:46 +03:00
Dennis Felsing aa3575e252 Merge pull request #532 from BannZay/editor-searchBar
editor map SearchBar added
2016-08-21 04:20:05 +02:00
BannZay 52d8efdfde editor searchBar added 2016-08-21 03:06:01 +03:00
Dennis Felsing 585f9e572f Merge pull request #530 from TsFreddie/master
Full Asian IME support.
2016-08-16 23:53:09 +02:00
Freddie Wang 7aa7e463e0 fix keystroke hold after send the chat 2016-08-14 23:02:07 -07:00
Freddie Wang e5f23cd87c Added full IME support
Now with display of editing text.
2016-08-14 22:16:06 -07:00
Freddie Wang 51a7b01190 temporary ime fix
Fixed Asian IMEs which need to press enter to confirm candidate text.

Disabled keyinput while editing candidate in IME.
2016-08-14 21:01:31 -07:00
Dennis Felsing 1990707d68 Merge pull request #527 from heinrich5991/pr_no_compressed_control
Disallow compressed control messages
2016-08-13 00:39:42 +02:00
heinrich5991 884ad25204 Disallow compressed control messages 2016-08-12 18:41:03 +02:00
Dennis Felsing 2f9f3234a8 Fix mastersrv, twping compilation with libwebsockets 2016-08-12 08:47:17 +02:00
def 320c299b68 Fix laser code 2016-08-07 22:38:45 +02:00
def 28f50e4440 Revert "Implement comma in search and exclude queries to separate search terms"
This reverts commit 3341e18d13.
2016-08-07 00:52:00 +02:00
def 5b19be992d C89 fix 2016-08-03 00:24:58 +02:00
Dennis Felsing 13c872eb1e Merge pull request #523 from heinrich5991/pr_ddnet_bam_45_second_take
Hopefully fix a problem bam.lua that I don't see locally
2016-08-03 00:22:19 +02:00
heinrich5991 1ce581cab5 Hopefully fix a problem bam.lua that I don't see locally
Error message is:

    configure.lua:6: bad argument #1 to 'setfenv' (number expected, got nil)
2016-08-03 00:17:30 +02:00
Dennis Felsing fb5c34da4e Merge pull request #522 from heinrich5991/pr_ddnet_bam_45
Add bam 0.5.0 support while retaining 0.4.0 compatiblity
2016-08-03 00:11:30 +02:00
def c308c348cb Merge branch 'Display tee position in editor proof' 2016-08-03 00:11:10 +02:00
def 126b52a639 Merge branch 'Fix clear entities for ddrace gametype' 2016-08-03 00:10:35 +02:00
heinrich5991 64ca2cfde9 Add bam 0.5.0 support while retaining 0.4.0 compatiblity 2016-08-03 00:03:50 +02:00
def 3341e18d13 Implement comma in search and exclude queries to separate search terms 2016-08-02 22:16:02 +02:00
def 3b4381cf8e Version 10.2.1 2016-07-26 20:29:02 +02:00
def af250dd74e Fix colors in tele number selection 2016-07-26 20:28:30 +02:00
def e8dac3346a Fix veto 2016-07-20 20:56:22 +02:00
Tim Schumacher a99a9fecfc Display tee position in editor proof 2016-07-18 08:55:35 +02:00
Tim Schumacher a5a7451590 Fix clear entities for ddrace gametype 2016-07-18 08:54:30 +02:00
H-M-H a4a841c0f9 fix timer on macOS 2016-07-10 16:07:21 +02:00
def aab3beb3b0 Veto right for start and join time 2016-07-08 18:28:33 +02:00
Dennis Felsing 8b10d15845 Merge pull request #509 from timakro/pr_no_disconnect_timeout
Don't send disconnect on timeout
2016-07-08 17:25:43 +02:00
Tim Schumacher 46b75886c9 Don't send disconnect on timeout 2016-07-08 17:00:47 +02:00
def 0688229f0d Forbid names starting with /, as they can be abused to make people write chat commands 2016-07-08 16:38:05 +02:00
def d5a2df5e63 Version 10.2 2016-07-03 23:33:53 +02:00
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