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

11467 Commits

Author SHA1 Message Date
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
Richard Jenkins 0219da2468 Use localised strings for 'rides set mode' command help, fix off-by-one error: RIDES_MODE_COUNT 2017-04-23 22:18:59 +02:00
Richard Jenkins 5984fd8ed7 Add user-facing help for 'rides set mode' command 2017-04-23 22:18:59 +02:00
Richard Jenkins cbf689d4ec Reduce command array size in 'rides set type' 2017-04-23 22:18:59 +02:00
Richard Jenkins 7a50a52582 Harden console command error checking, reduce command array sizes 2017-04-23 22:18:59 +02:00
Richard Jenkins e51ee316b9 Invalidate test results after changing ride mode from console 2017-04-23 22:18:59 +02:00
Richard Jenkins 542d8c0fbb Update changelog 2017-04-23 22:18:59 +02:00
Richard Jenkins c564659aa4 Implement #5370: add ability to change ride operating mode from console 2017-04-23 22:18:59 +02:00
Richard Jenkins a90e5a2492 Fix typos in 'rides set' help in console 2017-04-23 22:18:59 +02:00
Raphael Setin 984ff6dc47 Read until first dot when converting track file name to in-game name, fixes #5077 
This commit addresses the bug of Goliath.1 track. The track name will be everything that is written in the file name of that track, until the first dot.
 2017-04-23 16:42:08 +02:00
Hugo Wallenburg 6e41508bad Make paths in STR_2743 consistent with STR_5836 2017-04-23 16:21:08 +02:00
OpenRCT2 git bot bea17e1aa0 Merge Localisation/master into OpenRCT2/develop. 2017-04-23 04:00:17 +00:00
OpenRCT2 git bot 9bb0aab7e7 Merge Localisation/master into OpenRCT2/develop. 2017-04-22 04:00:22 +00:00
OpenRCT2 git bot e72542be68 Merge Localisation/master into OpenRCT2/develop. 2017-04-21 04:00:19 +00:00
Michał Janiszewski 0414ba7f6b Verify access to sprites 2017-04-20 13:20:11 +02:00
Hielke Morsink 9314b8b793 Fix #5375: Use mask for fetching large scenery id, fix picking banner elements 2017-04-19 07:56:46 +02:00
Michał Janiszewski d53f276207 Fix scenery eye dropper interaction with footpaths 2017-04-18 22:49:33 +02:00
Richard Jenkins 8f59b04d32 Fix #5377: Saved game keeps crashing shortly after loading 
Guard against null pointers in banner_paint() (#5379)
 2017-04-17 18:37:37 +01:00
Gymnasiast 34540b6439 Rename edi to something more descriptive 2017-04-17 13:39:44 +02:00
Michael Steenbeek e0764e3ac2 Add booster sprites for the Junior roller coaster 2017-04-17 12:35:38 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
duncanspumpkin 8243501680 Fix #5373. Prevent towers from being shown on car ride special list. 
Mistake made during implementation. Not sure how this one was accidentally done as I expect the original list was computer generated. This bug has been in the game since June 2015.
 2017-04-16 13:41:54 +01:00
duncanspumpkin 8dcf6b43f1 Fix #5371. Custom currency now correctly saves to config. 
Mistake made during refactoring. Failed to account for the custom currency when saving the current currency.
 2017-04-16 13:09:40 +01:00