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
3737 commits 1 branch 429 tags 412 MiB
Commit graph

3737 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 883c28e4d2 Remove the unused import of the deprecated imp module 
(cherry picked from commit 6fd9bc3d3e)
 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 6e604402ca
Merge pull request #1729 from Sonix-/patch2 
Update tilesets and graphics (#1222)
 2018-11-26 20:23:32 +01:00
Sonix- 593468a16d Update tilesets and graphics 
- Tilesets got updated without borderfix and dilate applied to them
- Desert, Winter and Grass are updated to 0.7 with 1 tile high platforms
- Doubled the resolution for clouds
- Desert got a tiny change in saturation (terrain)
- Added improved mountains.png (thx android) for better continuity
- Added a  single tileset for shadows instead of having them in every single tileset
 2018-11-26 20:09:35 +01:00
oy a8e77ef535
Merge pull request #1718 from LordSk/feature/broadcast 
Server broadcast
 2018-11-26 19:25:41 +01:00
oy 72cb5cc4bc Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-26 19:23:23 +01:00
oy 7536c8823d removed unused variable 2018-11-26 19:21:29 +01:00
oy a73a24d240
Merge pull request #1726 from Dune-jr/update-gfx 
Add individual gametype icons, update server level icons
 2018-11-26 19:20:22 +01:00
oy 013ec104c3 fixed typo 2018-11-26 19:19:00 +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
oy c5ec1d7ce7 added new winter_main tileset 2018-11-26 19:03:02 +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
oy 0db3f92fa8
Merge pull request #1727 from Dune-jr/add-flags 
Added Breton, Catalan, Esperanto, Galician flags for the new languages
 2018-11-26 18:00:08 +01:00
LordSk 1895d1a3fa Removed magic value, reverted hud.h 2018-11-26 17:56:07 +01:00
Jordy Ruiz 80400c396d Added Breton, Catalan, Esperanto, Galician flags for the new languages. They are not blocked as countryflags for now. 2018-11-26 01:07:13 +01:00
Jordy Ruiz cc0c8b9938 Added Zatline's individual icons for all official gametypes 2018-11-26 00:41:53 +01:00
Jordy Ruiz 2fc12279c5 Update level.png using Zatline's svg 2018-11-26 00:37:21 +01:00
oy 6b5f2d8a31 fixed arrow keys effect theme and language listbox. closes #1722 2018-11-25 21:11:01 +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 102a28a48b Fixed a tab issue 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 59f884f395
Merge pull request #1725 from Sonix-/patch1 
Fix cloud's animation (Closes #1724)
 2018-11-25 20:15:20 +01:00
oy aa65feaff5 added reordered grass_doodads. closes #1043 2018-11-25 20:14:48 +01:00
Sonix- 699ba6febb Fix cloud's animation 2018-11-25 19:59:52 +01:00
oy 6742053eb0
Merge pull request #1723 from Dune-jr/fix-level-icons 
Update level.png with Zatline's work, modified to fit 256x256 format
 2018-11-25 19:10:40 +01:00
Jordy Ruiz 9dae21f135 Update level.png with Zatline's work, modified to fit 256x256 format 2018-11-25 19:05:16 +01:00
oy e3c4b3602b updated license with a list of authors and updated the year. closes #1548 2018-11-25 18:19:27 +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