Commit graph

8740 commits

Author SHA1 Message Date
def 510395bb9d Version 11.8 2019-02-15 09:48:18 +01:00
Dennis Felsing 6f3d261b73
Merge pull request #1441 from trml/pr_sync_weapon_input
Sync weapon input with other input
2019-02-14 10:27:52 +01:00
bors[bot] e87681c893 Merge #1458
1458: Fix remaining issues from #1443 r=heinrich5991 a=Learath2

^

Co-authored-by: Learath <learath2@gmail.com>
2019-02-14 02:07:13 +00:00
Dennis Felsing 179c2d77ce
Merge pull request #1459 from bojidar-bg/1452-fix-crash-fixup
Fix broken game layer picker
2019-02-13 20:35:10 +01:00
Bojidar Marinov 1ca48a38ac
Fixup #1454, inadvertedly broke game layer picker 2019-02-13 21:11:13 +02:00
Learath a46c31f356 Add a couple tests, fix #1457 2019-02-13 15:14:46 +01:00
Learath 37c67c00ad Style 2019-02-13 15:13:44 +01:00
Learath 867facfffc Forgot str_tokenize is not used now 2019-02-13 15:13:27 +01:00
Dennis Felsing 698a3f1c5a
Merge pull request #1443 from ChillerDragon/AutobanKnownBots
Add autoban depending on client version
2019-02-13 12:04:51 +01:00
Dennis Felsing 25f4f1fa43
Merge pull request #1456 from daverck/master
updated server icon (fixes #1393)
2019-02-13 07:01:37 +01:00
daverck 9831903048 updated server icon 2019-02-12 19:54:35 +01:00
trml b9f301018f Remove nesting 2019-02-11 22:25:51 +01:00
Learath 109983da21 Remove use of strtok 2019-02-11 18:53:30 +01:00
Learath 0086452757 Use str_in_list, generalize further 2019-02-11 18:52:40 +01:00
Learath 5d99746cc1 Add str_tokenize and str_in_list 2019-02-11 18:40:40 +01:00
Dennis Felsing 347da9c300
Merge pull request #1454 from bojidar-bg/1452-fix-crash
Fix crash when painting tiles from a non-switch to a switch layer
2019-02-11 17:12:00 +01:00
def 12fa8a23f5 Fix comment about str_utf8_comp_nocase 2019-02-11 17:11:33 +01:00
Dennis Felsing ba675ec18f
Merge pull request #1453 from 12pm/autocomplete_fix
Fix tab autocompletion
2019-02-11 17:10:53 +01:00
def 7da40ed1ea Better English by VeH-c 2019-02-11 14:57:42 +01:00
Bojidar Marinov 352157ddbe
Fix crash when painting tiles from a non-switch to a switch layer
Fixes #1452.
2019-02-11 10:41:26 +02:00
12pm 6d3e40760c Fix build 2019-02-10 19:20:08 +01:00
12pm 74992d9bd7 Fix tests 2019-02-10 19:13:55 +01:00
12pm ed55ac6d81 Fix tab autocompletion 2019-02-10 17:43:00 +01:00
bors[bot] 250d7c8475 Merge #1446
1446: Disable unused tiles only for DDNet entities r=def- a=12pm

Sorry messed something up

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-02-10 12:11:32 +00:00
bors[bot] ea6f76b383 Merge #1438 #1447 #1448
1438: Add man pages with asciidoc r=def- a=Ryozuki

Fixes #1240 

I added a simple script to generate the man pages.

To edit the man pages in the future, you must edit the `.adoc` files and then run generate.sh

You need asciidoc package to generate the manpages.

`sudo apt install asciidoc`

http://asciidoc.org/

Writing plain troff is a pain in the ass.

1447: Allow vote-kicking players with same auth level r=def- a=12pm

This is meant to help with dealing with trolls on test server since everyone can log into rcon there.
Shouldn't cause any problems anywhere else, I think.

1448: Require sv_vote_kick_min only on team 0 kick votes r=def- a=12pm



Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-02-10 10:23:08 +00:00
bors[bot] 7b5209f2f7 Merge #1449
1449: Make teleporting to where you look at convenient r=def- a=12pm

Allows you to make a fancy bind for testing

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-02-10 10:12:04 +00:00
12pm f2cbb9d87d Make teleporting to where you look at convenient 2019-02-09 19:32:45 +01:00
12pm 1cf73b3eec Abort votes only if auth level is higher 2019-02-08 19:43:07 +01:00
12pm 10e4fcc185 Require sv_vote_kick_min only on team 0 kick votes 2019-02-08 18:44:11 +01:00
12pm 4b1651f18c Allow vote-kicking players with same auth level 2019-02-08 16:57:39 +01:00
12pm 2daafdaad5 Disable unused tiles only for DDNet entities 2019-02-08 04:04:41 +01:00
ChillerDragon c0157db98d Neutral kick reason 2019-02-06 14:53:22 +01:00
ChillerDragon eaf61b662d Never ban known bots 2019-02-06 14:49:41 +01:00
ChillerDragon 3f8e9613f7 Fix style 2019-02-06 13:06:28 +01:00
ChillerDragon f5b551adee Fix empty string check (ty Travis) 2019-02-04 23:33:25 +01:00
ChillerDragon 8ddb487e2b Use consisten seperators (comma not semicolons) 2019-02-04 23:12:05 +01:00
ChillerDragon ec7b525609 Default kick known bots instead of ban 2019-02-04 23:10:07 +01:00
ChillerDragon 03a20d6406 Add IServer::Ban 2019-02-04 23:09:14 +01:00
ChillerDragon 867b0a66ce Fixings thanks to @Learath2 2019-02-04 22:16:09 +01:00
ChillerDragon 069b1763dd Add autoban depending on client version 2019-02-04 20:46:42 +01:00
trml 3f9d30af0f Sync weapon input with other inputs 2019-01-29 20:58:25 +01:00
bors[bot] 4f33aceb1c Merge #1439
1439: Fix switch_open description r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-01-28 03:02:46 +00:00
12pm 3d01e59878 Fix switch_open description 2019-01-27 20:09:33 +01:00
Ryozuki ff69a9a12e
add manpages with asciidoc 2019-01-21 21:40:52 +01:00
bors[bot] d3323cf7cb Merge #1436
1436: Don't use compression for text rendering r=def- a=Jupeyy

This probably fixes the text rendering issue for some people(where random characters where missing).

I still think it's a driver bug, relating to `GL_COMPRESSED_ALPHA_ARB`, which is deprecated in newer OpenGL versions(that's probably why it worked with OpenGL3.3 and not with the older one, because our OGL 3.3 implementation uses `GL_COMPRESSED_RED`, which replaced the above)

To be extra sure, i also looked up the causing function:
https://www.khronos.org/registry/OpenGL-Refpages/gl4/html/glPixelStore.xhtml

but it clearly says it supports texture compression.

Anyway, i did not fix this by using `GL_COMPRESSED_RED`, because this is only core in newer OpenGL versions.
see:
https://www.khronos.org/registry/OpenGL/specs/gl/glspec20.pdf
(Table 3.18, which only lists *_ALPHA not *_RED)

I just disabled texture compression for text rendering now, if somebody gets asked about texture compression it's probably better to say it's really only useful, if very very low on VRAM, or the bandwidth between GPU and its memory is limited for some reasons.

Co-authored-by: jupeyy <jupjopjap@gmail.com>
2019-01-21 16:07:35 +00:00
bors[bot] be8907a11b Merge #1437
1437: Happy new year 2k19 r=def- a=ChillerDragon



Co-authored-by: Chiller Dragon <chillerdragon@gmail.com>
2019-01-21 15:55:30 +00:00
Chiller Dragon 52e725428a
Happy new year 2k19 2019-01-20 22:37:21 +01:00
jupeyy 28ba295792 Don't use compression for text rendering 2019-01-20 14:28:59 +01:00
Dennis Felsing a5c78f85cf Disallow sv_map_vote in map settings 2019-01-15 08:57:30 +01:00
bors[bot] 385493be79 Merge #1433
1433: Don't try to remove non-existing files r=heinrich5991 a=def-

Causes annoying error messages during map change & server start.

Co-authored-by: def <dennis@felsin9.de>
2019-01-14 21:19:26 +00:00