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

11298 Commits

Author SHA1 Message Date
wolfreak99 2fe134fd5f Make shortcut keys window bigger and resizable 2017-03-11 22:09:24 +01:00
Ted John c0ce8ef3c1 Merge pull request #5298 from IntelOrca/refactor/balloon 
Refactor balloon to C++
 2017-03-11 13:14:18 +00:00
Ted John 7d33dda13b Fix xcode project 2017-03-11 12:57:46 +00:00
Ted John e4c960b7d9 Separate out game_command_balloon_press 2017-03-11 12:57:46 +00:00
Ted John 2d063ef545 Add comment to balloon press logic 2017-03-11 12:57:45 +00:00
Ted John 8148c86f6b Use balloon for create_balloon 2017-03-11 12:57:45 +00:00
Ted John dfc140158e Use member functions for balloon 2017-03-11 12:57:45 +00:00
Michał Janiszewski 00b6fb53c6 Fix #5299: Scenario editor crash when placing peep spawn 2017-03-10 23:02:04 +01:00
Ted John ce13b551cb Refactor balloon to C++ 2017-03-10 17:26:08 +00:00
Ted John 20a43227e0 Rename balloon.c to balloon.cpp 2017-03-10 17:12:29 +00:00
Duncan 0ea93c5509 Merge pull request #5293 from DEVoytas/patch-1 
Update readme.md: fix 'gitflow workflow' link
 2017-03-10 12:15:29 +00:00
Mariusz 0ff968fb7b Update readme.md: fix 'gitflow workflow' link 
Current:
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
lands on:
https://www.atlassian.com/git/tutorials/comparing-workflows
Replace it with:
https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow
to point to specific workflow.
 2017-03-10 13:08:59 +01:00
Ted John 812a37d5fb Merge pull request #4790 from IntelOrca/add/uri-protocol-handler 
Add uri protocol handler
 2017-03-10 10:46:28 +00:00
Marijn van der Werf 3bf14e0514 Update Xcode project 2017-03-09 14:57:14 +01:00
Ted John cdffd6116d Fix non-network builds 2017-03-08 20:45:49 +00:00
Ted John e960da95e2 Add a workaround for MINGW 2017-03-08 20:39:45 +00:00
duncanspumpkin 76c154a567 Fix #5285. Config file not read correctly. 
When the hashing function finds a collision such as on play_intro and auto_staff_placement it has to do a string compare to find out if two map entries are different. Due to a mistype this comparison would always return true. This meant that the auto_staff_placement value would overwrite the play_intro value. Mistake caused when fixing previous bug
 2017-03-08 20:32:21 +00:00
Ted John e81094ee60 Fix loading parks by command line with non standard extensions 2017-03-08 19:06:42 +00:00
Ted John 0ec43e3611 Improve String::Split and add tests 2017-03-08 19:06:42 +00:00
Ted John 7ccce750a6 Use std::string instead of char * for UriHandler 2017-03-08 19:06:42 +00:00
Ted John 925d64249f Add openrct2:// uri scheme support 
This sets up a URI scheme for openrct2 for Windows by adding the necessary registry keys. This is done on startup every time to keep the binary location up to date. URI handling currently supports joining a server.
 2017-03-08 19:06:42 +00:00
Ted John 5a850cd155 Add some useful string functions 2017-03-08 19:06:42 +00:00
OpenRCT2 git bot 2e37d6e427 Merge Localisation/master into OpenRCT2/develop. 2017-03-08 04:00:25 +00:00
Michał Janiszewski 8087fc6a17 Bump network version as a result of 5bd44a6d3f 2017-03-07 22:49:33 +01:00
duncanspumpkin 5bd44a6d3f Fix #5265. Queue TV's now correctly detected. 
Due to a mistake when implementing only ghost queue TV's were used for increasing peep happiness
 2017-03-07 21:13:45 +00:00
duncanspumpkin 8bd374f9dd Fix #5275. Door animations now play correctly. 
Mistake caused when refactoring. I did some copy paste coding and forgot to test it. On top of that mistakenly thought 0x30 >> 3 = 12 when it equals 6.
 2017-03-07 19:44:14 +00:00
Michał Janiszewski 7341f4aadd Remove trailing whitespace 
[ci skip]
 2017-03-07 20:38:11 +01:00
Duncan bb938054c7 Merge pull request #5274 from IntelOrca/refactor/wall-cpp 
Clean up wall.cpp
 2017-03-07 19:10:22 +00:00
YoloSweggLord 16bef6044f LIM sprites for giga and steel twister track 2017-03-07 13:42:44 +01:00
LRFLEW 6d2776da2b Merge pull request #5279 from LRFLEW/case-insensitive-ini 
Make the INI keys case insensitive
 2017-03-06 22:52:02 -06:00
OpenRCT2 git bot 38bc6f82e3 Merge Localisation/master into OpenRCT2/develop. 2017-03-07 04:00:24 +00:00
Michał Janiszewski 6181d968e8 Add case insensitive test to INI tests 2017-03-06 22:28:33 +01:00
LRFLEW 8e55b6ef22 Make the INI keys case insensitive 2017-03-06 09:22:44 -06:00
OpenRCT2 git bot 8bd10df859 Merge Localisation/master into OpenRCT2/develop. 2017-03-05 04:00:20 +00:00
Ted John c5a999415c Clean up wall.cpp 
* Trim trailing spaces
* Tab to space
* Conform more to C++ code style
 2017-03-04 12:13:24 +00:00
OpenRCT2 git bot a33752e1e3 Merge Localisation/master into OpenRCT2/develop. 2017-03-04 04:00:21 +00:00
wolfreak99 1549467c6c Fix "allow more peep spawns" 2017-03-03 16:48:35 +01:00
Joël Troch 8167ff9678 Fix #1730: Add keyboard shortcuts for track construction (#5200) 2017-03-03 09:35:42 +01:00
OpenRCT2 git bot 4aa44e15c6 Merge Localisation/master into OpenRCT2/develop. 2017-03-03 04:00:22 +00:00
wolfreak99 38f264cce8 Allow for more peep spawns in the future 2017-03-02 23:02:54 +01:00
OpenRCT2 git bot 2da540ba5c Merge Localisation/master into OpenRCT2/develop. 2017-03-02 04:00:23 +00:00
OpenRCT2 git bot 6b3b4949fe Merge Localisation/master into OpenRCT2/develop. 2017-03-01 04:00:17 +00:00
Michael Steenbeek 8e1794b032 en-GB: Fix americanism 2017-02-28 17:07:26 +01:00
Michael Steenbeek ae978575f9 Fix spelling of 'Conger Eel', fixes #5252 2017-02-28 09:40:12 +01:00
wolfreak99 c6b5053261 Add cooldowns to help prevent mass demolishing 2017-02-28 09:31:26 +01:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor 
Refactor fence to wall
 2017-02-28 06:56:06 +00:00
Michał Janiszewski 7f48df20ec Refactor input 2017-02-27 20:20:41 +01:00
Ted John 4442b936de Merge pull request #5256 from chfast/memory-fixes 
Small memory fixes
 2017-02-27 17:24:08 +00:00
Hielke Morsink 4ea29bbf80 Close conflicting windows in main menu 
* The main buttons close the other main windows in the main menu

* Only close other windows if the next is not open already
 2017-02-26 13:24:35 +01:00
duncanspumpkin ece3be303c Fix formating 2017-02-26 09:04:32 +00:00