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 356 MiB
Commit Graph

11489 Commits

Author SHA1 Message Date
Michał Janiszewski a5df306a84 Guard from null scenery entry 2017-04-29 20:56:32 +02:00
Michał Janiszewski 2609242780 Fix #3136: Add 255th FlatRideTrackBlock entry 
This is to guard invalid ride type from invoking an uninitialised read.
 2017-04-29 20:56:32 +02:00
Michał Janiszewski dd6e040122 Prevent access to invalid banner in game command 2017-04-29 20:56:32 +02:00
OpenRCT2 git bot ee4e863dc6 Merge Localisation/master into OpenRCT2/develop. 2017-04-29 04:00:21 +00:00
OpenRCT2 git bot 18ada57bab Merge Localisation/master into OpenRCT2/develop. 2017-04-28 04:00:25 +00:00
Michał Janiszewski bf11fdeb21 Fix #5395: Crash when no sections are present in config.ini 
Missing sections in `config.ini`, particularily `[general]` can lead to
a null pointer dereference due to some fields being uninitialised.
 2017-04-27 22:23:22 +02:00
Michael Steenbeek 92e110195e Define native file dialog strings when loading heightmap, to avoid crashes 
Thanks to @wolfreak99 for the fix.
 2017-04-27 16:02:35 +02:00
OpenRCT2 git bot 20f36ec1ee Merge Localisation/master into OpenRCT2/develop. 2017-04-27 04:00:21 +00:00
OpenRCT2 git bot f26380c5b7 Merge Localisation/master into OpenRCT2/develop. 2017-04-26 04:00:22 +00:00
Michael Steenbeek e8b5d418cd en-GB: Change another occurrence of 'normalize' 
[ci skip]
 2017-04-25 15:26:37 +02:00
Michael Steenbeek 4942b6a2df en-GB: Change 'normalize' to 'normalise' 
[ci skip]
 2017-04-25 15:23:52 +02:00
OpenRCT2 git bot 5b16e0587f Merge Localisation/master into OpenRCT2/develop. 2017-04-25 04:00:23 +00:00
Michał Janiszewski dcb1b8651b Fix scenery eye dropper checks 2017-04-24 23:25:21 +02:00
Michał Janiszewski 79cbb179c3 Fix memory leak in heightmap loader 2017-04-24 23:21:14 +02:00
Broxzier f831195884 Fix typo (neightbour -> neighbour) 
[ci skip]
 2017-04-24 23:19:51 +02:00
Broxzier d8253ef849 Add error for loading non 24-bit bitmaps 2017-04-24 23:19:51 +02:00
Broxzier b456fe2a4d Copy argument to buffer since it may be freed, add missing break 2017-04-24 23:19:51 +02:00
Broxzier 058607b4e4 transform greyscale image to RGB when loaded 2017-04-24 23:19:51 +02:00
Broxzier 52ef6c8e34 Pass arguments with correct type for {COMMA16} 2017-04-24 23:19:51 +02:00
Broxzier ca6c82a39d Fix issue for when smoothing raises a tile above water level 2017-04-24 23:19:51 +02:00
Broxzier 7fc9846bec Show errors to player 2017-04-24 23:19:51 +02:00
Broxzier fb9ff85238 Only overwrite buffer when loading was successful 2017-04-24 23:19:51 +02:00
Broxzier 2cd4a686f6 Disable page widgets until a map is loaded 
A few strings have their {WINDOW_COLOUR_2} setting removed, since this
prevented strings from being market as inset. All uses of these strings
have been checked.
 2017-04-24 23:19:51 +02:00
Broxzier a26dc83647 Update changelog and contributors entry 2017-04-24 23:19:51 +02:00
Broxzier 8b8f982d0e Fix typos 
[ci skip]
 2017-04-24 23:19:51 +02:00
Broxzier 03bfc68250 Loading height map into memory 2017-04-24 23:19:51 +02:00
Broxzier f93b7f761b Fix travis errors 
Couldn't merge janitosaur's commit or apply a patch after the changes and rebase
 2017-04-24 23:19:51 +02:00
Broxzier 0d07ea69f8 Add support for loading PNG files 
This needs to be refactored
 2017-04-24 23:19:51 +02:00
Broxzier 8548f60453 Optimization: Average RGB channels once before smoothing, instead of inside the loop. 2017-04-24 23:19:51 +02:00
Broxzier 624f3e3298 Fix smooth-tiles checkbox not being invalidated; updated default height values 2017-04-24 23:19:51 +02:00
Broxzier 810103b90f Use loadsave window for selecting the heightmap 2017-04-24 23:19:51 +02:00
Broxzier 3095106b0e Use average pixel value instead of only the red channel 2017-04-24 23:19:51 +02:00
Broxzier 6edea503b2 Refactored mapgen window file 
- Removed duplicated code
- Moved shared widgets to define
- Moved shared widget handling code to function
 2017-04-24 23:19:51 +02:00
Broxzier c6e3ecd5ed Better widget behaviour and fixes 
- Inset text for disabled labels and values
- Spinners can be held down

Other fixes:

- Use correct types for widget indices
- Use WINDOW_MAPGEN_PAGE_COUNT for arrays (when a new page is added in the
  future, the compiler will warn about all the arrays having an invalid
  size)
- Sort code so that related arrays are placed near each other
 2017-04-24 23:19:51 +02:00
Broxzier 55c1787a13 Add heightmap smoothing 
Fixed underflow error that was visible for non-tilable maps.
Reordered widgets to reflect the same order of the algorithm.
Always regenerate the map when a setting is changed.
 2017-04-24 23:19:51 +02:00
Broxzier 26989ea8f6 Add smoothing height map option 2017-04-24 23:19:51 +02:00
Broxzier edfe997e78 Add option to normalize height map 2017-04-24 23:19:51 +02:00
Broxzier fda415cd44 Add settings to heightmap tab 2017-04-24 23:19:51 +02:00
Broxzier d2113514a0 Add tile_smooth function to smooth generated map 2017-04-24 23:19:51 +02:00
Broxzier 702d99e1e3 Initial prototype of loading heightmaps 
Adds new strings and string ids for some future commits too.
 2017-04-24 23:19:51 +02:00
Michał Janiszewski 73efe0755d Validate water image id while loading palette 2017-04-24 22:56:37 +02:00
Michał Janiszewski ee7ad17a30 Align field assignments in S6Importer.cpp 2017-04-24 22:40:22 +02:00
Michał Janiszewski ad7ecc0d85 Format S6Exporter.cpp 
Pretty much just align field assignments
 2017-04-24 22:40:22 +02:00
Michał Janiszewski a83dd095d6 Fix mismatched allocator/deallocater for S6 2017-04-24 22:40:21 +02:00
xp4xbox eaac6759fe Replace Twister booster sprites with improved versions 2017-04-24 22:31:42 +02:00
Michał Janiszewski f4b1c010e1 Fix uninitialised variable 2017-04-24 21:59:01 +02:00
Michał Janiszewski ea26ae9866 Explicitly initialise globals in entrance.cpp 2017-04-24 21:47:33 +02:00
Michael Steenbeek a4b5b32839 Fix typo in ride description 2017-04-24 16:02:53 +02:00
Michał Janiszewski 92aefb477f Fix compilation with GCC7 2017-04-24 11:34:56 +02:00
OpenRCT2 git bot a16220ef82 Merge Localisation/master into OpenRCT2/develop. 2017-04-24 04:00:21 +00:00