Commit graph

6892 commits

Author SHA1 Message Date
heinrich5991 5ab2afeabd Merge pull request #651 from Learath2/dd_pr_teamchat
Fix coloring of team chat. Fixes #648
2017-03-06 14:06:37 +01:00
Learath2 a87edad978 Move to a cpp file 2017-03-06 14:04:09 +01:00
Learath2 5317be824e Fix coloring of team chat. Fixes #648 2017-03-06 10:24:00 +01:00
def de7587b8b5 Version 10.4.2 2017-03-05 20:19:46 +01:00
heinrich5991 a13cdc25b2 Merge pull request #632 from Learath2/dd_pr_friend
Put hearts before friends names. Closes #606
2017-03-04 15:37:24 +01:00
Dennis Felsing acb1ada28c Merge pull request #637 from necropotame/pr-i636-memoryleak
Fixed memory leak after gametype change
2017-03-02 09:47:34 +01:00
necropotame 2c24fbce25 Fixed #636 2017-03-02 09:27:03 +01:00
Dennis Felsing 4c1053c6c4 Merge pull request #635 from heinrich5991/pr_dummy_input_demo_filter
Refactor dummy input and demo filtering
2017-03-01 07:59:24 +01:00
heinrich5991 b841fdc203 Bump version requirement for warmup race timer 2017-03-01 00:08:56 +01:00
heinrich5991 6517567e7e Merge pull request #602 from necropotame/gametick
Send the race time using warmup timer
2017-03-01 00:05:22 +01:00
heinrich5991 305a67d492 Initialize variable in the demo recorder 2017-02-28 17:16:22 +01:00
heinrich5991 e3f2316106 Revert "Revert "Refactor dummy input and demo filtering""
This reverts commit 187560c8c0.
2017-02-28 10:08:14 +01:00
Dennis Felsing 45c27e8b10 Version 10.4.1 2017-02-28 08:16:08 +01:00
Dennis Felsing 187560c8c0 Revert "Refactor dummy input and demo filtering"
This reverts commit 8375f4888e.
2017-02-28 08:15:35 +01:00
necropotame 6a9406dc81 Fixed merge conflict 2017-02-28 07:31:39 +01:00
necropotame b6548aa8cf Fix wrong code convension, add enum for timer display type 2017-02-28 07:31:24 +01:00
necropotame 4cfe96801b Send the race time using warmup timer 2017-02-28 07:31:24 +01:00
Learath2 7af41f6765 Actually use the color chosen 2017-02-28 01:23:10 +03:00
Learath2 fa22425f26 Add a checkbox to disable friend heart 2017-02-27 23:56:22 +03:00
Learath2 c783122301 Do not override the team color 2017-02-27 23:42:48 +03:00
Learath2 c76849c51a Add sliders for friend chat color 2017-02-27 23:39:06 +03:00
Learath2 3b2d707f31 Add a second page to HUD page 2017-02-27 23:38:24 +03:00
Learath2 cd1f337bf5 Put hearts before friends names. Closes #606 2017-02-27 22:38:08 +03:00
Dennis Felsing 16f04d8989 Version 10.4 2017-02-27 16:33:10 +01:00
Dennis Felsing eb36f421c5 Merge pull request #630 from heinrich5991/pr_ddnet_cmake_basic
Add overly simple CMakeLists.txt
2017-02-27 16:28:19 +01:00
heinrich5991 4912312fb9 Make dependency errors less fatal, to show all of them at once 2017-02-23 16:29:13 +01:00
necropotame 2815a7e042 Cleanup, better separation between each part, more options, check for missing dependencies 2017-02-23 16:27:33 +01:00
necropotame 8c7608f1bb Set the default build type to 'Release' 2017-02-23 16:23:16 +01:00
necropotame 397ef29bed Add mariadb in FindMySQL.cmake 2017-02-23 16:23:16 +01:00
necropotame eff3ca8bf3 Change CMake required version from 3.7 to 2.8 2017-02-23 16:23:16 +01:00
heinrich5991 aff784a7db Use pkg-config for freetype as well 2017-02-23 14:42:16 +01:00
heinrich5991 5d61aa0b6e Add CMakeLists.txt that work on my machine
It probably doesn't work on Windows, at least.
2017-02-23 14:16:32 +01:00
heinrich5991 8375f4888e Refactor dummy input and demo filtering
Remove references to src/game/ from src/engine/
2017-02-23 14:13:14 +01:00
heinrich5991 55e5ce69ef Merge pull request #627 from Learath2/dd_pr_trailing
Get rid of trailing whitespaces
2017-02-21 17:18:03 +01:00
Learath2 09552a6d9f Get rid of trailing whitespaces 2017-02-21 19:11:43 +03:00
heinrich5991 1a103081b8 Merge pull request #623 from Ryozuki/pr_ctrl_backspace_fix
ctrl + backspace support on chat (Fixes ddnet#515)
2017-02-18 10:41:42 +01:00
Ryozuki 9af59fe8f3 tiny style changes 2017-02-18 09:02:29 +01:00
heinrich5991 0f50356e2d Merge pull request #624 from Redix/pr_stats
Statboard fix
2017-02-18 02:36:33 +01:00
Redix abcb074dcc Fixed statboard
- FPM value
- reset when a player leaves
2017-02-15 16:43:45 +01:00
Ryozuki 141a256cb3 Delete useless brackets 2017-02-14 17:06:51 +01:00
Ryozuki ec957fc00e ctrl + backspace support on chat (Fixes ddnet#515) 2017-02-14 17:00:50 +01:00
heinrich5991 5b512989cb Merge pull request #620 from Learath2/dd_pr_fixindent
Fix horrible indent.
2017-02-10 01:19:19 +01:00
Learath2 9cd5fa53e5 Fix horrible indent. 2017-02-09 13:01:19 +01:00
heinrich5991 609c8db0e4 Merge pull request #618 from necropotame/pr-palestine
Add palestinian flag (completed version)
2017-02-03 12:46:53 +01:00
heinrich5991 6b9178125b Merge pull request #593 from Echchouik/master
Add palestinian flag
2017-02-03 12:46:31 +01:00
necropotame 3c8f6938b7 Add palestinian flag in countryflags index 2017-02-03 11:23:24 +01:00
heinrich5991 67062d8d84 Merge pull request #613 from marcelherd/feature/printbind
New command bind_print
2017-02-02 14:32:03 +01:00
heinrich5991 33cb627772 Merge pull request #617 from east/dnsblfix2
dnsbl fix: HostLookup check result properly
2017-02-02 09:28:21 +01:00
east 0acad1a28b dnsbl fix: HostLookup check result properly 2017-02-01 12:13:50 +01:00
Marcel Herd 7737129ed6 Fixed code style 2017-01-28 18:34:24 +01:00