mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,788 Commits 7 Branches 39 Tags 355 MiB
Commit Graph

7788 Commits

Author SHA1 Message Date
OpenRCT2 git bot 3dc4b601b8 Merge Localisation/master into OpenRCT2/develop. 2016-06-06 04:00:21 +00:00
Michał Janiszewski f8fa637b68 Require OpenSSL in all but network-less builds (#3829) 2016-06-05 21:57:28 +01:00
Ted John 3b8f98c86b Merge pull request #3820 from X123M3-256/set_vehicle_friction 
Add command to set vehicle friction
 2016-06-04 21:37:18 +01:00
X7123M3-256 0f630bea2f Fix formatting 2016-06-04 20:21:04 +01:00
X7123M3-256 a03979087d Add error messages for invalid input 2016-06-04 19:48:39 +01:00
X7123M3-256 14f6da31c9 Fix segfaults on rides without vehicles 2016-06-04 17:44:29 +01:00
X7123M3-256 67d99a34f2 Implement command to set friction 2016-06-04 16:53:29 +01:00
OpenRCT2 git bot 4f6929edf6 Merge Localisation/master into OpenRCT2/develop. 2016-06-04 04:00:21 +00:00
Michał Janiszewski e5cd157edc Fix memory leak in TcpSocket (#3815) 2016-06-03 23:29:25 +01:00
Ted John e4c94d7966 fix #3813: Scrolling texts going rogue 2016-06-03 23:27:47 +01:00
Ted John a9bf0cdd4e fix #3811: Multiplayer Crash on join 
Game was probably being updated with title sequence sprite spatial index.
 2016-06-03 22:03:22 +01:00
Michał Janiszewski a79e793e67 Disable whole-project alignment for MSVC & MinGW (#3807) 
As OpenRCT2/OpenRCT2#3783 has now been merged, this should be
unnecessary.
 2016-06-03 19:07:52 +01:00
Ted John 428724d86c refactor reset_sprite_spatial_index, integrate gSpriteSpatialIndex 2016-06-03 18:13:00 +01:00
Ted John 3914e92117 Update ISSUE_TEMPLATE.md 2016-06-03 15:17:05 +01:00
Michał Janiszewski 628e263094 Fix #3804: use-after-free in TcpSocket (#3810) 2016-06-03 14:30:00 +01:00
Ted John d2aaad6f7e Merge pull request #3808 from janisozaur/fixes 
Fixes
 2016-06-03 12:28:44 +01:00
Michał Janiszewski a44cd9cb15 Fix undefined left shifts 2016-06-03 13:14:36 +02:00
Michał Janiszewski 24991b03ec Check for NULL mapElement in ride_update_station_blocksection 
Fixes #3434
 2016-06-03 13:14:35 +02:00
Ted John 82dd7601eb Merge pull request #3782 from janisozaur/desyncs 
synchronise reset_0x69EBE4 over network
 2016-06-03 10:47:01 +01:00
Ted John 5889522d74 Merge pull request #3783 from janisozaur/packed-structs 
Explicitly pack structs
 2016-06-03 10:42:43 +01:00
Michał Janiszewski 1508e49a28 Change macro to assert_struct_size 2016-06-03 11:29:50 +02:00
Michał Janiszewski 934ce5e84e Fix 64 bit by skipping static_asserts for structs with pointers 2016-06-03 10:55:21 +02:00
Michał Janiszewski 60630b9ad7 Drop `PACKED` attribute 2016-06-03 10:55:21 +02:00
Michał Janiszewski df3030e4a9 Provide static_assert for hard-coded struct sizes. 2016-06-03 10:55:21 +02:00
Michał Janiszewski 3907fcd9d2 Explicitly pack structs 2016-06-03 10:55:21 +02:00
OpenRCT2 git bot 7e291c32bc Merge Localisation/master into OpenRCT2/develop. 2016-06-03 04:00:19 +00:00
Michał Janiszewski 4955279b7b Synchronise reset_0x69EBE4 over network 
Clients calling reset_0x69EBE4 not in sync is a major cause of desyncs,
this change tries to force sync across clients
 2016-06-03 00:33:15 +02:00
Goddesen c004b986ae Moved new strings to uphold string ID order 2016-06-03 00:33:15 +02:00
Goddesen 5ee19db16b Added new cheat feature to changelog 2016-06-03 00:33:15 +02:00
Goddesen 0fdeb37053 Fixed space indentation 2016-06-03 00:33:15 +02:00
Goddesen 60fe00b088 Added Goddesen to contributors. 2016-06-03 00:33:15 +02:00
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