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
