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

8432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jupeyy 8cc0de8d31 Some text positioning 2018-04-11 12:19:30 +02:00
bors[bot] 23f560f3d2 Merge #1112 
1112: Fix default dyncam values r=def- a=Jupeyy

Since dyncam is disabled by default:
these are default static values.

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2018-04-11 09:35:40 +00:00
Jupeyy 3118ad4069 Fix default dyncam values 2018-04-11 11:27:30 +02:00
bors[bot] 73cc3a147b Merge #1110 
1110: Fix killmessage flag render r=def- a=Jupeyy



Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2018-04-09 20:28:24 +00:00
Jupeyy 2a6050eaf4 use killer team not victim 2018-04-09 22:11:51 +02:00
Jupeyy 52ff132e56 reset color after text is drawn 2018-04-09 22:02:16 +02:00
bors[bot] 2482def07a Merge #1109 
1109: Revert "Don't use aio logging to stdout on Windows" r=def- a=heinrich5991

This reverts commit 8f291ce528.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-04-09 13:17:04 +00:00
heinrich5991 26b3be58bf Revert "Don't use aio logging to stdout on Windows" 
This reverts commit 8f291ce528.
 2018-04-09 15:02:34 +02:00
bors[bot] b21c37d1ca Merge #1107 
1107: Remove `mem_alloc` and `mem_free`, use standard C functions instead r=def- a=heinrich5991

Replace `mem_free` by `free`, and `mem_alloc` by `malloc` or `calloc`
(the latter one being used to allocate a zeroed array of elements,
sometimes, this makes a call to `mem_zero` superfluous).

This results in having to remove `mem_stats` which previously recorded
the number of allocations and their size that the Teeworlds code did
directly.

Remove OOM handling in `src/game/client/components/binds.cpp`.

Remove needless copying in the CSV code in
`src/game/client/components/statboard.cpp`.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-04-09 10:23:15 +00:00
heinrich5991 f8277267a0 Remove mem_alloc and mem_free, use standard C functions instead 
Replace `mem_free` by `free`, and `mem_alloc` by `malloc` or `calloc`
(the latter one being used to allocate a zeroed array of elements,
sometimes, this makes a call to `mem_zero` superfluous).

This results in having to remove `mem_stats` which previously recorded
the number of allocations and their size that the Teeworlds code did
directly.

Remove OOM handling in `src/game/client/components/binds.cpp`.

Remove needless copying in the CSV code in
`src/game/client/components/statboard.cpp`.
 2018-04-09 11:56:39 +02:00
bors[bot] 8de6371e60 Merge #1106 
1106: Fix the `bors test` command, ignore `testing.tmp` on all CIs r=heinrich5991 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-04-09 09:50:33 +00:00
heinrich5991 40723b94d1 Fix the bors test command, ignore testing.tmp on all CIs 2018-04-09 10:27:31 +02:00
def b504ae60fb Improve wording in moderation messages 2018-04-07 16:51:17 +02:00
Dennis Felsing bf772769ad Update portuguese.txt (by Rockus) 2018-04-06 10:46:35 +02:00
Dennis Felsing a01939a6f7 Update portuguese.txt (by Rockus) 2018-04-06 07:34:37 +02:00
Dennis Felsing 310d089ebc
Merge pull request #1104 from Jupeyy/master 
Reset the color for the gameflag rendering
 2018-04-05 21:09:17 +02:00
Jupeyy fbaedff1e6 reset color for the gameflags 2018-04-05 20:46:22 +02:00
def c95e1a61c6 More conservative config saving 2018-04-05 17:24:49 +02:00
Dennis Felsing f426fef7f5 Version 11.1.3 2018-04-05 13:48:38 +02:00
Dennis Felsing fc355797a5
Merge pull request #1101 from Jupeyy/pr_mem_fix 
Make mem_alloc, mem_free thread safe (fixes #1087)
 2018-04-05 09:10:55 +02:00
Dennis Felsing 005b86daaa
Merge pull request #1102 from yangfl/upstream 
Allow specifying DATA_DIR by compiler option, retry #1042
 2018-04-05 08:33:40 +02:00
yangfl 46b7e4198b Allow specifying DATA_DIR by compiler option, retry #1042 2018-04-05 11:11:31 +08:00
Jupeyy a83a89703e change position of mutex lock 2018-04-05 04:42:03 +02:00
Jupeyy 1208bcc562 Make mem_alloc, mem_free thread safe (fixes #1087) 2018-04-05 04:17:21 +02:00
def bd1653a91b Editor: Fix debug client crash 2018-04-04 21:41:14 +02:00
def 6d3b8f2d36 fix2 2018-04-04 20:41:05 +02:00
def 03ee53eaf1 space 2018-04-04 20:11:24 +02:00
def 30679364f5 Fix 2018-04-04 20:03:05 +02:00
def 8d98bd4e9f Projectiles explode per team 2018-04-04 19:48:46 +02:00
Dennis Felsing 30588918c4
Merge pull request #1100 from Jupeyy/master 
More GUI text positioning fixes
 2018-04-04 08:40:22 +02:00
Dennis Felsing e78c0b6085 Version 11.1.2 2018-04-04 08:39:13 +02:00
Jupeyy c7114e734c more ui text positioning fixes 2018-04-04 02:40:30 +02:00
def c8c4fd5617 Fix reconnect timer display... 2018-04-03 21:32:21 +02:00
def 910b507903 Version 11.1.1 2018-04-03 19:20:34 +02:00
def a9a71094dd Revert "Allow specifying DATA_DIR by compiler option" 
This reverts commit 3c488ff5c7.
 2018-04-03 19:18:27 +02:00
Dennis Felsing dbc8321c56
Merge pull request #1098 from Jupeyy/master 
Some text related fixes (color, positining)
 2018-04-03 19:11:19 +02:00
def 07460ede9e cl_control_dummy -> cl_dummy_control 2018-04-03 18:12:27 +02:00
Jupeyy 1a74d8c039 ui fixes: text positining 2018-04-03 17:41:11 +02:00
Learath e9addaf8aa Add OSX support 2018-04-03 18:40:54 +03:00
Learath 5b42edb80a Move ADD down to ease caching 2018-04-03 18:40:54 +03:00
Learath df7a2ee9e5 Add a dockerfile 2018-04-03 18:40:54 +03:00
Jupeyy 15f0efc2bd fix text color if opengl3.3 is off 2018-04-03 17:40:21 +02:00
Dennis Felsing 74bb444657
Merge pull request #1094 from Ryozuki/patch-2 
fix command typo
 2018-04-03 17:36:14 +02:00
David-U-Tang db75df4d92 Change the wrong translation of Simplified Chinese 
“Manual” here should be translated to “手动” or "手动录制" but not "手册"。
 2018-04-03 17:42:07 +03:00
Ryozuki 722b003d6b
fix command typo 2018-04-03 16:28:02 +02:00
Dennis Felsing 43bb77af05 Version 11.1 2018-04-03 10:30:08 +02:00
Dennis Felsing 5a53e4c54d Fix compilation 2018-04-03 10:27:19 +02:00
Dennis Felsing f8a00ad8af
Merge pull request #1000 from Ryozuki/pr_modhelp_chat_cmd 
Add /modhelp chat command
 2018-04-03 10:21:01 +02:00
Dennis Felsing 256845c824
Merge pull request #1072 from ChillerDragon/Broadcasts 
Add broadcast importance (fixes #669)
 2018-04-03 10:15:01 +02:00
Dennis Felsing ed33557a97
Merge pull request #1081 from Jupeyy/master 
New buffer system and text renderer to support buffering of hud, text and map components, that are displayed ingame
 2018-04-03 10:12:09 +02:00