1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Commit Graph

7757 Commits

Author SHA1 Message Date
Goddesen
809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
Ted John
9b705c5a7e Merge pull request #3797 from IntelOrca/refactor/tcpsocket
Abstracts all socket code into a new class TcpSocket which is only exposed by a light interface, ITcpSocket. This now means that platform specific headers like winsock2.h and sys/socket.h do not have to be included in OpenRCT2 header files reducing include load and other issues.
2016-06-02 19:33:17 +01:00
Ted John
a153d07637 handle exceptions when setting up the TCP listener 2016-06-02 18:51:29 +01:00
Michael Steenbeek
768e915eed Merge pull request #3787 from Goddesen/nb-NO_support
Support for nb-NO
2016-06-02 19:41:23 +02:00
Hugo Wallenburg
9eab82a7d9 Update height check for slopes to match new limits. Fixes #3792. (#3799) 2016-06-02 19:34:37 +02:00
LRFLEW
473d574a88 Updated Xcode Project (#14) 2016-06-02 09:46:01 +01:00
Ted John
a984bd1396 Update readme.md
VS2015 Update 2 is now required due to AppVeyor upgrading, which builds the dependencies.
2016-06-02 09:29:50 +01:00
Michał Janiszewski
e3d04ff96d Fix TcpSocket for Linux compilers (#13) 2016-06-02 09:13:25 +01:00
Michał Janiszewski
3e927ce397 Update Travis OS X image to XCode 7.3 (#3801) 2016-06-02 09:11:16 +01:00
OpenRCT2 git bot
99a7346c3f Merge Localisation/master into OpenRCT2/develop. 2016-06-02 04:00:26 +00:00
Goddesen
e9e93cb60c Added space delimiter for Swedish currency, removed punctuation mark. 2016-06-02 00:56:28 +02:00
Goddesen
c60fce3549 Substituted tabs for spaces 2016-06-02 00:56:24 +02:00
Goddesen
b27aa56cff Removed Norwegian ID enum member, replaced spaces with tabs 2016-06-02 00:56:16 +02:00
Goddesen
20a4285cbf Added Norwegian translation to changelog 2016-06-02 00:56:08 +02:00
Goddesen
fe3ed939a1 Added Goddesen to list of translators 2016-06-02 00:56:00 +02:00
Goddesen
9aa5958484 Added support for Norwegian (nb-NO) 2016-06-02 00:55:49 +02:00
Ted John
8dfbabbd07 refactor network, create ITcpSocket
Abstracts all socket code into a new class TcpSocket which is only exposed by a light interface, ITcpSocket. This now means that platform specific headers like winsock2.h and sys/socket.h do not have to be included in OpenRCT2 header files reducing include load and other issues.
2016-06-01 23:01:20 +01:00
Michał Janiszewski
ad372a5aef Merge pull request #3795 from janisozaur/openssl
Explicitly require OpenSSL>=1.0.0
2016-06-01 22:49:11 +02:00
LRFLEW
859d861f14 Fix CMake OS X Build (#12) 2016-06-01 22:35:58 +02:00
Michał Janiszewski
778de4e285 Explicitly require OpenSSL>=1.0.0
This is to make sure CMake won't try using OS X's stale version of SSL
2016-06-01 22:23:20 +02:00
Michał Janiszewski
14de1cd5eb Restrict for MSVC (#3794) 2016-06-01 17:44:06 +01:00
Michał Janiszewski
268baa62f7 Add restrict for drawing function (#3793) 2016-06-01 15:40:31 +01:00
OpenRCT2 git bot
67f11318cd Merge Localisation/master into OpenRCT2/develop. 2016-06-01 04:00:20 +00:00
Michał Janiszewski
9d5827520a Replace shifting with multiplication when dragging (#3789)
`dx`, `dy` can be signed negative values, shifting them left is
undefined.
2016-05-31 22:03:31 +01:00
Ted John
27d846c2f4 fix #3786: Wrong server provider information 2016-05-31 19:24:07 +01:00
Ted John
7f3998d3ca Merge pull request #3777 from IntelOrca/feature/mpinfo
Add information tab to multiplayer window
2016-05-31 17:16:23 +01:00
Ted John
c66a755ef7 request server gameinfo for window 2016-05-31 17:16:08 +01:00
Ted John
7157199b45 add information tab to multiplayer 2016-05-31 17:16:08 +01:00
Ted John
b68da1189b Merge pull request #3776 from IntelOrca/feature/chatlogs
Save chat logs
2016-05-31 11:39:00 +01:00
OpenRCT2 git bot
649ea9c705 Merge Localisation/master into OpenRCT2/develop. 2016-05-31 04:00:17 +00:00
Ted John
2a614ec4d9 rename path bits (var_06) to (flags) 2016-05-30 23:39:43 +01:00
Ted John
3e307b8e2a name path addition flags 2016-05-30 23:31:36 +01:00
Ted John
2264027afa change directory name to 'chatlogs' 2016-05-30 18:03:31 +01:00
Ted John
feb65ea93c add option to log chat history 2016-05-30 18:01:17 +01:00
Ted John
618d13a9a3 save chat logs 2016-05-30 16:25:06 +01:00
Ted John
fbcc68dff1 fix #3575: Construction Redirection Bug
Was probably only caused when a player did not have 'Allow unfinished tracks to be tested' enabled. The function was too embeded to work into a callback function, so a new flag is added to say whether the current game command is network sourced or not. This now means the host has to have the unfinished tracks option enabled, otherwise nothing will happen on the client machine. Unfortunately if the host has it enabled and the client doesn't, the command will run on the host game but not the client game and desync. The option, like some of the cheats is game session fixed.
2016-05-30 12:39:17 +01:00
Ted John
8226c29d6c Merge pull request #3766 from IntelOrca/refactor/network
Refactor network
2016-05-30 12:04:02 +01:00
YJSoft
736b8787cf Add files to xcode project
For OpenRCT2/OpenRCT2#3766
2016-05-30 11:51:25 +01:00
Ted John
8cf4a1f03f add default case to fix clang error 2016-05-30 11:28:41 +01:00
Ted John
00d4904ba9 make DISABLE_NETWORK compatible 2016-05-30 11:28:14 +01:00
Ted John
c0ad5aadd8 revert unintentional changes to vcxproj 2016-05-30 11:28:14 +01:00
Michał Janiszewski
3a697609a5 Fixes to network refactoring (#11) 2016-05-30 11:28:13 +01:00
Ted John
d69ca7f479 conform to name convention 2016-05-30 11:28:09 +01:00
Ted John
623318a35d refactor NetworkPlayer 2016-05-30 11:18:07 +01:00
Ted John
3591026078 refactor NetworkAction 2016-05-30 11:18:07 +01:00
Ted John
31ac6e7fdf refactor NetworkConnection and NetworkPacket 2016-05-30 11:18:07 +01:00
Ted John
46ecd53a99 refactor NetworkAddress 2016-05-30 11:18:07 +01:00
OpenRCT2 git bot
b624d284aa Merge Localisation/master into OpenRCT2/develop. 2016-05-30 04:00:21 +00:00
Ted John
2334e701e4 fix infinite loop 2016-05-30 02:15:45 +01:00
Ted John
91b7db31d1 fix #3771: Crash when kicking player
The game did not check if the user hash existed in the map before trying to remove it.
2016-05-29 10:56:36 +01:00