Commit graph

3976 commits

Author SHA1 Message Date
heinrich5991 d2e39d2f50 Add CMake
(cherry picked from commit ee2afdac33)
2018-12-25 21:54:26 +01:00
oy f20f509cf2 Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-12-25 09:18:59 +01:00
oy 4f7a52184a fixed disabling the xmas hats. closes #1929 2018-12-25 09:18:31 +01:00
oy b2b5de4a60
Merge pull request #1928 from heinrich5991/pr_doc_inpgrab
Document `inp_grab` a little
2018-12-25 01:58:42 +01:00
heinrich5991 a69feb7844 Document inp_grab a little
Got the info from https://forums.libsdl.org/viewtopic.php?t=11838.
2018-12-24 23:12:14 +01:00
Jordy Ruiz b4101dcb59
Merge pull request #1925 from Dune-jr/fix-xmas
Fix Christmas time detection
2018-12-24 17:52:35 +01:00
Jordy Ruiz 0cebd1bcad Fix Christmas time detection 2018-12-24 13:03:55 +01:00
oy 5754796af1 updated version to 0.7.2 2018-12-24 10:56:33 +01:00
oy 0cc8e8530d close the motd if we actively wanna look on the scoreboard. closes #1920 2018-12-24 10:54:02 +01:00
oy 8f2f42ee3a re-added inp_grab to support old mouse warping input. closes #1910 2018-12-24 10:43:54 +01:00
oy 35aa848de0
Merge pull request #1921 from Dune-jr/feature-ingameplayermenus
Restore ingame Player and Tee menus, add a warning that a reconnect is needed
2018-12-24 10:19:58 +01:00
Jordy Ruiz 7337a1e66f Fixed warnings overlapping with some Skin menus buttons 2018-12-24 02:28:14 +01:00
Jordy Ruiz 1a819df677 Fix some variable naming 2018-12-24 02:13:46 +01:00
Jordy Ruiz c3d08d5c49 Restore Player and Tee ingame menus, add a reconnect warning 2018-12-24 02:13:19 +01:00
oy 09dd6e9301 don't render the scoreboard when the motd is active. closes #1899 2018-12-22 19:16:23 +01:00
oy e76148caf9 added additional info in case the execution of a config failed. closes #1872 2018-12-22 19:10:22 +01:00
oy e21c5d85d1
Merge pull request #1913 from LordSk/feature/demolist_markers
Demo list marker indicator
2018-12-22 18:47:21 +01:00
oy 1586009718 secret santa update 2018-12-22 18:39:38 +01:00
oy 0324e4ee35
Merge pull request #1915 from LordSk/fix/menu_general_numoptions
Fixed general menu NumOptions
2018-12-22 16:14:42 +01:00
LordSk 8266553bf9 Fixed NumOptions 2018-12-22 11:59:48 +01:00
LordSk 37f288e211 Don't use LastActiveItem(), check if the item was clicked instead 2018-12-22 11:42:11 +01:00
oy 50f6f5d54a removed debug related code 2018-12-21 20:02:45 +01:00
oy f41bb0c12b
Merge pull request #1912 from LordSk/fix/broadcast_newline
Broadcast: parse new line character
2018-12-21 19:47:19 +01:00
LordSk ca41532eea Indicate "not loaded" status with a grey icon 2018-12-21 19:18:49 +01:00
LordSk 632b12b207 Removed unnecessary check 2018-12-21 18:32:02 +01:00
LordSk 6d12b4ca3a Green colored icon when demo has markers, display maker count in the demo info section 2018-12-21 18:22:22 +01:00
LordSk 4084242c40 Fixed list item double click, + a minor optimization 2018-12-21 17:55:27 +01:00
LordSk 215fc5d214 Broadcast: parse new line character 2018-12-21 14:18:57 +01:00
oy 157c2d1816
Merge pull request #1904 from Dune-jr/feature-colorful-browser
Always use colorful gametype and level icons in the browser instead of grayscale
2018-12-19 16:19:24 +01:00
oy 9099a697c2 fixed empty vote when joining a server. closes #1887 2018-12-18 17:59:18 +01:00
Jordy Ruiz 9bd444ac22 Always use colorful gametype and level icons in the browser instead of the grayscale 2018-12-18 15:19:08 +01:00
oy 7447482152
Merge pull request #1895 from Dune-jr/adjust-uid-msgdisplay
Adjust chat messages to not display UID when option is turned off
2018-12-17 17:58:00 +01:00
oy ffc7ebd5c7
Merge pull request #1898 from LordSk/fix/serverbrowser_entry
Fixed server browser entry text color & close region
2018-12-17 17:26:00 +01:00
oy 99d12c9fbb small improvement 2018-12-17 17:20:01 +01:00
LordSk 1bee77e041 Pass text color to detail scoreboard 2018-12-17 17:19:27 +01:00
oy 2e63d28a2d
Merge pull request #1897 from Dune-jr/feature-abortchatwhenleave
Cancel whisper when target leaves
2018-12-17 17:11:44 +01:00
Jordy Ruiz c7155e0ce8 Cancel whisper when target leaves 2018-12-17 17:08:10 +01:00
oy 7ff37cb9b9 added a fallback system in case a graphic card don't support the texture3D size we need for the tilesets. closes #1888 2018-12-17 17:04:45 +01:00
oy 4373ab0784
Merge pull request #1896 from Dune-jr/fix-missing-locales
Add Localize comments to fix the string export scripts (#1891)
2018-12-17 16:33:49 +01:00
Jordy Ruiz 327a2283b8 Add Localize comments to fix the string export scripts 2018-12-17 16:14:36 +01:00
oy c92f044f39
Merge pull request #1893 from Dune-jr/feature-ready-notification
Notify players which key they should press to set themselves ready
2018-12-17 15:52:04 +01:00
oy 74d05d4969
Merge pull request #1892 from Dune-jr/add-difficultyinfo
Add difficulty info to the ingame menus
2018-12-17 15:49:41 +01:00
oy db03a488da
Merge pull request #1890 from Dune-jr/fix-uid-blend
Properly blend UID in chat
2018-12-17 15:47:08 +01:00
LordSk 7c9e040a8a Fixed entry closing when clicking on server details 2018-12-17 14:56:04 +01:00
Jordy Ruiz 88622ec94d Adjust chat messages to not display UID when option is turned off 2018-12-17 14:33:23 +01:00
Jordy Ruiz b375ce4077 Notify players which key they should press to set themselves ready 2018-12-17 12:55:04 +01:00
Jordy Ruiz 4186569040 Add difficulty info to the ingame menus 2018-12-17 12:25:12 +01:00
Jordy Ruiz 171f1c39d3 Properly blend UID in chat 2018-12-17 11:58:49 +01:00
oy b1a6d9e3f0 fixed score reset when warmup ends. closes #1885 2018-12-16 13:10:54 +01:00
oy 5ec0efd424
Merge pull request #1871 from sepulzera/fix-1841
Fix change_map command not always changing (close #1841)
2018-12-16 12:21:33 +01:00