edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-16 13:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15409 commits 1 branch 429 tags 413 MiB
Commit graph

15409 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] 35cb7f0b2c Merge #1463 
1463: Don't suggest to downgrade, clean up versioning (fixes #1440) r=def- a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-03-03 19:36:20 +00:00
def deb2494692 Don't suggest to downgrade, clean up versioning (fixes #1440) 2019-03-03 20:31:23 +01:00
bors[bot] 8223cf41fb Merge #1465 
1465: Uninvite kicked/spectated players from team (fixes #1464) r=def- a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-03-03 19:25:20 +00:00
12pm 572e9532ee Fix tests 2019-03-03 19:02:42 +01:00
12pm 29592afdb5 Add exact name ban option 2019-03-03 18:29:33 +01:00
Learath 548e9969b2 Add colors for authed players. Deprecates #1299 2019-03-02 13:50:33 +03:00
def afa1e8adc5 Uninvite kicked/spectated players from team (fixed #1464) 2019-03-01 22:11:00 +01:00
def 65ce202697 Revert "More SQL fixes" 
This reverts commit c665cabc27.
 2019-02-28 06:14:30 +01:00
def f831f27d08 Revert "New SQL locking on each query (fixes #1430)" 
This reverts commit 5ddcf8bd0c.
 2019-02-28 06:14:20 +01:00
Dennis Felsing 6701ae726f
Merge pull request #1434 from ddnet/sql-locking 
Sql locking
 2019-02-27 20:26:24 +01:00
def 887d1c8401 Simplify some server messages 2019-02-27 19:46:01 +01:00
bors[bot] dfa16e37ba Merge #1462 
1462: Remove empty else branch r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-02-25 19:21:04 +00:00
ChillerDragon a34d9633ad Remove empty else branch 2019-02-25 20:16:05 +01:00
bors[bot] d14a8d3ac9 Merge #1460 
1460: Remove unused graphics include in ghost.cpp r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-02-22 10:36:43 +00:00
ChillerDragon 53e14d02f0 Remove unused graphics include in ghost.cpp 2019-02-22 11:27:25 +01:00
def 21a938d983 Update credits 2019-02-15 11:10:44 +01:00
def 374529b452 Update credits 2019-02-15 10:59:34 +01:00
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