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

6836 Commits

Author SHA1 Message Date
Nubbie 68d21e22a1 Improve descriptions for cheats 
Note: Language IDs have changed slightly
 2016-04-04 17:35:05 +01:00
Michael Steenbeek 512b3d767f Merge pull request #3235 from rvgr/patch-1 
Add rvgr (French translation) to contributors.md
 2016-04-04 10:33:45 +02:00
YJSoft c5ff5a3ce9 fix #3234 native open window crash problem at OSX 
since default_filename will be null at opening(code set default_filename only at save), setting filePath with default_filename will raise exception.

Fixed by setting filePath, basename only at save(since two vars only used at creating nameFieldStringValue) and setting directory with initial_directory at opening.
 2016-04-04 07:25:33 +01:00
rvgr 7eec12d95d Update contributors.md 2016-04-03 22:20:54 +02:00
Ted John 49772db412 Merge pull request #3233 from janisozaur/fixes 
Cap dropdown items count to 64
 2016-04-03 17:08:42 +01:00
Michał Janiszewski 83a543c86f Make sure shifted value can fit in uint32 2016-04-03 17:49:50 +02:00
Michał Janiszewski f5f2f62507 Cap dropdown items count to 64 2016-04-03 17:38:57 +02:00
Marijn van der Werf d809b81ac0 Include ride rating multipliers 2016-04-03 15:43:12 +02:00
janisozaur e61b6ffdde Cleanups, init variables 2016-04-03 14:21:50 +01:00
Marijn van der Werf 0fd42f408a Extract new struct 2016-04-03 14:53:17 +02:00
Marijn van der Werf e4fadc5a66 Include struct at `0x0097DD78` 2016-04-03 13:56:06 +02:00
OpenRCT2 git bot 842ae98f76 Merge Localisation/master into OpenRCT2/develop. 2016-04-03 04:00:13 +00:00
Marijn van der Werf e9bd7e56fc Identify two used variables in `ride_data_4` 2016-04-03 04:11:21 +02:00
IntelOrca 8c6e5cd9ae fix #3224: Maze designs clear fences and walls 2016-04-02 23:52:05 +01:00
IntelOrca d626d9d5f2 fix removing of fences for normal tracks 
Building track and track designs did not use correct flag for ghosts therefore always attempting to remove fences and the removing of intersecting fences also did not work correctly. Fix both issues.
 2016-04-02 23:51:12 +01:00
IntelOrca 4f59c752d6 fix #3223: invalid vehicle type warnings when placing any track design 2016-04-02 23:23:34 +01:00
Hielke Morsink 62090cd936 fixes #1860 Litter bins fill up too fast 2016-04-02 22:32:56 +01:00
LRFLEW 8014aa69db Added LRFLEW to contributors.md 2016-04-02 20:17:05 +01:00
Marijn van der Werf 5369111580 Fix #3206: Round support costs properly 2016-04-02 15:27:23 +01:00
Ted John 142d065525 Merge pull request #3217 from janisozaur/png12 
libpng 1.2 support
 2016-04-02 14:19:21 +01:00
Ted John f02238e0a2 Merge pull request #3203 from marcovmun/Fix-3198 
Fix vehicles appearing separate in the research tree, fixes #3198
 2016-04-02 00:02:42 +01:00
Michał Janiszewski 5fe2623613 Prefer libpng1.6 over libpng1.2 if available 2016-04-02 00:52:53 +02:00
Michał Janiszewski e8f73d0ff7 Remove libpng16 from Linux install scripts 2016-04-02 00:52:53 +02:00
Michał Janiszewski f372666d30 Lower libpng requirement to 1.2 2016-04-02 00:52:53 +02:00
Ted John 12b39961af Merge pull request #3212 from janisozaur/server-list 
Allocate enough memory for server entries, fix #3144
 2016-04-01 23:47:51 +01:00
Ted John 52c2a61b18 Merge pull request #3214 from janisozaur/changelog 
Updates to changelog.txt
 2016-04-01 23:34:41 +01:00
Michał Janiszewski 57a28d0adc Updates to changelog.txt 2016-04-01 22:00:28 +02:00
Michał Janiszewski 888f485690 Allocate enough memory for server entries, fix #3144 2016-04-01 19:57:18 +02:00
Ted John a1bdf3868b Merge pull request #3208 from janisozaur/develop 
Various fixes
 2016-04-01 10:29:56 +01:00
Michał Janiszewski 331f9fe03b Secure memory accesses, initialise variables 2016-04-01 09:38:40 +02:00
OpenRCT2 git bot 4d8e8efa0e Merge Localisation/master into OpenRCT2/develop. 2016-04-01 04:00:19 +00:00
IntelOrca 1c0a78ace2 fix #3204: can't right click track in unowned land 2016-03-31 22:56:13 +01:00
IntelOrca 6f2d91cc7e land and water now obey disable clearance, closes #3196 2016-03-31 21:57:22 +01:00
Ted John 966aaf1adc Merge pull request #3009 from OpenRCT2/improve-native-file-dialog 
Improve native file dialog
 2016-03-31 21:30:53 +01:00
IntelOrca 1122bff8bc prevent double td6 extension 2016-03-31 20:48:27 +01:00
IntelOrca 16527e749a remove network type from loadsave 
Fixes a crash that happened when loading a saved game from the start server window.
 2016-03-31 20:42:21 +01:00
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