Commit Graph

10561 Commits

Author SHA1 Message Date
LRFLEW 47c532d020 Don't zoom to cursor for keyboard or toolbar inputs (#5028) 2017-01-11 17:43:11 -06:00
Michael Steenbeek e3cf32342b Use constant for random colour 2017-01-11 23:00:28 +01:00
Gymnasiast 7767f506be Fix balloon stall 2017-01-11 22:59:45 +01:00
Michał Janiszewski 9aadf6ce42 Fix #5050 Increase required jansson version to 2.5 2017-01-11 22:02:25 +01:00
Michael Steenbeek 92feea1612 Clean up metal supports 2017-01-11 20:23:47 +01:00
Ted John e6dc4f179d Fix Debug | Win32 (RCT2) builds for VS 2017-01-11 18:33:08 +00:00
OpenRCT2 git bot ea25a022ee Merge Localisation/master into OpenRCT2/develop. 2017-01-11 04:00:17 +00:00
Marijn van der Werf b8bb3924a7 Fix cheat window colours (#5041) 2017-01-11 00:39:52 +01:00
wolfreak99 0316decb6b Update network version for Add/set money commands (#5042) 2017-01-11 00:35:22 +01:00
wolfreak99 8932f61a67 Add cheats to set/add money by custom amounts 2017-01-10 23:43:42 +01:00
Ted John f94daa08df Merge pull request #5027 from IntelOrca/refactor/vs-static-lib
This merge does several things:
* Changes all the code to be built as a static library, `libopenrct2.lib`
* Adds two new projects to produce `openrct2.dll` and `openrct2.exe`
* Adds a build step to create `openrct2.com`

This is to remove the test configurations and make building the test projects quicker and simpler.
It also distributes two very small shims, `openrct2.exe` and `openrct2.com` which are a GUI windows app and console app respectively. This simplifies the experience of using openrct2 on the command line as .com has higher precedence. `--console` is therefore no longer necessary.

`libopenrct2.lib` will probably be the beginning of several static libraries which make up the game as we will split up the UI from the core logic and possibly more.
2017-01-10 22:23:33 +00:00
Ted John 191c4ab998 Fix mingw build 2017-01-10 17:58:04 +00:00
Ted John 7ca5857307 Isolate cmake sources to openrct2 2017-01-10 17:29:56 +00:00
Ted John 9387891ad3 Convert tabs to spaces 2017-01-10 17:29:56 +00:00
Ted John bbac8b86de Use editbin instead to change subsystem 2017-01-10 17:29:55 +00:00
Ted John 21bb7b9da6 Add back main entry point for mingw 2017-01-10 17:29:55 +00:00
Ted John d535e290d3 Remove --console CLI switch 2017-01-10 17:29:52 +00:00
Ted John 1b21a308cd Fix debugging by using unique named PDBs 2017-01-10 17:29:04 +00:00
Ted John 3646b0a26d Remove BuildTests task 2017-01-10 17:29:04 +00:00
Ted John 4d8779957f Create openrct2.com and add to installer 2017-01-10 17:29:04 +00:00
Ted John b7b58817bb Rename openrct2-lib to libopenrct2 2017-01-10 17:29:03 +00:00
Ted John 7d6ea1f5cd Create DLL for openrct2 with win as a wrapper 2017-01-10 17:29:03 +00:00
Ted John 73b21b5880 Convert openrct2 to static library 2017-01-10 17:29:02 +00:00
Ted John 67c0ed8a2f Add new windows project 2017-01-10 17:29:02 +00:00
Christian F. Coors 06d1d2116f Remove unnecessary code 2017-01-10 12:44:30 +01:00
Christian F. Coors e0a6955924 Remove openssl dependency when building without network support 2017-01-10 12:44:30 +01:00
X123M3-256 7c7b67f665 Do not deselect boosters after building one, fixes #4975 2017-01-09 22:51:16 +01:00
Michael Steenbeek 1c2458b6dd Combine drawing of the Spiral and Mini RC (#5025) 2017-01-09 22:09:33 +01:00
Michael Steenbeek 4f61cae8a8 Merge pull request #4997 from zaxcav/restrictBacktrack
Restrict backtracking during peep pathfinding
2017-01-09 21:55:23 +01:00
wolfreak99 bdc34b608d Make tile inspector selector draggable 2017-01-09 19:30:42 +00:00
Michael Steenbeek 6bbbf0a6ce Merge pull request #5019 from IntelOrca/feature/rct1/import-things
Import other RCT1 things
2017-01-09 19:22:46 +01:00
Ted John acba8ee63f Fix code style 2017-01-08 23:51:22 +00:00
Gymnasiast 9521911719 Import money effect 2017-01-08 23:35:30 +00:00
Gymnasiast 8c1926e41c Import jumping fountain water 2017-01-08 23:35:30 +00:00
Gymnasiast 5a51f28ba0 Fix balloons, import balloons, ducks and steam particles 2017-01-08 23:35:29 +00:00
Gymnasiast 70f6f638ca Fix negative queue lengths, fix guests thoughts, import litter, import more fields, fix monorail, fix chairlift crashes 2017-01-08 23:35:26 +00:00
Ted John 9c11b051ee Add some max constants for RCT1 2017-01-08 23:34:49 +00:00
Ted John 3037e6fb59 Merge pull request #5013 from IntelOrca/refactor/imageio
Refactor image_io
2017-01-08 22:30:58 +00:00
danidoedel 4fdc0e674f Update Xcode project 2017-01-08 22:17:12 +00:00
OpenRCT2 git bot e537a378dd Merge Localisation/master into OpenRCT2/develop. 2017-01-08 04:00:21 +00:00
duncanspumpkin ac5b0b0cf5 Rename sprite list vehicle to train to reflect true use
This was found during the rct1 vehicle import branch. When importing it would load all vehicles into this list only to find that each car was treated as a seperate train.
2017-01-07 16:59:46 +00:00
Michał Janiszewski 1a2227289a Limit vehicle search to valid ones only 2017-01-07 14:54:30 +00:00
Ted John 4680aeab9b Use FileStream instead of SDL2 2017-01-07 12:23:59 +00:00
Ted John a21cbae82a Move image_io to C++ 2017-01-07 12:10:42 +00:00
Michał Janiszewski 3f8f513a47 Verify access to RCT1 fields 2017-01-07 11:19:04 +00:00
Lastorder 84d2f6c4c7 Fix #5010 windows builds not pushed
windows builds not pushed to openrct2.org due to invalid condition
2017-01-07 11:18:22 +00:00
Ted John 44d9464d6b Merge pull request #4995 from IntelOrca/refactor/track-design-repository-stdstring
Refactor track design repository to use std::string
2017-01-06 21:48:37 +00:00
Ted John e7a7704efb Fix RCT1 (original) imported parks having no ride music 2017-01-06 21:48:27 +00:00
zaxcav 9772c34cee Update debugging messages to reflect changes in how pathfind_history[].direction is updated. 2017-01-06 12:26:23 +01:00
Michał Janiszewski bd140e78fb Compile fixes for MinGW (#4998)
* Fix mismatched condition in CMakeLists.txt

* Fix MinGW release builds
2017-01-06 07:04:25 +01:00