edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
4022 commits 1 branch 429 tags 411 MiB
Commit graph

3163 commits

Author SHA1 Message Date
oy 0f9270e7d4
Merge pull request #1823 from LordSk/fix/scoreboard_swap_ping_score 
Scoreboard: Moved ping column
 2018-12-09 18:22:26 +01:00
oy 1b020f4ca9
Merge pull request #1820 from savander/bug/no-hover 
Add hover over quick search button
 2018-12-09 18:13:10 +01:00
Zwelf 68920a037e Set alt key to move between words for OSX 2018-12-09 15:42:34 +01:00
Zwelf b37f77574e Added ctrl+arrows/backspace/delete keys for text input 2018-12-09 15:42:32 +01:00
LordSk 5548ee01bd Swapped Ping and Score columns 2018-12-09 15:31:22 +01:00
Jordy Ruiz 9809b18488 Fix disconnecting players being counted in GetPlayersReadyState 2018-12-09 15:29:29 +01:00
Jordy Ruiz e6b91a97c2 Fixed blocked flags causing the selected flag to not match the ListBox index 2018-12-09 14:29:54 +01:00
Unknown 1d0078be49 Fix packet resending 2018-12-09 00:25:07 +01:00
Savander 7c0a03a005 Add hover over quick search button 2018-12-09 00:14:23 +01:00
oy c25fd502a0
Merge pull request #1815 from fokkonaut/master 
fix typo (capital letter in console)
 2018-12-08 17:54:08 +01:00
oy e61b3645aa
Merge pull request #1806 from Dune-jr/fix-checkmark 
Fix scoreboard spacing, make some room for the checkmark
 2018-12-08 17:50:36 +01:00
fokkonaut 4143e8af7e fix typo (capital letter in console) 2018-12-08 17:04:34 +01:00
Jordy Ruiz fd2e933de5 Fix damage indicators angle 2018-12-07 19:28:12 +01:00
Jordy Ruiz 8dfbc705af Make some more room for the checkmark 2018-12-07 19:00:19 +01:00
Jordy Ruiz fac3dba7e6 Resume game when last non-ready player leaves or spectates 2018-12-07 12:45:33 +01:00
oy b9144fb5f1
Merge pull request #1800 from Dune-jr/add-locale-context 
More localization context
 2018-12-06 20:56:01 +01:00
oy d25e419efc
Merge pull request #1796 from Dune-jr/fix-votekey 
Fix broken key helper in callvote popup
 2018-12-06 20:55:02 +01:00
Jordy Ruiz 4e84c04c35 Remove red/blue as locales, reuse red flag/blue flag instead 2018-12-05 17:58:42 +01:00
Jordy Ruiz 6c60a2cc50 Add context to some locales 2018-12-05 17:57:21 +01:00
Jordy Ruiz 583e37f418 Fix broken key helper in callvote popup 2018-12-05 16:02:10 +01:00
Jordy Ruiz d04d29dd1c Emotes can now be cancelled by releasing the mouse in the middle of the circle. Closes #1786 2018-12-05 13:07:00 +01:00
Jordy Ruiz 1cf43b7ae7 Move 'Show user IDs' option up to keep consistency 2018-12-04 19:04:43 +01:00
oy 1cdd43d6de
Merge pull request #1774 from Dune-jr/remove-gfxrefreshrate 
Remove unused gfx_refresh_rate option
 2018-12-04 18:27:56 +01:00
Jordy Ruiz d87a157c65 Remove unused gfx_refresh_rate option 2018-12-04 17:00:34 +01:00
Jordy Ruiz e46d0084eb Add some more localization context for the menus 2018-12-04 09:12:09 +01:00
Jordy Ruiz c274925af7 Fix some localizations 2018-12-04 09:06:16 +01:00
oy ee8b6dff99
Merge pull request #1767 from ChillerDragon/UnusedConnect 
Remove unused connect code
 2018-12-03 18:48:32 +01:00
ChillerDragon bede7e0b14 Remove empty lines 2018-12-03 17:00:53 +01:00
ChillerDragon 24aed18b61 Remove unused connect code 2018-12-03 15:39:19 +01:00
LordSk 4b09431c78 Map screen again since moving the function up removed it 2018-12-03 13:48:47 +01:00
oy 6febd33997 fixed data dir detection on macos 2018-12-03 10:37:26 +01:00
oy a25f7e57e5 changed version to 0.7.1 2018-12-02 19:40:22 +01:00
oy c5af2a77a5 show a notification "click a player or flag to follow it" when joining spectator 2018-12-02 18:21:53 +01:00
oy 814c76248a Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-12-02 17:33:12 +01:00
oy 9b50815c6e fixed problem with initializing sv_player_slots 2018-12-02 17:33:02 +01:00
oy 4f71242925
Merge pull request #1760 from ChillerDragon/UnusedGraphicsInclude 
remove unused graphics include
 2018-12-02 17:13:59 +01:00
oy 359042fb42 fixed that set_team commands respect the available player slots 2018-12-02 17:11:14 +01:00
ChillerDragon fa7f7d6b7d remove unused graphics include 2018-12-02 17:06:59 +01:00
oy 548baa7b70
Merge pull request #1759 from LordSk/fix/chat_truncated 
Adapt chat size depending on scoreboard
 2018-12-02 16:11:48 +01:00
LordSk 05b6440739 Adapt chat size depending on scoreboard 2018-12-02 16:04:58 +01:00
nheir 8184bc1119 sanitize sv_player_slots 2018-12-02 15:59:37 +01:00
oy afb5029c61 added id's to the scoreboard. closes #1747 2018-12-02 15:09:44 +01:00
oy 2ac756c5f0 fixed team change unbalance indication in the ui. #1752 2018-12-02 13:43:42 +01:00
Henri D 1653d47350
ignore 0 damage 2018-12-02 12:55:10 +01:00
oy 2c76f33f93 fixed events for 64 players 2018-12-02 12:43:55 +01:00
oy c87fcb293e check for valid placeholders within translation files 2018-12-02 00:12:23 +01:00
oy 3e9eeff1c5 fixed offset of the ctf flag in the scoreboard 2018-12-01 21:00:11 +01:00
oy bce1eda7bb reduced alpha of the game menu and adjusted the record button 2018-12-01 19:14:36 +01:00
oy 5768a35018 moved game buttons to the top. #1698 2018-12-01 18:02:17 +01:00
oy 3bb6f9d959 fixed a typo 2018-12-01 15:24:42 +01:00
oy 23c9682e2c increased the flags in the scoreboard 2018-12-01 14:31:47 +01:00
oy 6c3e2713de fixed server crash 2018-12-01 14:24:00 +01:00
oy 9637215859 fixed player stat reset 2018-12-01 14:07:57 +01:00
oy 3209791976
Merge pull request #1580 from nheir/more_spec 
Increase the number of clients (max 64) for more spectators
 2018-12-01 13:45:01 +01:00
nheir 8a3fc7aa60 drop server with MaxPlayers > MAX_PLAYERS only if standard gametype 2018-12-01 13:25:55 +01:00
nheir 6dc5385d3d improve ingame menu players scrollbar 2018-12-01 13:20:55 +01:00
nheir 375e040c7a Add scrollbar to ingame Players menu 2018-12-01 13:20:55 +01:00
nheir 2b471f31f2 use 2 columns for 17 to 32 players, 3 for 33-48, 4 otherwise 2018-12-01 13:20:55 +01:00
nheir 62e0ee998c fix: ... other players is cropped 2018-12-01 13:20:55 +01:00
nheir 9c86850d70 scale down spec view highlight 2018-12-01 13:20:55 +01:00
nheir b86d96fc95 Scale down tee in spec view 2018-12-01 13:20:55 +01:00
nheir 6aa81c2b20 move up player list to feel more centered 2018-12-01 13:20:55 +01:00
nheir 820cd16c34 wrong first colomn 2018-12-01 13:20:55 +01:00
nheir b2352bb4b0 workaround to show more than 16 players in spectator ui 2018-12-01 13:20:55 +01:00
nheir 84ccee1d86 Limit the max size of the scoreboard to 16 lines 2018-12-01 13:20:00 +01:00
nheir 7887e492e4 Crop spectator list on scoreboard to 4 lines 2018-12-01 13:20:00 +01:00
nheir b2b72d4006 Reset scoreboard size on OnReset() 2018-12-01 13:20:00 +01:00
Henri Derycke 9cd1cf2459 fix wrong indice 2018-12-01 13:20:00 +01:00
Henri Derycke c221a6b3dd debug: up to MAX_CLIENTS-1 dummies 2018-12-01 13:20:00 +01:00
Henri Derycke 760ed1163d Fix item height when there is a scrollbar 2018-12-01 13:20:00 +01:00
Henri Derycke 46faf532dd Add horizontal scrollbar for scoreboard in server browser 2018-12-01 13:20:00 +01:00
oy c6f0d19df5 try to fix missing data dir for the mac app 2018-12-01 13:17:19 +01:00
oy 6884cb617a Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-12-01 13:11:57 +01:00
oy b8fcdf9c8b fixed kill messages when a player leaves. closes #1744 2018-12-01 13:11:44 +01:00
Henri Derycke a867847712 fix wrong limit and calculation 2018-12-01 13:10:41 +01:00
Henri Derycke 38fc5ff50a add support for ingame scoreboard (untested) 2018-12-01 13:10:41 +01:00
Henri Derycke 9450a9e72d misplace silent mode 2018-12-01 13:10:41 +01:00
Henri Derycke 412db81508 Add silent mode for join/leave message of spectators 2018-12-01 13:10:41 +01:00
Henri Derycke 584ac1aba4 Add cropped list for serverbrowser embeded scoreboard 
Add scrollbar for server browser scoreboard
 2018-12-01 13:10:41 +01:00
Henri Derycke 8b02113744 forgot Console->Chain sv_player_slots 2018-12-01 13:10:41 +01:00
nheir 4efa8b90c9 Drop servers with MaxPlayers > MAX_PLAYERS 2018-12-01 13:10:41 +01:00
nheir 98bee55a41 Allow more spectators 
Replace sv_spectator_slots by sv_player_slots
Introduce MAX_PLAYERS to 16 (original MAX_CLIENTS)
 2018-12-01 13:10:41 +01:00
oy bb544ca3ae
Merge pull request #1589 from Dune-jr/feature-complexbinds 
Implement composed binds (Ctrl, Shift, Alt); adapt controls menus.
 2018-12-01 12:54:34 +01:00
oy 0e655437c9 use linear mapping for the gametype icons and fixed c&p error 2018-12-01 12:47:14 +01:00
oy 9b6db9b26c Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-30 19:15:54 +01:00
oy 7a7785e9f3 properly align selected header in the server browser. closes #1738 2018-11-30 19:15:42 +01:00
oy ec9cf90e1e use gametype icons. #1637 2018-11-30 19:06:25 +01:00
oy 148f149af3
Update broadcast.cpp 2018-11-30 17:08:20 +01:00
oy 0d30c48080
Merge branch 'master' into master 2018-11-30 17:04:34 +01:00
oy 7fa0dc05d9
Merge pull request #1743 from LordSk/fix/editor_mouse_delta 
Fixed editor world mouse delta (used when moving quad points)
 2018-11-30 17:01:42 +01:00
oy 2f1646f5b1
Merge pull request #1741 from LordSk/fix/broadcast_scoreboard 
Fixed broadcast not being shown when scoreboard/motd is active
 2018-11-30 17:01:19 +01:00
oy c0da735639
Merge pull request #1740 from Dune-jr/fix-warnings 
Fix some warnings
 2018-11-30 17:00:48 +01:00
oy c58510c345
Merge pull request #1716 from Dune-jr/feature-damage-netevent 
Add Damage net event
 2018-11-30 17:00:30 +01:00
Chiller Dragon 13f0d259a5
Fix too much indentation 2018-11-30 13:27:04 +01:00
LordSk 3536803519 Fixed editor world mouse delta (used when moving quad points) 2018-11-29 21:42:03 +01:00
LordSk 2cbdda7c62 Don't show if offline, reset on join 2018-11-29 17:24:33 +01:00
LordSk ba5083f8ff Fixed broadcast not being shown when scoreboard/motd is active 2018-11-28 17:41:59 +01:00
Jordy Ruiz a4c4607a59 Fix some warnings 2018-11-28 11:40:09 +01:00
oy 499653cd2c consider max clients configuration for dbg_dummies. closes #1735 2018-11-27 19:24:14 +01:00
Jordy Ruiz ff1ba08a0c Fix typo 2018-11-27 19:23:00 +01:00
Jordy Ruiz 029b0accbd Removed DamageInd net event. Moved the server code to the client, using the new Damage net event. 2018-11-27 18:57:17 +01:00
oy d86165b63c changed ready character to a checkmark. #1736 2018-11-27 18:09:34 +01:00
oy a103c0bf3c
Merge pull request #1736 from Dune-jr/feature-smallreadystate 
Make the ready state indicator a small green star instead of the whole line green
 2018-11-27 18:03:01 +01:00
LordSk 44ec214c31 Reverted alpha changes 2018-11-27 17:29:40 +01:00
LordSk cf4364418d Round corners 2018-11-27 17:23:36 +01:00
Jordy Ruiz 8ef08b4641 Make the ready state indicator a small green star 2018-11-27 16:44:30 +01:00
LordSk 87e36241d0 Use TextShadowed to render text instead, dynamically scale FontSize depending on line count 2018-11-26 22:16:55 +01:00
oy d158ab0ff0
Merge pull request #1731 from heinrich5991/pr_various 
Various fixes
 2018-11-26 21:09:23 +01:00
oy 40424ddae8 quick and dirty map reordering routine 2018-11-26 21:08:39 +01:00
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