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

6674 Commits

Author SHA1 Message Date
Michał Janiszewski 7eeb59b1aa Update Linux file dialogs 2016-03-31 20:41:51 +01:00
Gymnasiast 0b78653a10 Make Zenity pick up the first filter 2016-03-31 20:41:50 +01:00
IntelOrca 3fdf0d4bf6 re-introduce appending of extension to filename 2016-03-31 20:41:49 +01:00
IntelOrca 40fcfbb405 use localised strings for native file dialogs 2016-03-31 20:41:49 +01:00
LRFLEW 0f88beff7c Converted OSX native file dialog to new standard 2016-03-31 20:41:48 +01:00
IntelOrca d865e4d453 pass better data in struct to file dialog function 2016-03-31 20:41:47 +01:00
Marco van Munster 8db1f27534 Fix bug 3198 different vehicles research tree 2016-03-30 22:33:26 +02:00
OpenRCT2 git bot d07e471796 Merge Localisation/master into OpenRCT2/develop. 2016-03-30 04:00:26 +00:00
Ted John d2cc88099e Merge pull request #3188 from janisozaur/headers-cmake 
Add headers to CmakeLists.txt
 2016-03-27 22:44:37 +01:00
Ted John a6bacf3ea0 Merge pull request #3189 from janisozaur/cmake-toplevel 
Add guard to prevent from building in-source
 2016-03-27 22:43:30 +01:00
Michał Janiszewski 2b790e1b5a Add guard to prevent from building in-source 2016-03-27 23:29:45 +02:00
Michał Janiszewski 8de2310d63 Add headers to CmakeLists.txt 
This doesn't really affect compilation in any way, but allows
CMake-based project generators to include the header files as well.

Previously headers without accompanying source files (like version.h)
were skipped when generating project files.
 2016-03-27 22:22:58 +02:00
IntelOrca 966291eda2 fix #3186: stop auto opening shops causing problems (once and for all) 2016-03-27 19:34:35 +01:00
IntelOrca d690ee6423 fix #3183: opening ride with construction window open 
Issue caused with boat hire rides as there is usually a ghost station present when the construction window is open. This causes vehicles to be created in the ghost station. Fixed by closing the construction window before the vehicles are created for the ride.
 2016-03-27 14:18:20 +01:00
IntelOrca e6ca13d32c fix #3181: key shortcuts work on multiplayer chat 2016-03-27 12:50:32 +01:00
IntelOrca b436ac9bc6 fix #3160: no land owned in rc designer 2016-03-26 15:41:58 +00:00
OpenRCT2 git bot 90e4b69de7 Merge Localisation/master into OpenRCT2/develop. 2016-03-26 04:00:14 +00:00
Duncan 0525569290 Merge pull request #3174 from duncanspumpkin/change_order 
Change order of parameters in image setup code.
 2016-03-25 18:36:43 +00:00
duncanspumpkin 9018120c17 Change order of parameters in image setup code. 2016-03-25 18:35:00 +00:00
IntelOrca 474f25c69a refactor handyman pathfind and fix additional small bug 2016-03-24 23:47:15 +00:00
Duncan 14f79ad362 Merge pull request #3161 from marcovmun/Fix-3130 
Fix machanic crosses station
 2016-03-24 09:33:01 +00:00
OpenRCT2 git bot c7220f6b3f Merge Localisation/master into OpenRCT2/develop. 2016-03-24 04:00:15 +00:00
Marco van Munster 1f069af961 Fix machanic crosses station 2016-03-23 22:10:19 +01:00
Duncan 79f2316a4c Merge pull request #3159 from janisozaur/develop 
Don't crash when fixing a hacked ride
 2016-03-23 18:26:16 +00:00
IntelOrca 1e390e4f13 fix mistake in refactor: flags -> uint32 2016-03-23 17:27:49 +00:00
Michał Janiszewski c33b8ccdc5 Don't crash when fixing a hacked ride 2016-03-23 16:10:55 +01:00
IntelOrca 74d96d86c0 fix #3158: close network status window doesn't abort 2016-03-22 23:27:49 +00:00
IntelOrca 9a97959b1e Merge branch 'fix-3140' into develop 
fix #3140: Multiplayer Permissions should be Verified by the host before action is taken
 2016-03-22 22:57:31 +00:00
IntelOrca a2fda29d92 validate park entrances and land ownership tools 2016-03-22 22:55:13 +00:00
IntelOrca 0ed22f52dd validate vehicle type 2016-03-22 22:40:06 +00:00
IntelOrca 304fd4b84e validate all the other ride operation settings 2016-03-22 21:59:16 +00:00
IntelOrca 16e8609da3 add constants for ride setting id 2016-03-22 21:32:37 +00:00
IntelOrca 64442820b9 validate setting of ride operation mode 2016-03-22 21:12:11 +00:00
Ted John 52c6824192 Merge pull request #3157 from JarnoVgr/patch-1 
Added build download links
 2016-03-22 18:14:40 +00:00
Jarno Veuger 3643f93c16 Added build download links 2016-03-22 18:56:30 +01:00
IntelOrca 3280bf7aeb fix #3125: handyman AI bug 
Handyman AI would find the closest litter but then not actually use that closest litter to determine the direction but instead use the last litter in the sprite list.
 2016-03-21 22:36:16 +00:00
Ted John 7348324d99 Merge pull request #3135 from duncanspumpkin/fix_3123 
Fix #3123 and refactor of banner placement.
 2016-03-21 21:27:46 +00:00
duncanspumpkin 8c7dfd3097 Revert #3147 and fix construction issue. Revert most of c7c1f86 and rework to prevent issues 2016-03-21 21:21:43 +00:00
Ted John 4e60f0db42 Update readme.md 
[ci skip]
 2016-03-21 12:46:40 +00:00
Ted John d16ce9d904 Update readme.txt 
XP is not very well supported...
 2016-03-21 12:26:05 +00:00
OpenRCT2 git bot e87876c570 Merge Localisation/master into OpenRCT2/develop. 2016-03-21 04:00:16 +00:00
IntelOrca 78f87cd86c fix screenshot command line 2016-03-20 18:13:17 +00:00
IntelOrca ad250d6ab0 fix #3151: Save any file with korean would corrupt save file 2016-03-19 13:56:33 +00:00
Ted John 3699c42c61 Merge pull request #3150 from janisozaur/develop 
Silence compiler warning
 2016-03-19 11:58:53 +00:00
Michał Janiszewski 843014eac2 Silence compiler warning 
Though this really should be taken care of properly, see
https://stackoverflow.com/questions/14562845/why-does-passing-char-as-const-char-generate-a-warning
 2016-03-19 12:56:35 +01:00
IntelOrca cb9a4860f3 fix #3146: some utf8 strings were truncated on save 
strncpy can't be used for RCT2 strings as its a mix of byte / widechar
 2016-03-19 11:16:11 +00:00
Ted John 53f01e0590 Merge pull request #3147 from janisozaur/canoes 
Fix crash when opening canoes
 2016-03-19 00:14:25 +00:00
Michał Janiszewski c1a413c298 Fix crash when opening canoes 2016-03-19 00:47:34 +01:00
OpenRCT2 git bot fdead70403 Merge Localisation/master into OpenRCT2/develop. 2016-03-17 04:00:21 +00:00
IntelOrca 5c2c0c9c57 fix #3142: Localisation - Text out of borders 2016-03-16 18:17:24 +00:00