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

11489 Commits

Author SHA1 Message Date
OpenRCT2 git bot b539bc6191 Merge Localisation/master into OpenRCT2/develop. 2017-05-17 04:00:18 +00:00
Richard Jenkins 1db749a16d Merge pull request #5486 from Gymnasiast/fix-ride-data-c 
Fix incorrect ride data array sizes and LIM lookup, rename upkeep arrays
 2017-05-16 22:50:27 +01:00
Gymnasiast 57b5220a4f Fix formatting 2017-05-16 23:11:06 +02:00
Gymnasiast e3c43b495b Fix incorrect ride data array sizes and LIM lookup 2017-05-16 23:09:27 +02:00
Michael Steenbeek 6bd34c1e55 Clean up sub_69101A, use constants for undefined excitement ratings, fixes #5481 2017-05-16 22:36:48 +02:00
Richard Jenkins 6d32c38fb3 Fix #5471: Ride name issues at ride construction time 2017-05-16 21:56:20 +02:00
duncanspumpkin b9dc588da4 Fix return exit code for RCT2 builds 2017-05-16 20:16:10 +01:00
duncanspumpkin 69d8794260 Use snake case for peep fields 2017-05-16 20:12:18 +01:00
Michael Steenbeek e725672d23 Clean up alternative track pieces and types, remove remnants of researched track pieces 2017-05-16 19:11:51 +02:00
Gymnasiast d5f1e22a56 Name RIDE_TYPE_FLAG4 flags 2017-05-16 16:37:23 +02:00
Hielke Morsink b7ca273d0d Set 'Show all files' on by default in VS 2017-05-15 16:03:06 +02:00
wolfreak99 471f0c3230 Allow loading bmp files as heightmap using the native file browser 
Upon playing with the heightmap tool, i realized that the feature actually supports bmp files as well, and they are even listed in the in-game load/save dialog, but they are not shown when using a native file browser. This fixes that.
 2017-05-15 16:02:15 +02:00
CraigCraig 26287f5a3e More readability, grammar, spelling fixes 2017-05-15 09:28:43 +02:00
Richard Jenkins eb868089c8 Fix #5470: Available construction rights only displays once (#5476) 2017-05-14 23:45:44 +01:00
Richard Jenkins 6472c0e6c3 Allow ride names to duplicate existing user strings, fixes #5211 2017-05-12 23:43:48 +02:00
Hielke Morsink 3ba33d098e Set correct base height for newly inserted corrupt elements 2017-05-12 23:41:25 +02:00
OpenRCT2 git bot d56dd24a20 Merge Localisation/master into OpenRCT2/develop. 2017-05-12 04:00:21 +00:00
Richard Jenkins d6b32591ae Implement guard function for decrementing guest counts 
* Implement guard function for decrementing guest counts

* Implement separate functions for incr/decr of peep count globals

* assert() on attempt to increment guest counts over UINT16_MAX

* Increase network version
 2017-05-11 18:31:29 +02:00
CraigCraig 58deb3a54a Grammar, readability, and spelling fixes 
[ci skip]
 2017-05-11 11:45:59 +02:00
Richard Jenkins 86d8863496 Fix #5456: Paths with non-ASCII characters mishandled on macOS (#5463) 2017-05-11 09:43:53 +02:00
xp4xbox 3331ab8a2d Make B&M booster fins rectangular 2017-05-10 22:05:05 +02:00
OpenRCT2 git bot b83934da95 Merge Localisation/master into OpenRCT2/develop. 2017-05-10 04:00:24 +00:00
Ted John faba009f24 Merge pull request #5072 from X123M3-256/g2_offsets 
Add support for x/y offsets in g2.dat
 2017-05-09 22:16:50 +01:00
Richard Jenkins 8d7fa07cba Update readme.md with RCT1 info 
[ci skip]
 2017-05-09 14:45:16 +01:00
OpenRCT2 git bot 787ddf811f Merge Localisation/master into OpenRCT2/develop. 2017-05-09 04:00:21 +00:00
Michael Steenbeek a53b01d5b9 Remove magic numbers and Americanisms 2017-05-08 23:54:38 +02:00
Michał Janiszewski bccedd3b1f Change network version after f9acdcb02 2017-05-08 23:52:03 +02:00
Richard Jenkins 563cd78ef7 Fix #5449: Underflow of gNumGuestsHeadingForPark in SC4 import 2017-05-08 23:49:02 +02:00
Ted John f9acdcb02d Use callback mechanism in case server rejects command 2017-05-08 23:46:50 +02:00
Gymnasiast 2bb3a297b4 Do not close new campaign window when starting a campaign results in an error, fixes #4810 2017-05-08 23:46:50 +02:00
Richard Jenkins 1a20da3dfb Merge pull request #5452 from LucaRed/patch-1 
Add Italian language contributor
 2017-05-08 21:26:22 +01:00
Luca Andrea Rossi bafae38eb8 Add Italian language contributor 2017-05-08 22:16:48 +02:00
Craig Craig 9dd820e2e7 Spelling fixes 2017-05-08 08:30:50 +02:00
OpenRCT2 git bot 4ab1289c83 Merge Localisation/master into OpenRCT2/develop. 2017-05-08 04:00:23 +00:00
Ted John c4d2cd175d Use utf8 instead of char for platform_get_absolute_path 2017-05-07 19:17:11 +01:00
Ted John e310956e81 Update command line help 2017-05-07 19:15:27 +01:00
Ted John b789b17c14 Fix sprite building 2017-05-07 16:19:55 +01:00
Ted John 428a3d6569 Organise new sprites and add JSON 2017-05-07 16:19:35 +01:00
Ted John ae3110e09d Remove exit call, probably no longer necessary 2017-05-07 01:01:07 +01:00
X7123M3-256 03606adbeb Fix more formatting 2017-05-07 01:01:07 +01:00
Gymnasiast 3d9e6a4e2d Fix formatting 2017-05-07 01:01:07 +01:00
Ted John 9a42edc695 Fix return of exit code 2017-05-07 01:01:07 +01:00
X123M3-256 52d2997a9f Fix more indentation 2017-05-07 01:01:07 +01:00
X123M3-256 dbfd898258 Correct sprite paths in project files 2017-05-07 01:01:07 +01:00
X123M3-256 dbd0067091 Remove logging 2017-05-07 01:01:07 +01:00
X123M3-256 edd830293c Correct path to sprite file 2017-05-07 01:01:07 +01:00
X123M3-256 7f74e07f2d Log path to sprite file 2017-05-07 01:01:07 +01:00
X123M3-256 7d2490710c Remove const 2017-05-07 01:01:06 +01:00
X123M3-256 d89fc32864 Use get_directory_path instead of dirname() 2017-05-07 01:01:06 +01:00
Ted John 7380c789e0 Implement platform_get_absolute_path for Windows 2017-05-07 01:01:06 +01:00