Commit graph

8363 commits

Author SHA1 Message Date
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
Dennis Felsing b3a8cef274
Merge pull request #1086 from QingGo/patch-1
Provide more controlable command for dummy
2018-04-03 10:10:35 +02:00
Jupeyy 53622f56b4 respect the area width in any case 2018-03-26 05:08:21 +02:00
heinrich5991 b9cdacbb37 Try to unfix the grenade bug for the map "Binary" 2018-03-24 14:01:01 +01:00
heinrich5991 4576dae6aa Add infrastructure for special-casing maps 2018-03-24 14:00:41 +01:00
Jupeyy abb9ba5572 use debug variable in a better way 2018-03-21 16:07:03 +01:00
Jupeyy 375b127f4e style fix 2018-03-21 16:02:11 +01:00
Jupeyy 887bcb52ff add window event listener for the client 2018-03-21 15:54:51 +01:00
Jupeyy 2cbb8af75b add window resize event, and fix some ui things 2018-03-21 15:53:29 +01:00
Jupeyy 16894155e5 add attributes for screen state check 2018-03-21 15:49:15 +01:00
Jupeyy 53a93c077e add window resize listener 2018-03-21 15:48:48 +01:00
Jupeyy 70c06be87e allow non pixel alignment rendering, instead fo changing texture filter
add window resize event, and remove the font size limitation
2018-03-21 15:45:08 +01:00
Jupeyy 9b8da90151 check screen state 2018-03-21 15:41:45 +01:00
bors[bot] 9da402a122 Merge #1090
1090: Add `LATIN SMALL LETTER L` confusable r=Learath2 a=heinrich5991

This makes `LATIN SMALL LETTER L` confusable with `LATIN SMALL LETTER I`
because `CYRILLIC SMALL LETTER PALOCHKA` "ӏ" (mapping to i) wasn't
confusable with `LATIN SMALL LETTER L` "l" (mapping to l) before.

Also add tests for `str_utf8_comp_confusable`.
2018-03-20 20:29:42 +00:00
heinrich5991 6d88a29910 Add LATIN SMALL LETTER L confusable
This makes `LATIN SMALL LETTER L` confusable with `LATIN SMALL LETTER I`
because `CYRILLIC SMALL LETTER PALOCHKA` "ӏ" (mapping to i) wasn't
confusable with `LATIN SMALL LETTER L` "l" (mapping to l) before.

Also add tests for `str_utf8_comp_confusable`.
2018-03-20 21:11:44 +01:00
heinrich5991 5be3e1ca84 Update confusable data to Unicode 11.0.0 2018-03-20 20:54:29 +01:00
bors[bot] 1e15b97543 Merge #1088
1088: Only count distinct client IP addresses for minimum player vote count r=heinrich5991 a=heinrich5991
2018-03-20 10:21:49 +00:00
heinrich5991 08e2c843a1 Only count distinct client IP addresses for minimum player vote count 2018-03-18 20:53:05 +01:00
Chiller Dragon 74ecdea3ab Add assert on unimportant broadcasts to all players 2018-03-16 13:30:47 +01:00
Chiller Dragon cc70628a49 Static broadcast delay (10 sec) 2018-03-15 22:35:25 +01:00