edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3874 commits 1 branch 429 tags 412 MiB
Commit graph

3054 commits

Author SHA1 Message Date
heinrich5991 a5a5fe1cc8 Fix thread safety of mem_alloc and mem_free 
This works by removing everything from these functions except for the
`malloc` and `free`.
 2018-11-26 20:35:37 +01:00
heinrich5991 eb32a492c4 Fix warning about incompatible function pointers 
This comes at the cost of one allocation per started thread. This should
be okay because we're about to invoke a syscall anyway.

(cherry picked from commit 1b4a16233d)
 2018-11-26 20:35:37 +01:00
heinrich5991 a4bcd6383a Fix compilation with gcc in debug mode 
It needs explicit template instantiations for
src/engine/server/server.cpp, for the Ban function.

(cherry picked from commit b8b6808cd5)
 2018-11-26 20:35:37 +01:00
def 0f4b7a6aac Try to fix secure RNG on Windows 
(cherry picked from commit 9b27da8e4a)
 2018-11-26 20:35:37 +01:00
heinrich5991 b739536e67 Fix indentation in src/engine/shared/network.h 2018-11-26 20:35:37 +01:00
oy a8e77ef535
Merge pull request #1718 from LordSk/feature/broadcast 
Server broadcast
 2018-11-26 19:25:41 +01:00
oy 7536c8823d removed unused variable 2018-11-26 19:21:29 +01:00
oy aa4476a845
Merge pull request #1695 from Dune-jr/feature-scoreboard2 
Implement SushiTee's scoreboard
 2018-11-26 19:15:34 +01:00
LordSk a50b99bf4f ready state green color, increase chat width 2018-11-26 19:01:29 +01:00
LordSk 1756047ff4 Country flags 2018-11-26 19:01:29 +01:00
Jordy Ruiz 89ad2ad3c6 Red team wins and Blue team wins now using %s team wins for localization 2018-11-26 19:01:29 +01:00
Jordy Ruiz 8f41717d43 Fix NumPlayers not counting the right team, add an assert 2018-11-26 19:01:29 +01:00
Jordy Ruiz 71963f7b04 Some code fixes 2018-11-26 19:01:29 +01:00
Jordy Ruiz 98c99ad631 Scoreboard fixes & improvements, moved the scoreboard up, just below the HUD. Improve display of spectators 2018-11-26 19:01:16 +01:00
Jordy Ruiz 8ec70a1bde Merged scoreboard from #1171 2018-11-26 18:54:49 +01:00
oy 5125cf7dd6 changed default background map to heavens. closes #1566 2018-11-26 18:54:49 +01:00
oy 2f588a158b blocked non-country flags. closes #1721 2018-11-26 18:54:49 +01:00
oy bdaf3796f8 fixed camera position 2018-11-26 18:50:36 +01:00
oy 6dc93ee76d changed default background map to heavens. closes #1566 2018-11-26 18:13:43 +01:00
oy 46b0f264cc blocked non-country flags. closes #1721 2018-11-26 18:12:33 +01:00
LordSk 1895d1a3fa Removed magic value, reverted hud.h 2018-11-26 17:56:07 +01:00
Jordy Ruiz 9e67d32fa5 Merge branch 'master' of https://github.com/teeworlds/teeworlds into feature-complexbinds 2018-11-26 11:50:07 +01:00
Jordy Ruiz 577ce2ba25 Fix e.g. key press lshift being treated as shift+lshift 2018-11-26 11:39:55 +01:00
oy 6b5f2d8a31 fixed arrow keys effect theme and language listbox. closes #1722 2018-11-25 21:11:01 +01:00
Jordy Ruiz ce38aec2ec Remove DamageInd armor flag, add a type field in Damage to distinguish self damage 2018-11-25 20:59:41 +01:00
LordSk 8c905013b5 Soft bottom bar corners, option do disable colors 2018-11-25 20:33:41 +01:00
LordSk bd1ef7cb54 User defined lines support 2018-11-25 20:33:41 +01:00
LordSk 23d1cc3953 Save lines state instead of calculating every frame 2018-11-25 20:33:40 +01:00
LordSk 8d19f5f8a8 Moved the code over to broadcast.cpp 2018-11-25 20:33:39 +01:00
LordSk dc449f84e5 Adjusted spectator bottom-right box, broadcast network back-end, options to disable/mute it 2018-11-25 20:33:39 +01:00
LordSk af49073f55 A few more fixes, better luminance calculation 2018-11-25 20:33:36 +01:00
LordSk 549470980a Fixed some utf8 issues (m_CharCount/m_GlyphCount), added color parsing 2018-11-25 20:33:36 +01:00
LordSk 3b0c088575 Setting up the display part 2018-11-25 20:33:35 +01:00
oy 35a1e26f97 fixed using the new level icons. closes #1669 2018-11-25 20:30:32 +01:00
oy 75350af11d added support for ai-controlled players #1390 2018-11-25 17:50:57 +01:00
oy 454af88ee5
Merge pull request #1717 from Dune-jr/feature-whisper-target 
Whisper: properly blend icon, implement shift+tab, memorize last whisper target
 2018-11-25 15:29:46 +01:00
Jordy Ruiz 0231027047 Add missing Localize 2018-11-25 14:56:44 +01:00
Jordy Ruiz 07dc2e0818 Remove unused variables 2018-11-25 14:55:53 +01:00
Jordy Ruiz 781e832117 Ctrl+Tab to go to previous whisper, instead of Shift+Tab 2018-11-25 14:26:38 +01:00
Alex Belke 234753b197
Fix server info tab 2018-11-25 12:36:46 +01:00
oy de85ec70bd fixed an initialization 2018-11-25 12:24:40 +01:00
oy dbbca2cc54 reworked ingame menus, updated to the style of the new design 2018-11-25 11:34:19 +01:00
Jordy Ruiz 2daca8d3cf Fix whisper icon not blending 2018-11-25 01:17:28 +01:00
Jordy Ruiz a985edce41 Improve whisper navigation: enable shift+tab, save last whisper target ID 2018-11-25 01:10:20 +01:00
Jordy Ruiz 79fda7979a Added Damage net event, informs of angle from which damage is taken and its amount; preparing future work 2018-11-24 23:59:17 +01:00
oy e865d1c15a increased the overall cuteness factor of the ingame menus. closes #1551 2018-11-24 17:52:51 +01:00
oy 0ea6c8adf0
Merge pull request #1711 from LordSk/feature/display_user_id 
Display user IDs
 2018-11-24 17:11:20 +01:00
oy 07f009b5a2 fixed faulty shift. closes #1714 2018-11-24 16:41:49 +01:00
oy 42707f9e79 Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-24 15:17:16 +01:00
oy e2684bc925 improved the ingame menus. closes #1611 2018-11-24 15:17:00 +01:00
Jordy Ruiz 91458b18f6 Scan for none.png for the checkerboard theme 2018-11-24 13:30:27 +01:00
LordSk 85c17b4626 Show correct whisper id 2018-11-23 19:40:24 +01:00
oy 43b8bac9ac Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-23 19:33:00 +01:00
oy 001921242b added a slight background to the menus 2018-11-23 19:32:04 +01:00
LordSk 19c2636a4e A few chat fixes, display id on chat log 2018-11-23 19:31:34 +01:00
LordSk 8f14070996 Added an option to turn it on/off 2018-11-23 19:31:33 +01:00
LordSk c19c60012c Append rect width 2018-11-23 19:31:33 +01:00
LordSk b285a3d96d Stylize it a bit 2018-11-23 19:31:32 +01:00
LordSk 72a6417400 Replace hard coded id display most everywhere 2018-11-23 19:31:32 +01:00
oy 8bc55e5e27
Merge pull request #1707 from Dune-jr/feature-themeselector 
Theme selection
 2018-11-23 19:12:59 +01:00
oy b2a93432e5 fixed flickering setting sound menu 2018-11-23 19:07:03 +01:00
oy c12ec2611f increased the alpha for not related tabs in the ingame menu 2018-11-23 17:25:53 +01:00
Jordy Ruiz 46df793b45 Merge branch 'master' of https://github.com/teeworlds/teeworlds into feature-themeselector 2018-11-22 20:35:35 +01:00
oy a6e8bb7a06 use linear mapping just for icons 2018-11-22 20:06:28 +01:00
oy 16f0823d28
Merge pull request #1709 from LordSk/feature/chat_whisper 
Whisper UX/UI
 2018-11-22 19:35:05 +01:00
oy 006a1cd1c0 improved the ingame menus. #1611 2018-11-22 19:17:21 +01:00
oy f1953c18a2 use linear texture mapping so textures don't get blurry when scaling done. closes #1708 2018-11-22 19:15:33 +01:00
oy 79c44862bd fixed switching to next/previous player in dead spec mode 2018-11-22 19:13:41 +01:00
oy b28e5285c6 don't let the client change spectator info when not in the spectator team 2018-11-22 18:39:32 +01:00
oy 556481078c fixed free-view 2018-11-22 18:37:49 +01:00
oy 12307ae6b0 decreased the cooldown for spectator mode changes 2018-11-22 17:40:51 +01:00
LordSk d6add414c7 Align icon properly 2018-11-22 14:20:45 +01:00
LordSk 83a8c77d36 Display whisper icon when typing and a few tweaks 2018-11-22 14:20:44 +01:00
LordSk 05c2af908a Display a whisper icon 2018-11-22 14:20:43 +01:00
LordSk acef8e178e Save the correct name 2018-11-22 14:20:42 +01:00
LordSk 0bf36fbbe5 Added TargetID in Sv_Chat for whispers 2018-11-22 14:20:42 +01:00
Jordy Ruiz 8fb0bf115b Allow loading of generic background maps, change the rules a bit; fix some code issues 2018-11-22 11:38:55 +01:00
Jordy Ruiz f37bf350d7 Changed default map from 'menu' to 'jungle' 2018-11-22 01:33:32 +01:00
Jordy Ruiz 2909152183 Removed now unnecessary menu option to disable map backgrounds 2018-11-22 01:27:32 +01:00
Jordy Ruiz e0d292be63 Implemnt theme selection, recognize automatically maps and icons in ui/themes 2018-11-22 01:25:19 +01:00
oy 208000d157 moved around the header bits to resemble the 0.6.5 header 2018-11-22 00:04:16 +01:00
oy b9610614a4 fixed warnings 2018-11-21 21:40:23 +01:00
oy 9d3ec8355c properly align the refresh and connect button in the server browser. closes #1701 2018-11-21 21:01:29 +01:00
oy 64e5165eef respect the maximum chunk number when constructing a packet. 2018-11-21 20:52:07 +01:00
oy 0bed238238 fixed the quit button character 2018-11-21 20:48:00 +01:00
oy 27c6f8ae46 increased the token size to 32bit and set a minimum datasize of 512bytes for token request to counter reflection attacks. #1681 2018-11-21 19:56:46 +01:00
oy 646d055a59 Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-21 19:48:35 +01:00
oy faee8cf6fe
Merge pull request #1702 from Dune-jr/feature-quitbutton 
Change quit button to use unicode character \u2715, and resize it.
 2018-11-21 19:19:24 +01:00
Jordy Ruiz 8f2adb2030 Change quit button to use unicode character \u2715, and resize it. 2018-11-21 17:10:04 +01:00
oy 27012ac42d only add tokens to the catch on request. increased seedtime and expire time for tokens in the cache to sync it better with the master heartbeats 2018-11-21 12:17:27 +01:00
oy 1c05f9ad6a fixed server registration again 2018-11-21 08:25:28 +01:00
oy a99addcb22 show current resolution in graphics settings 2018-11-20 20:18:50 +01:00
oy 7b51a1f03e some token polishing 2018-11-20 19:58:01 +01:00
oy 3010a3ad54 made the version server work again. closes #1407 2018-11-20 19:18:30 +01:00
oy 8011e3e8be tie the global tokens to broadcast token request response 2018-11-20 17:09:38 +01:00
oy abdde05df7 fixed death camera in survival modes. closes #1641 2018-11-20 16:59:25 +01:00
oy 5bc1d7cec0 use the lms naming convention for survival maps #1562 2018-11-19 19:16:25 +01:00
oy d9b1758d2d renamed 'sur' gametype to 'lts'. closes #1562 2018-11-19 18:50:15 +01:00
oy dda8b89ae9 try to fetch the token for stored packets again, as the initial request might got lost 2018-11-19 18:31:53 +01:00
oy bf7abb7def
Merge pull request #1673 from LordSk/feature/chat_part2 
Chat look and feel part 2
 2018-11-19 18:13:15 +01:00
oy 6fbe52ff3c increased the token cache size to speed up the server list refresh 2018-11-19 18:04:27 +01:00
oy a47f9faaf0 cache the master server list in a file and load it in case the masters are unavailable. #1154 2018-11-19 17:58:56 +01:00
oy edeb34153a
Merge pull request #1629 from nheir/feature/1610 
Disable scoreboard when on menu and hide motd when on menu
 2018-11-19 17:02:14 +01:00
oy 4584c16935 added the possibility to have silent enter/leave messages. closes #1539 2018-11-19 16:12:54 +01:00
oy b9ea02d13f
Merge pull request #1687 from Dune-jr/feature-refoldonclick 
Hide server details when the server is clicked on again
 2018-11-19 15:25:31 +01:00
Jordy Ruiz 3ef99d614a Only fold server browser entries when the line is clicked, not the details. Avoids doubleclick issues 2018-11-19 01:07:17 +01:00
Jordy 2fd60a331c Autswitch to info tab when a server is selected in the server browser (and add a console option) 2018-11-18 23:55:05 +01:00
Jordy 2c852c7f0f Now only gray out servers that cannot be joined. Closes #1605 2018-11-18 23:32:49 +01:00
oy 1c7e320441 added camera movement by sushitee and improved camera positions. closes #1618 2018-11-18 19:14:53 +01:00
LordSk d5d39c7879 A few tweaks 2018-11-18 15:49:57 +01:00
oy f549fbab0c show the heart icon to indicate a friend in the server browser and fixed alt+tab issue. #1670 2018-11-18 15:14:50 +01:00
oy ea5389d2f1 removed old friends browser code and fixed pop dialog when removing a friend 2018-11-18 12:33:36 +01:00
oy c65da92640 sort friends list 2018-11-18 12:12:01 +01:00
oy 695a538f78 some more removed dead code 2018-11-18 11:47:11 +01:00
oy e683bc3b5f moved the renderfiltertab code and removed some dead code 2018-11-18 11:46:30 +01:00
oy 7b963e5c15 adjusted the expand icons in the server browser. #1670 2018-11-18 11:37:18 +01:00
oy 5954c11739
Merge pull request #1688 from Dune-jr/feature-browserupdates 
Server browser: update (i) icon; remove inline server filter editing
 2018-11-18 10:17:15 +01:00
oy f344450f4c
Merge pull request #1686 from Dune-jr/feature-addlocalecontext 
Add context to the locale for the Yes/No password field
 2018-11-18 10:14:33 +01:00
oy edd1b13374
Merge pull request #1677 from LordSk/fix/button_fade 
Fixed button fade getting stuck in some situations
 2018-11-18 10:13:38 +01:00
LordSk 151a2f4f77 tune down highlight 2018-11-18 00:32:33 +01:00
Jordy Ruiz fdfe775979 Removed inline filter editing feature (#1670 9/10) 2018-11-18 00:18:58 +01:00
Jordy Ruiz 03a90a4dd1 Added arrows.png; updated the browser sidebar button (#1670 10/10) 2018-11-18 00:17:38 +01:00
LordSk 805206e3ac Fixed non-synchronized envelope time not being reset 2018-11-17 18:02:04 +01:00
LordSk d9dff698c6 Fixed editor mouse world position 2018-11-17 18:00:46 +01:00
Jordy Ruiz 1c9c78d382 Hide server details when the server is clicked on again 2018-11-17 15:54:45 +01:00
Jordy Ruiz 16ed5be406 Add context to the locale for the Yes/No password field 2018-11-17 15:10:05 +01:00
oy 92e9ee83d5 fixed not expanding the filter by using the tool icons. closes #1682 2018-11-17 12:59:12 +01:00
oy d0f286babe Added friends tab 2018-11-17 12:45:57 +01:00
oy 625ea7d891 improved the new filter and add gametype buttons 2018-11-16 20:05:48 +01:00
LordSk 902b6611fd Reverted time_get use, fixed m_LocalStartTime being reset 2018-11-16 18:52:15 +01:00
oy 617eccb74c fixed selected server when opening a different filter or switching between global and lan 2018-11-16 18:30:19 +01:00
oy 35f7b6a8b9 fixed scrollbar and prevent key-navigation when all filters are closed, selecting a server entry on filter close and still show the filter add feature in case all filters are closed 2018-11-16 18:06:28 +01:00
LordSk 4b4315d9e9 Display "spectators" when pressing the team chat button while spectating, fade and reduce the size of the black box. 2018-11-16 17:44:55 +01:00
oy 4af6b33058 just expand it when a server is selected 2018-11-16 17:24:21 +01:00
oy f9524e78a4 fixed server browser scrollbar when sidebar is closed 2018-11-16 17:19:48 +01:00
oy efecf3371d
Merge pull request #1598 from Dune-jr/fix-browserscroll 
Fix server&friend browser spacing and scrolling
 2018-11-16 16:20:37 +01:00
oy cf79fcc868
Merge pull request #1680 from Dune-jr/feature-browserfixes 
Fix&improve the server browser (issue #1670)
 2018-11-16 15:55:29 +01:00
oy 803f88b81a
Merge pull request #1679 from Dune-jr/feature-exitbutton 
Enhanced the 'X' quit button with the proper icon and a fading red color
 2018-11-16 15:47:18 +01:00
oy 37d63f56e7
Merge pull request #1676 from LordSk/fix/pma 
Pre-multiplied alpha fix
 2018-11-16 15:33:06 +01:00
oy 8adaad3d15
Merge pull request #1675 from Dune-jr/reorganize-settingsmenus 
Add option to disable background maps; reorganize menus a bit
 2018-11-16 15:13:21 +01:00
Jordy Ruiz 138a90b001 Make server filter tabs toggle-able with the Tab and Shift+Tab keys (#1670 8/10) 2018-11-16 14:05:55 +01:00
Jordy Ruiz cfc4485f4b Reorder filter tabs to put friends last, adjust sizes to 30-30-40, from 25-25-50 (#1670 7/10) 2018-11-16 13:57:46 +01:00
Jordy Ruiz 4596b922be Add some space between the + and Clear in the gametype filter (#1670 6/10) 2018-11-16 13:31:21 +01:00
Jordy Ruiz 8cfc49d593 Remove top left icons (#1670 5/10) 2018-11-16 13:25:22 +01:00
Jordy Ruiz 1a50a027c0 Do not show the game types scrollbar when it's not necessary (#1670 4/10) 2018-11-16 13:20:16 +01:00
Jordy Ruiz ec4e6ead87 Make dropdown filters expandable by clicking on the line (#1670 1/10) 2018-11-16 13:08:17 +01:00
Jordy Ruiz 75a4597306 Enhanced the 'X' quit button with the proper icon and a fading red color 2018-11-15 21:10:23 +01:00
Jordy Ruiz 085fbd85b5 Added Ctrl+up/down functionality to switch filters 2018-11-15 18:40:50 +01:00
Jordy Ruiz 7f725f11cf Fix up&down key behavior for the server browser scrollbars, make UI code more readable, clean up useless parts and convoluted computations. 2018-11-15 17:54:00 +01:00
Jordy Ruiz 250a4c99e5 Merge with master 2018-11-15 17:53:38 +01:00