Commit graph

7491 commits

Author SHA1 Message Date
Dennis Felsing 81f704516f Merge pull request #857 from heinrich5991/pr_ddnet_fix_msvs_warnings
Fix MSVS warnings, activate /WX for CI on Windows
2017-09-16 11:19:53 +02:00
Dennis Felsing f60eb5658f Merge pull request #836 from heinrich5991/pr_ddnet_unify_icons
Unify icons for gcc and MSVC, fix server icon
2017-09-16 11:18:40 +02:00
Dennis Felsing 43d0299a45 Merge branch 'master' into pr_ddnet_fix_msvs_warnings 2017-09-16 11:17:39 +02:00
Dennis Felsing 455bcdd160 Merge pull request #863 from Learath2/dd_pr_circleartifact
Tidy up circle.yml, test artifact collection
2017-09-16 11:16:04 +02:00
Learath2 10909205e7 Typos everywhere 2017-09-15 00:57:04 +02:00
Learath2 c3fcbd53ca Fix typo 2017-09-15 00:43:43 +02:00
Learath2 dd762d360c AppVeyor doesn't like pushd/popd 2017-09-15 00:35:27 +02:00
Learath2 1597a0e21f Try getting both arches 2017-09-15 00:30:29 +02:00
Learath2 66d0784f0d Compile with Release config, fix path for artifact 2017-09-15 00:06:39 +02:00
Learath2 ffeb76cbe0 Let cmake determine what to run 2017-09-14 23:59:38 +02:00
Learath2 aaf58acbf5 Revert OCD for AppVeyor 2017-09-14 23:47:50 +02:00
Learath2 1e869c0557 Test packaging and artifact collection on AppVeyor 2017-09-14 23:44:57 +02:00
Learath2 f4c51d4387 Use curl instead of wget 2017-09-14 22:16:21 +02:00
Learath2 461958828b Update cmake before building 2017-09-14 22:08:59 +02:00
Learath2 9543b05e31 Fix globbing mistake, install xz-utils 2017-09-14 16:03:38 +02:00
Learath2 71a15f39c6 Tidy up circle.yml, test artifact collection 2017-09-14 16:03:38 +02:00
Learath2 fdac17ceb4 Merge pull request #864 from heinrich5991/pr_ddnet_older_cmake_package
Add compatibility with older CMake for `package`
2017-09-14 15:54:42 +02:00
heinrich5991 a34b1f4dd7 Add compatibility with older CMake for package 2017-09-13 22:38:25 +02:00
Dennis Felsing e68992518d Merge pull request #862 from ChillerDragon/master
removed crypto lib from bam.lua (macOS compile improvement)
2017-09-13 13:39:46 +02:00
Chiller Dragon 939ea3c918 removed crypto lib from bam.lua (macOS compile improvement) 2017-09-13 12:30:07 +02:00
def 73d9ad7615 Really only download ddnet-info.json at correct time 2017-09-08 22:16:00 +02:00
def 715ac673ec Version 10.8.6 2017-09-08 22:01:51 +02:00
def 0302393512 builds now 2017-09-08 21:01:38 +02:00
def 874c8381f2 macosx freetype try 2017-09-08 20:48:53 +02:00
def e7e1070adf WinXP: Use http://info.ddnet.tw 2017-09-08 20:06:48 +02:00
def c2c453bd45 Make sending name to info.ddnet.tw optional, show dialog at start and some minor fixes 2017-09-07 20:51:46 +02:00
Dennis Felsing 84a30ff8c8 Merge pull request #858 from rffontenelle/patch-1
Update Brazilian Portuguese translation
2017-09-06 15:15:15 +02:00
Rafael Fontenelle c93189b61a Update Brazilian Portuguese translation 2017-09-06 09:56:53 -03:00
Dennis Felsing fa5efcaeb2 Merge pull request #835 from heinrich5991/pr_ddnet_cmake_install
Add `install`, `package` and `package_source` targets to CMake
2017-09-06 12:00:58 +02:00
heinrich5991 e86edcd7ee Add /WX to CI on Windows (equivalent of -Werror) 2017-09-06 11:05:09 +02:00
heinrich5991 4d96090770 Fix MSVS warnings
```
warning C4291: no matching operator delete found; memory will not be freed if initialization throws an exception
warning C4305: truncation from 'double' to 'float'
warning C4805: unsafe mix of type 'bool' and type 'int' in operation
```
2017-09-06 10:54:29 +02:00
heinrich5991 8b2e31620f Compatibility with older CMake
Copy each file individually, only pass --type parameter for creating
zips.
2017-09-05 21:52:54 +02:00
heinrich5991 45d944162a Add package targets independent of CPack
This makes packaging compatible to CMake versions prior to CMake 3.6.
2017-09-05 16:00:50 +02:00
heinrich5991 38c26de47b Add install, package and package_source targets to CMake
On Linux, `install` installs DDNet into the normal file system (root
rights required).

`package` tries to create an archive similar to today's release archives
and `package_source` tries to create a source archive similar to today's
source archives.
2017-09-05 15:55:38 +02:00
def 58d1294b3c oops 2017-09-03 23:50:27 +02:00
def d5fc3210fd Version 10.8.5 2017-09-03 23:46:58 +02:00
def 8b1470c31f Revert "Merge GAME_VERSION and GAME_RELEASE_VERSION"
This reverts commit 5cfd779c68.
2017-09-03 23:46:15 +02:00
def 4b39a39e10 Version 10.8.4 2017-09-03 19:30:29 +02:00
def 278c1ee198 Add Toggle ghost control (fixes #823) 2017-09-03 19:23:59 +02:00
def 5cfd779c68 Merge GAME_VERSION and GAME_RELEASE_VERSION 2017-09-03 18:54:43 +02:00
def caec69abc1 RequestDDNetInfo in ingame menu too 2017-09-03 18:17:21 +02:00
def 89ed22e8d8 Introduce ddnet-info.json
- Single json file containing all information for the client
- Fetched from https://info.ddnet.tw/info?name=deen
- Replaces versionsrv, news, ddnet-maps.json and ddnet-ranks.json
- Servers are sorted by most popular ones for respective player
- Always stays < 100 ms response time, compared to occasional 50 s for
  old ddnet-ranks.json
2017-09-03 17:42:04 +02:00
def 27b7549bba Make --silent stop stdout logging 2017-09-03 10:37:24 +02:00
def 2e537684d5 actually don't need the family 2017-09-03 09:20:46 +02:00
def f2a7f5f8dd User agent in http fetcher 2017-09-03 09:18:00 +02:00
def 0a09af4b33 str_format instead of sprintf 2017-09-03 09:01:25 +02:00
def 42bc38227d Request server list and ranks at better location 2017-09-03 09:00:57 +02:00
def 7b6317a5d6 buffer sizes 2017-09-03 08:53:54 +02:00
def 862e26dd08 Clean up time handling a bit 2017-09-03 08:48:21 +02:00
def e64e59a839 semaphore instead of busy waiting in CJobPool 2017-09-02 12:30:55 +02:00