1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Commit Graph

6643 Commits

Author SHA1 Message Date
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
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