Commit graph

7647 commits

Author SHA1 Message Date
Michał Janiszewski
2627ddc836 Update URL to libs zip for OS X 2016-05-27 20:28:34 +02:00
Marijn van der Werf
46d0ef71e9 Re-enable building of g2.dat 2016-05-27 20:28:33 +02:00
Marijn van der Werf
50699de9b4 Update library paths 2016-05-27 20:28:33 +02:00
LRFLEW
5d5c10f99f Fixed OS X Build 2016-05-27 20:28:33 +02:00
YJSoft
31e8c9bbf9 Update project file with suggested changes 2016-05-27 20:28:33 +02:00
YJSoft
b08efe7bda Add NetworkKey file and openssl ref.
Also changing library sha256
2016-05-27 20:28:33 +02:00
Michał Janiszewski
4ffceafdbb Make sure the challenge token is random and handled properly
This change also fixes passworded servers not working properly, as
strlen() was getting called on something that was not guaranteed to be
null-terminated string when signing the token.
2016-05-27 20:28:33 +02:00
Michał Janiszewski
66abc31fee Handle malformed private keys gracefully 2016-05-27 20:28:33 +02:00
Michał Janiszewski
553e1bdf0f Minor fixes to authorisation system 2016-05-27 20:28:33 +02:00
Michał Janiszewski
caa74acb1b Fixes for x86-64 2016-05-27 20:28:33 +02:00
Michał Janiszewski
a83154832c Formatting 2016-05-27 20:28:33 +02:00
Michał Janiszewski
589b5a3b43 Use v8 libs 2016-05-27 20:28:33 +02:00
Michał Janiszewski
839fc3938f Add NetworkKey files to VS project 2016-05-27 20:28:33 +02:00
Michał Janiszewski
715ba561b1 Initial version of key-based auth 2016-05-27 20:28:33 +02:00
Michał Janiszewski
1c459c8186 Add NetworkKey class 2016-05-27 20:28:33 +02:00
Michał Janiszewski
40253a7add Prevent SIGPIPE-ing on Linux when clients drop (#3755)
`send()` can only write to connected sockets [1]. In case where client
drops out, a socket may become closed by OS but we can still enqueue
packets for its connection and eventually call `send()`, which will
generate a SIGPIPE and shut the server down, because there was no
`MSG_NOSIGNAL` set.

This commit makes sure `MSG_NOSIGNAL` is used on Linux.

[1] http://linux.die.net/man/2/send
2016-05-27 17:44:23 +01:00
Michał Janiszewski
91443d0e75 Update docker files (#3752)
Updates to recent ArchLinux changes, simplifaction

It hopefully creates smaller images and thus improves build throughput
on travis.
2016-05-27 14:46:25 +01:00
YJSoft
e3ac505d10 Fix .travis.yml script error (#3751)
This PR fixes script error introduced by #3750

- `else;` -> `else`
- `openrct2-linux.tar.gz.zip` -> `openrct2-linux.tar.gz`
2016-05-27 07:04:24 +02:00
Michał Janiszewski
5602661a27 Publish travis artifacts to transfer.sh (#3750) 2016-05-27 00:03:31 +01:00
Yaroslav Tretyakov
8ee923f33d Fix #3735: Advertisement campaign window bug (#3745) 2016-05-26 19:43:53 +01:00
jensj12
f4690fb879 Remove duplicate check (#3743) 2016-05-26 15:56:57 +01:00
Ted John
871c6c2c90 Fix build.ps1 (#3742)
Fixes building on PowerShell 5, for some reason this wasn't a problem in 4.
2016-05-26 13:32:08 +01:00
CraigCraig
3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
OpenRCT2 git bot
95249cf1df Merge Localisation/master into OpenRCT2/develop. 2016-05-26 04:00:47 +00:00
Michael Steenbeek
712d97da79 Remove Intamin and Phoenix easter eggs (#3732) 2016-05-25 20:01:24 +01:00
Ted John
4afde28be3 Merge pull request #3724 from marijnvdwerf/paint-setup/ghost-train
Paint setup/ghost train
2016-05-25 14:30:48 +01:00
Marijn van der Werf
30e82ba82c Fix car ride station drawing 2016-05-25 14:59:52 +02:00
Marijn van der Werf
b276604277 Draw station 2016-05-25 14:59:33 +02:00
Marijn van der Werf
26ff0ab5a5 Paint 3-tile turn 2016-05-25 14:54:15 +02:00
Marijn van der Werf
3e11d70272 Draw spinning tunnel 2016-05-25 14:44:06 +02:00
Marijn van der Werf
e74435af64 Paint quarter turn 2016-05-25 14:26:35 +02:00
Marijn van der Werf
91a470c905 Draw inverse slopes 2016-05-25 14:26:35 +02:00
Marijn van der Werf
9fdb73452d Draw 25 deg up to flat 2016-05-25 14:26:35 +02:00
Marijn van der Werf
75493a5433 Draw flat to 25 deg up 2016-05-25 14:26:35 +02:00
Marijn van der Werf
9e84237da3 Paint 25 deg up 2016-05-25 14:26:35 +02:00
Marijn van der Werf
2723713f7f Draw brakes 2016-05-25 14:26:35 +02:00
Marijn van der Werf
f618a67dc4 Draw flat track 2016-05-25 14:26:35 +02:00
Ted John
1290d57b04 Merge pull request #3721 from marijnvdwerf/paint-setup/car-ride
Paint setup/car ride
2016-05-25 13:16:41 +01:00
Harry Lam
47ed7c94df Improve Chinese Currencies (#3729)
[CI Skip]
Suffix -> Prefix, and fix CNY name from HKD to CNY.
2016-05-25 14:05:27 +02:00
Ted John
714baf2979 Merge pull request #3723 from Gymnasiast/remove-bmp-screenshots
Remove support for BMP screenshots
2016-05-25 08:01:23 +01:00
Ted John
269dd34b85 Merge pull request #3727 from zsilencer/integrate
Integrate scenery paint values
2016-05-25 07:58:38 +01:00
Michael Steenbeek
4e4c829b1a Add removal of BMP screenshots to changelog 2016-05-25 08:50:00 +02:00
zsilencer
24ab08f845 Integrate 9A3E7C 2016-05-25 00:03:26 -06:00
zsilencer
df5ad2c025 Integrate 98E3C4 2016-05-25 00:03:25 -06:00
zsilencer
1c5a73db54 integrate ScenerySubTileOffsets 2016-05-25 00:03:25 -06:00
OpenRCT2 git bot
f04fa3ca4f Merge Localisation/master into OpenRCT2/develop. 2016-05-25 04:00:21 +00:00
Yaroslav Tretyakov
90d8683e67 Fix #3718: fence height incorrect (#3726) 2016-05-25 01:03:37 +01:00
Marijn van der Werf
30c4f2232b Draw station 2016-05-24 21:31:46 +02:00
Marijn van der Werf
7e92395bf5 Draw 3-tile turns 2016-05-24 21:31:44 +02:00
Marijn van der Werf
ed08deaac1 Paint quarter turns 2016-05-24 21:31:07 +02:00