Commit graph

19661 commits

Author SHA1 Message Date
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
Dennis Felsing b42ae74d29 Merge pull request #701 from Learath2/dd_pr_hudsettings
Properly calculate the width. Fixes #699
2017-03-22 12:47:14 +01:00
Learath2 55c5c3eac6 Properly calculate the width. Fixes #699 2017-03-22 12:10:22 +01:00
Dennis Felsing 70fec01fda Merge pull request #700 from Learath2/dd_pr_multiline
Fix line width. Closes #687
2017-03-22 09:57:31 +01:00
Learath2 2849e23003 Fix line width. Closes #687 2017-03-22 09:56:28 +01:00
heinrich5991 c5269fc764 Deny warnings on CI 2017-03-21 09:19:02 +01:00
Dennis Felsing 90b51d140a Merge pull request #688 from heinrich5991/pr_ddnet_cmake_client_link_order
Fix link order for the client libraries
2017-03-20 08:29:30 +01:00
heinrich5991 f5446ca3b0 Fix unsigned/signed comparison warning when interacting with freetype 2017-03-19 17:19:59 +01:00
heinrich5991 1be6a5d397 CMake every target 2017-03-19 17:18:17 +01:00
heinrich5991 d52870cb35 Remove GREATER_EQUAL (introduced in CMake 3.7) 2017-03-19 17:18:17 +01:00
heinrich5991 57009f6467 Generator expressions using COMPILE_LANGUAGE are only available from 3.3 2017-03-19 17:18:17 +01:00
heinrich5991 ec0f0b28d7 Fix cmake/FindFreetype.cmake a bit 2017-03-19 17:18:17 +01:00
heinrich5991 efb43ddff8 Remove usages of target_sources
This command would require CMake 3.1.
2017-03-19 17:18:17 +01:00
heinrich5991 fb84568cd5 Also test CMake on CircleCI 2017-03-19 17:18:17 +01:00
heinrich5991 e1728eced4 Add appveyor.yml 2017-03-18 17:09:04 +01:00
heinrich5991 5eb2068f75 Check if -fstack-protector-all works before using it
MinGW apparantly accepts this flag, but can't successfully link
afterwards.
2017-03-18 11:55:50 +01:00
heinrich5991 d10ab196f5 Fix link order for the client libraries
Fixes #686.
2017-03-18 01:20:55 +01:00
def 125764815b Update credits (I probably missed a few) 2017-03-16 19:17:24 +01:00
heinrich5991 b904822d57 Merge pull request #680 from necropotame/pr-i586-killborder
Fix #586 (display the killing clipping rectangle)
2017-03-16 17:00:57 +01:00
necropotame c63c54d68e Changes after heinrich5991's review of #586 - Fix code alignment 2017-03-16 16:51:52 +01:00
necropotame 5ddf0a5421 Changes after heinrich5991's review of #586 - Fix some more comments 2017-03-16 16:41:58 +01:00
necropotame 9bae313929 Changes after heinrich5991's review of #586 - Code cleanup, Fix typo, Fix bug with Y clipping 2017-03-16 16:39:29 +01:00
Dennis Felsing a03d87a537 Merge pull request #682 from heinrich5991/pr_ddnet_revert_gameplay_change
Partially revert #681
2017-03-16 10:22:43 +01:00
heinrich5991 f7dde1e061 Partially revert #681
The refactoring can cause a gameplay change, laws of associativity like
`x * (1 / z) == (x * 1) / z` don't hold for floating point numbers.
2017-03-16 10:19:08 +01:00
necropotame 6c3ac82f31 Merge pull request #681 from Ryozuki/pr_vmath
Fix a typo and refactor the normalize function
2017-03-16 08:19:39 +01:00
Ryozuki d0c317d7c7 Fix a typo and refactor the normalize function 2017-03-16 07:55:49 +01:00
heinrich5991 afce3c9d3d Merge pull request #678 from necropotame/pr-i662-timer
Fix #662 (timer command displays the wrong state)
2017-03-15 12:32:32 +01:00
necropotame 4027b3dc01 Add error message in case of invalid argument for /timer 2017-03-15 12:22:13 +01:00
necropotame 6f58c49f7d Fix #586 (display the killing clipping rectangle) 2017-03-15 12:06:13 +01:00
necropotame e4345307c1 Fix #662 (timer command displays the wrong state) 2017-03-15 11:11:01 +01:00
Dennis Felsing 7f407aa303 Remove useless comment 2017-03-14 08:46:24 +01:00
necropotame a7532a5153 Merge pull request #674 from heinrich5991/pr_ddnet_cmake_check_fortify_source_harder
CMakeLists.txt: Check for _FORTIFY_SOURCE defines even harder
2017-03-13 18:23:59 +01:00
heinrich5991 5b8052ff9d CMakeLists.txt: Check for _FORTIFY_SOURCE defines even harder 2017-03-13 16:45:27 +01:00
Dennis Felsing 32a1fa0c07 Merge pull request #672 from Learath2/dd_pr_hearts
Forgot m_Friend isn't initialized, also align the messages
2017-03-13 12:04:47 +01:00
Dennis Felsing f488c82bd6 Merge pull request #671 from heinrich5991/pr_ddnet_cytral_refactor
Completed the refactor
2017-03-13 12:04:15 +01:00
Learath2 3bd94b9ada Forgot m_Friend isn't initialized, also align the messages 2017-03-12 22:32:05 +01:00
heinrich5991 54c5faa64c Complete the refactor 2017-03-12 19:52:29 +01:00
Alexandre Díaz 3589ed0b0f Start refactor... 2017-03-12 19:30:55 +01:00
heinrich5991 ccb9db9899 Merge pull request #652 from Learath2/dd_pr_invite
Add /invite for locked teams. Fixes #647
2017-03-12 19:04:55 +01:00
heinrich5991 b3b512b27e Merge pull request #667 from Redix/pc_cmake
CMake improvements
2017-03-12 18:53:17 +01:00
Redix 50be0ab7cf Use static CRT on windows 2017-03-12 17:41:57 +01:00
heinrich5991 7cc4f8bf48 Merge pull request #668 from Learath2/dd_pr_chatoops
Fix array subscript below array bounds
2017-03-12 17:40:23 +01:00
Learath2 c81f53ab6b Forgot CID can be -1 2017-03-12 17:37:16 +01:00
Redix 2b91785415 Use multiple cores in MSVC 2017-03-12 17:28:42 +01:00
Redix dfdd08ae7a Disable some warnings on win64 2017-03-12 17:28:40 +01:00
heinrich5991 d91cca728d Partially revert warning-fixing, it caused warnings on other systems 2017-03-12 16:47:37 +01:00
Redix 3911504bd9 Minor cmake fixes
zlib is already included in DEPS_CLIENT
2017-03-12 16:19:23 +01:00
Redix 8b418292c2 Fix typo in CMakeLists.txt 2017-03-12 15:56:44 +01:00
heinrich5991 94e8e26f8d Merge pull request #664 from Learath2/dd_pr_friends2
Just color the heart preserving team information. Fixes #606
2017-03-12 15:18:04 +01:00
heinrich5991 5eb036a1a9 Merge pull request #666 from Ryozuki/pr_fix_warnings
Fix some warnings
2017-03-12 15:16:25 +01:00