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

3996 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 f3bd808d69
Merge pull request #1745 from ChillerDragon/master 
Fix indentation
 2018-11-30 17:08:41 +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 5a2228142e
Merge pull request #1 from ChillerDragon/pr_indentation 
Fix too much indentation
 2018-11-30 13:27:39 +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
oy 85288248ed
Merge pull request #1737 from LordSk/feature/broadcast2 
Broadcast visual upgrade
 2018-11-27 17:37:52 +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 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