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

9810 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Felsing 5e60dfd2b1
Merge pull request #1503 from 12pm/random_map-exclude-current 
Exclude current map on random map votes
 2019-03-18 15:20:40 +01:00
12pm 679628c4eb Exclude current map on random map votes 2019-03-18 15:10:27 +01:00
Dennis Felsing 7a23baa020
Merge pull request #1502 from fokkonaut/master 
Remove AllowTimeScore from browser (fixes #1499)
 2019-03-18 13:24:55 +01:00
fokkonaut 55150bb7d6 Remove AllowTimeScore from browser (fixes #1499) 2019-03-18 13:13:37 +01:00
Dennis Felsing 1fec65572b
Merge pull request #1500 from 12pm/extraeditor-fix 
Fix editor render glitch
 2019-03-18 07:58:12 +01:00
Dennis Felsing fc8b9e8d41
Merge pull request #1498 from 12pm/editor-sound-text 
Fit sound name in select button too
 2019-03-18 06:00:54 +01:00
12pm 90e2b355ae Fix editor render glitch 2019-03-18 02:34:24 +01:00
12pm 8fb77f1a26 Fit sound name in select button too 2019-03-18 01:14:32 +01:00
Dennis Felsing 11a5e3ce7f
Merge pull request #1496 from daverck/master 
fix broken server icon
 2019-03-17 15:24:33 +01:00
daverck 71a0ee506e fix broken server icon 2019-03-17 15:19:59 +01:00
Dennis Felsing db97bb6c47
Merge pull request #1493 from ddnet/1109 
Version 11.9
 2019-03-16 20:46:56 +01:00
def 1bdea91abf Version 11.9 2019-03-16 10:56:07 +01:00
Dennis Felsing 3c0ea661ec
Merge pull request #1492 from daverck/master 
updated server icon
 2019-03-16 10:53:05 +01:00
daverck 9b6ff8e88b updated server icon 2019-03-16 10:19:42 +01:00
Dennis Felsing 2f84f7f194 ddnet-libs: mysqlcppconn 8.0.15 2019-03-15 10:25:22 +01:00
bors[bot] 1d9eb965fa Merge #1485 
1485: Browser's scoreboard now shows score based on cl_ddrace_scoreboard r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-03-12 22:47:38 +00:00
Dennis Felsing b033418d12
Merge pull request #1487 from 12pm/editbox-corners 
Don't change active edit box corners to default
 2019-03-12 22:42:17 +01:00
12pm ffe50b3b25 Don't change active edit box corners to default 2019-03-12 22:25:01 +01:00
bors[bot] 6a791fe8de Merge #1486 
1486: Fit image name in select button r=def- a=12pm

Adjusts font size a bit and truncates text if it overflows

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-03-12 20:12:09 +00:00
fokkonaut 8440b051f7
forgot one thing 2019-03-12 19:36:33 +01:00
12pm 0dd0de5ad4 Fit image name in select button 
Adjusts font size a bit and truncates text if it overflows
 2019-03-12 19:35:22 +01:00
fokkonaut 3f628de592
Update menus_browser.cpp 2019-03-12 19:33:47 +01:00
def bbec3b1f2f Minor style fixes 2019-03-12 19:29:18 +01:00
def 6701000931 Rename Score board to Scoreboard for consistency 2019-03-12 19:00:47 +01:00
def 6f9cfd5af1 Increase MAX_PATH_LENGTH to support our own downloadedmaps names 2019-03-12 18:43:03 +01:00
Dennis Felsing 984df7f49d
Merge pull request #1481 from 12pm/game-tiles 
Add auto game tiles to all possible layers, increase layer size if needed
 2019-03-12 16:54:04 +01:00
bors[bot] 98d54263c7 Merge #1477 
1477: Don't allow sound format changes, use preferred driver, print more debug info r=heinrich5991 a=def-

Someone should check if this works on Windows.

Co-authored-by: def <dennis@felsin9.de>
 2019-03-12 12:49:48 +00:00
bors[bot] a490ed0b2f Merge #1480 
1480: Use `EXPECT_*` rather than `ASSERT_*` in tests r=def- a=heinrich5991

`EXPECT_*` allows the test to continue even in the case of failure. Use
this where it makes sense to continue.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-03-12 06:16:24 +00:00
12pm 7c227c563d Add auto game tiles to all possible layers, increase layer size if needed 2019-03-12 02:35:29 +01:00
heinrich5991 8b3f0246a9 Use EXPECT_* rather than ASSERT_* in tests 
`EXPECT_*` allows the test to continue even in the case of failure. Use
this where it makes sense to continue.
 2019-03-12 02:06:54 +01:00
heinrich5991 c6f09f9d21 Make build directory more descriptive on CircleCI 2019-03-12 00:08:43 +01:00
fokkonaut 5c1dfe6b65 Scoreboard headline for score can now be Time when on DDRace 2019-03-11 23:10:21 +01:00
Dennis Felsing f0cce859ef
Merge pull request #1476 from ddnet/remove-save 
Remove save group/layer button (fixes #1475)
 2019-03-11 22:58:40 +01:00
Dennis Felsing 40591c2f8b Remove save group/layer button (fixes #1475) 2019-03-11 22:58:18 +01:00
Dennis Felsing b8c256b602
Merge pull request #1467 from 12pm/nameban_exact 
Add exact name ban option
 2019-03-11 22:50:39 +01:00
def a7548511bf Don't allow sound format changes, use preferred driver, print more debug info 2019-03-11 22:32:14 +01:00
12pm 6086f46bed Add substring tests 2019-03-11 15:00:51 +01:00
12pm 3dcb83778f Make name more descriptive 2019-03-11 14:48:45 +01:00
bors[bot] 185bfe7a6a Merge #1474 
1474: Fix automapper not removing the Opaque flag before checking if flags match r=def- a=bojidar-bg



Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2019-03-11 12:56:31 +00:00
Bojidar Marinov e944817472
Fix automapper not removing the Opaque flag before checking if flags match 2019-03-11 14:35:24 +02:00
bors[bot] d8e8a21a30 Merge #1469 
1469: Don't use strtok. Close #1468 r=heinrich5991 a=Learath2

^

Co-authored-by: Learath <learath2@gmail.com>
 2019-03-11 11:56:26 +00:00
Learath f6c15f1de0 Style 2019-03-11 14:54:31 +03:00
Learath 9713f6c2cd Improve interface to function 2019-03-11 14:39:54 +03:00
bors[bot] 60b4c7749f Merge #1471 
1471: Add a notification when files are not sorted in CMake r=def- a=heinrich5991

Would've solved the problem in teeworlds/teeworlds#2039 faster.

(cherry picked from commit fbdc6d69be)

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-03-07 11:34:31 +00:00
heinrich5991 632e91da3a Add a notification when files are not sorted in CMake 
Would've solved the problem in teeworlds/teeworlds#2039 faster.

(cherry picked from commit fbdc6d69be)
 2019-03-07 12:23:54 +01:00
def bc91659aa8 Get GAME_RELEASE_VERSION back, fix compatibility filter in server browser 2019-03-06 21:02:06 +01:00
bors[bot] 26dc51a272 Merge #1466 
1466: Add colors for authed players. Deprecates #1299 r=def- a=Learath2

Not sure if a snap item is the best idea for this but it should help with not sending the data more then needed and keeping it properly updated. The colors aren't great now but we can fix that easily.

![image](https://user-images.githubusercontent.com/490500/53680889-607bf780-3cf2-11e9-84a0-579160e9e170.png)


Co-authored-by: Learath <learath2@gmail.com>
 2019-03-06 13:44:28 +00:00
bors[bot] 8c9950e4c3 Merge #1470 
1470: Suggest installation of missing man generation dependencys r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-03-06 13:19:21 +00:00
ChillerDragon 6cae2cff40 Suggest installation of missing man generation dependencys 2019-03-06 02:12:22 +01:00
Learath c4af290df5 Don't use strtok. Close #1468 2019-03-05 12:46:29 +03:00