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

11996 Commits

Author SHA1 Message Date
Michał Janiszewski 7c4ee751cc Update changelog 
[ci skip]
 2017-06-19 12:53:59 +02:00
LRFLEW e9e2b79f1c Update Xcode Project 2017-06-19 12:37:50 +02:00
Michał Janiszewski 990a153b82 Add support for benchmarking park rendering 2017-06-19 12:37:50 +02:00
Michael Steenbeek 4019dee565 en-GB: Change name of 'Midi Coaster' 2017-06-19 12:36:28 +02:00
Michael Steenbeek 9c3a16b6e0 Merge pull request #5611 from OpenRCT2/android 
Android
 2017-06-19 10:25:18 +02:00
Marijn van der Werf fce13043ab ignore .externalNativebuild 2017-06-19 03:27:28 +02:00
Marijn van der Werf ec81f2f9fc Optimize graphics 2017-06-19 03:17:16 +02:00
Marijn van der Werf ddff36c9ee tabs to spaces 2017-06-19 02:54:21 +02:00
Marijn van der Werf fa2ea1b5ba Update dependency URL 2017-06-19 02:54:14 +02:00
Richard Jenkins 306d2623ef Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly (#5633) 
* Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly

And revert incorrect 'fix'

* Remove all keyboard defines from platform.h
 2017-06-18 21:47:51 +02:00
ZehM4tt 08230f047c Fix desync if "Handyman mow grass by default" is checked. (#5652) 2017-06-18 20:43:15 +02:00
Gymnasiast 595e73e2d9 Name GAME_COMMAND_FLAG_7 2017-06-18 18:25:49 +02:00
duncanspumpkin e9038e5a92 Remove unneccesary casts. 
Casts had previously been used when the types were unknown. They are now known and can be removed
 2017-06-18 08:07:29 +01:00
ZehM4tt efdac19f3b Extract game commands execution​ from within network_update. (#5642) 
* Moved out command processing from network_update into its own function. This should fix some false positives calling scenario_rand from a command callback.

* Fix Server_Handle_GAMECMD to use the command queue instead of executing directly.

* Exit the queue processing to still check for desync
 2017-06-18 08:03:37 +02:00
OpenRCT2 git bot c018cff5a3 Merge Localisation/master into OpenRCT2/develop. 2017-06-18 04:00:26 +00:00
Gymnasiast 9f5d1cf40a Fix ride naming in S4 import, cleanup 2017-06-17 19:10:53 +02:00
Richard Jenkins 312adaf8e7 Merge pull request #5644 from Gymnasiast/max-stations 
Add define for number of colour schemes, correct several cases of max stations per ride
 2017-06-17 14:32:36 +01:00
Gymnasiast 631f4d8907 Add a constant for RIDE_ENTRY_INDEX_NULL 2017-06-17 14:32:15 +02:00
Gymnasiast ed905f3c68 Add define for number of colour schemes, correct several cases of max stations per ride 2017-06-17 14:31:48 +02:00
Gymnasiast 26cd0da5be Check the first non-null ride type in object selection 2017-06-17 13:52:17 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +02:00
Gymnasiast d782018a8f Fix trailing whitespace and RIDE_TYPE_NULL in new_ride.c 2017-06-17 13:33:25 +02:00
ZehM4tt f05e94c1c6 Fixed a desync that would happen when having the guests list open. (#5632) 
* Fixed a desync that would happen when having the guests list open.
* Refactored the flashing state of peeps to not affect the flags.
* Added deprecation info for SPRITE_FLAGS_PEEP_FLASHING.
* Removed unused line that used the old flag.
* Update network version
 2017-06-17 12:55:41 +02:00
rwjuk 7094bbf74a Fix #5635, overflow when calculating loan interest 
Introduces 64-bit money type
 2017-06-17 12:20:22 +02:00
Gymnasiast e8188a309a Add cmake-build-debug to .gitignore 
[ci skip]
 2017-06-17 11:53:50 +02:00
ZehM4tt 5bb8dfb49c Remove queued game commands that would be impossible to execute. 
Added a warning instead of assert for commands that are discarded.
 2017-06-17 11:49:26 +02:00
ZehM4tt 4362314f70 Clarified the comment. 2017-06-17 11:49:26 +02:00
ZehM4tt ea59769cfd Fixes clients receiving commands before the map data is sent and loaded. 2017-06-17 11:49:26 +02:00
OpenRCT2 git bot bb0a655558 Merge Localisation/master into OpenRCT2/develop. 2017-06-17 04:00:19 +00:00
Marijn van der Werf 0341841cf7 Remove commented function 2017-06-16 22:55:08 +02:00
ZehM4tt 9e1711c345 Fix some scenery, path placement and construction mode desyncs 2017-06-16 09:45:00 +02:00
wolfreak99 69a800f285 remove unused gRCT2AddressSavedGamesPath2 (#5626) 2017-06-16 07:53:09 +01:00
OpenRCT2 git bot 183e338173 Merge Localisation/master into OpenRCT2/develop. 2017-06-16 04:00:22 +00:00
Michał Janiszewski 5077f2d78a Mark Path::Combine template as static 2017-06-15 22:55:33 +02:00
Marijn van der Werf 8766ec37a1 Add Android project 2017-06-15 14:22:15 +02:00
rwjuk 5f5f12a63c Fix #5617: PLATFORM_MODIFIER defined twice for macOS 2017-06-15 07:47:31 +02:00
Richard Jenkins 46bdd0926c Merge pull request #5619 from janisozaur/non-virtual-dtor 
Add -Wnon-virtual-dtor warning
 2017-06-14 23:49:28 +01:00
Michał Janiszewski 61cca38bee Add -Wnon-virtual-dtor warning 2017-06-15 00:26:31 +02:00
Marijn van der Werf 297d6ba1d5 Add virtual destructor 2017-06-15 00:16:55 +02:00
Michał Janiszewski 4851a45a83 Detect warnings for all parts of compilation (#5618) 2017-06-15 00:08:41 +02:00
Michał Janiszewski 3750a89089 Update ubuntu_amd64 docker image to clang 4.0 2017-06-14 23:19:56 +02:00
Ted John 1dae7f9f32 Move SDL_LoadBMP call to libopenrct2ui (#5616) 2017-06-14 19:47:22 +01:00
wolfreak99 46b575ee18 Remove unnecessary gFirstTimeSaving call, handle gFirstTimeSaving in game_load_save 2017-06-14 16:28:11 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Gymnasiast f3f15d18f7 Replace more occurrences of scenery IDs 2017-06-14 16:06:43 +02:00
Christian F. Coors c506c4be2d Add defines for scenery IDs 2017-06-14 16:06:43 +02:00
Gymnasiast 4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek 08a668bb0d Add missing fixes to changelog 2017-06-14 13:40:24 +02:00
Michael Steenbeek 96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode 
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
 2017-06-14 13:31:27 +02:00
Ted John fda2f38097 Merge pull request #5589 from duncanspumpkin/remove_win32_debug 
Remove Win32 debug special builds as they no longer work and we will soon be removing RCT2 interop entirely.
 2017-06-14 07:45:15 +01:00