mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,344 Commits 8 Branches 40 Tags 336 MiB
Commit Graph

7344 Commits

Author SHA1 Message Date
Ted John eb19ca8626 integrate variable: gFootpathPrice 2016-05-16 19:05:37 +01:00
Ted John 975eacc5f9 add temp RCT2 memory copy for scrolling text paint 
Fixes #3628: assertion
Fixes #3634: wrong queue banner text

Until path_paint is implemented, this variable is used by scrolling_text_setup to use the old string arguments array. Remove when scrolling_text_setup is no longer hooked.
 2016-05-16 18:44:44 +01:00
Ted John 0293218890 fix #3633: scenery tool, CTRL does not work correctly 2016-05-16 18:24:36 +01:00
Michał Janiszewski d4394c73d3 Limit what is considered a valid tile (#3631) 
`smooth_land_tile` already calls to `map_is_location_valid`, but the
latter allows for elements that are clearly outside the range.

Fixes #3549
 2016-05-16 10:32:08 +01:00
OpenRCT2 git bot 193ae36cb4 Merge Localisation/master into OpenRCT2/develop. 2016-05-16 04:00:19 +00:00
Ted John 9ebb7f4931 Merge pull request #3621 from IntelOrca/refactor/common-format-args 2016-05-15 23:47:55 +01:00
Ted John a9e4ff98c0 fix #3572: scenario description not loaded for scenarios 2016-05-15 23:26:06 +01:00
Ted John 06aeded227 use memcpy for set_format_arg 
To get round strict aliasing problem.
 2016-05-15 23:21:37 +01:00
Ted John d424eb44ed fix #3587: convert CP1252 to UTF8 when importing highscores 2016-05-15 23:15:40 +01:00
Michał Janiszewski b7f3259779 Guard against crash with synchronised vehicles, fix typo (#3624) 2016-05-15 22:49:59 +01:00
Ted John cbf9a393f1 remove use of get_format_arg 
Because of strict aliasing, we must use memcpy in some cases.
 2016-05-15 22:40:25 +01:00
Yaroslav Tretyakov 9c9f1189c6 Fix #3619: Bobsled coaster not banking properly (#3622) 2016-05-15 22:37:59 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 6df1b9ac98 stop resetting the selected footpath 
Fixes #2931 - in multiplayer when client joins
Fixes #3606 - on autosave
 2016-05-15 19:08:02 +01:00
Yaroslav Tretyakov a3469cf073 Fix #3598: Validate vehicle track movement (#3612) 2016-05-15 17:20:46 +01:00
Ted John 2fadc8d2be remove redundant global usages 2016-05-15 17:19:32 +01:00
Ted John 72957660ef integrate window scenery variables 2016-05-15 17:16:21 +01:00
Ted John 5fe612acd7 integrate scenery place variables 2016-05-15 17:10:25 +01:00
Ted John 6f7db1f9b6 rename rct_path_type to rct_footpath_entry 2016-05-15 16:11:34 +01:00
Ted John 3d47f9869f write get entry methods for scenery and path 2016-05-15 16:09:26 +01:00
janisozaur b3101dd9b0 Don't crash when vehicles have 0 friction (#3615) 2016-05-15 15:59:42 +01:00
janisozaur 3a6978a9aa Fix comparison highlighted by clang (#3614) 2016-05-15 15:20:33 +01:00
Ted John 6c6be817e7 Merge pull request #3610 from zsilencer/bugfixes 
Fix #3601: Assert in paint.c
Fix #3609: Crash from invalid peep
 2016-05-15 13:38:40 +01:00
zsilencer 6db3828f32 Fix #3609: Crash from invalid peep 2016-05-15 06:21:19 -06:00
zsilencer 8d015f37a9 Fix #3601: Assert in paint.c 2016-05-15 06:12:26 -06:00
Yaroslav Tretyakov 938c498fac Integrate 0x008B8F30 (gTrackVehicleInfo) (#3605) 2016-05-15 10:30:03 +01:00
YJSoft f5b208d629 Fix font config loaded without proper configuration (#3602) 2016-05-15 10:29:26 +01:00
Hielke Morsink 8c1395bd46 declaring local variables where needed instead of at the top (#3599) 2016-05-15 10:25:24 +01:00
OpenRCT2 git bot 800dc83951 Merge Localisation/master into OpenRCT2/develop. 2016-05-15 04:00:23 +00:00
janisozaur 963128d424 Merge pull request #3476 from Broxzier/commit_in_dump_filename 
Including short commit hash in dump filename
 2016-05-15 02:17:05 +02:00
Hielke Morsink d7aacfcde6 Fixed warning in sawyerencoding.c 2016-05-15 01:10:37 +02:00
Hielke Morsink c7a8e0cab7 Removed space from dump filename, and clearer output. 2016-05-15 01:00:06 +02:00
Hielke Morsink e69574be12 Including short commit hash in dump filename 2016-05-15 01:00:05 +02:00
Ted John 498e4b67df Merge pull request #3593 from janisozaur/decode-rle-speedup 
Use memset/memcpy functions for RLE chunk decoding
 2016-05-14 16:03:32 +01:00
Ted John d0d2ad7ded fix #3562: loaded objects are not unloaded when loading a new game 2016-05-14 12:54:55 +01:00
Michał Janiszewski 90bcca11d2 More sawyercoding optimisations 2016-05-14 11:54:19 +02:00
Michał Janiszewski 9cd762b1a6 Use memset/memcpy functions for RLE chunk decoding 
Reduces time spent in `decode_chunk_rle` by 4-5x.
 2016-05-14 11:12:14 +02:00
OpenRCT2 git bot f62932a5d3 Merge Localisation/master into OpenRCT2/develop. 2016-05-14 04:00:20 +00:00
janisozaur 7537c03d3f Optimise object_get_length to use entryCache (#3592) 2016-05-14 01:15:17 +01:00
Ted John 81efb92d53 integrate map selection variables 2016-05-14 00:54:13 +01:00
Ted John 60235d9735 Merge pull request #3591 from janisozaur/qsort 
Improve the performance of sorting the object list. Reduces startup and plugin.dat creation times.
 2016-05-13 23:32:27 +01:00
Michał Janiszewski f458dec3e9 Restore checking of last entry's size 2016-05-14 00:23:03 +02:00
Ted John 3fcb337c7b integrate variable: gWindowMapFlashingFlags 2016-05-13 22:51:16 +01:00
Michał Janiszewski 5c2e55723b Fixup filters, skip double object list enumeration 2016-05-13 23:42:49 +02:00
Michał Janiszewski 6fc8ac721c Migrate initial object list sorting to qsort() 2016-05-13 23:33:29 +02:00
Michał Janiszewski 5b639e515b Cache entries for future lookup to speedup launch 
Before this change, expensive `object_get_next` had to be called
`numObjects^2` times, now it is cached so it can only be called
`numObjects` times.
 2016-05-13 23:22:11 +02:00
Ted John d293616bbc Merge branch 'fix/intro' into develop 2016-05-13 21:36:24 +01:00
Ted John b58766aa3f clean up the logo and make it scalable 
- fixes #1776: graphical glitches on intro
- fixes #708: screen turns white when resizing intro
 2016-05-13 21:36:07 +01:00
Ted John bf39225ca6 fix intro sound 2016-05-13 19:01:24 +01:00
Ted John f901ec4aa8 fix intro drawing 2016-05-13 18:37:00 +01:00