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

8473 Commits

Author SHA1 Message Date
Marijn van der Werf f9670fc1d4 Add debug menu option 2016-07-26 10:55:48 +02:00
Marijn van der Werf dd756cb8be Add paint debug window 2016-07-26 10:55:47 +02:00
wolfreak99 67d4ff83e5 Fix window limit count accuracy (#4144) 2016-07-26 09:45:26 +02:00
OpenRCT2 git bot b95452cde0 Merge Localisation/master into OpenRCT2/develop. 2016-07-26 04:00:20 +00:00
Marijn van der Werf 215ed5e14d Attempt to name animations 2016-07-25 22:11:35 +02:00
Duncan 7c273ae285 Merge pull request #4174 from jensj12/Fix-get-paint_bounds 
Fix get paint_bounds
 2016-07-25 19:11:01 +01:00
jensj12 e70f7d9a38 Fix get paint_bounds 
The console command returned the wrong variable
 2016-07-25 19:52:32 +02:00
Duncan d7119d9b3b Merge pull request #3838 from marijnvdwerf/paint-setup/draw-bound-boxes 
Draw bound boxes
 2016-07-25 18:07:41 +01:00
Marijn van der Werf 750b8d9949 Draw bound boxes 2016-07-25 14:25:35 +02:00
Yaroslav Tretyakov 3116ec3e76 Fix issue in ReceiveData 2016-07-24 21:01:14 +01:00
Niels NTG 017e688fcc New file naming convention for screenshots 
- With this change screenshot file names have the following pattern:
save file name +  + YYYY-MM-DD hh-mm-ss + .png

- To get the correct date and time the method platform_get_time and platform_get_date are rewritten and to a version for UTC and a version for local time. This change gave the opportunity to simplify the code generating file names for autosaves.

- SOUND_WINDOW_OPEN is now the new "shutter" sound when taking screenshot.
 2016-07-24 20:32:55 +02:00
Ted John 291667d5bf Merge pull request #4155 from janisozaur/verify 
Verify inputs to various functions
 2016-07-24 12:29:46 +01:00
Michał Janiszewski e19cf781b1 Verify inputs to various functions 2016-07-24 13:18:50 +02:00
Ted John 8b79ededd9 Fix #4164: Keep on crashing on OpenRCT2 0.0.5 
Caused by 	hrow; instead of 	hrow Exception() when the image table is too large.
 2016-07-24 11:37:42 +01:00
OpenRCT2 git bot 5b66f87031 Merge Localisation/master into OpenRCT2/develop. 2016-07-24 04:00:19 +00:00
Ted John 55ec765811 Include cmdline_sprite.h in vcxproj 2016-07-23 22:25:24 +01:00
Michał Janiszewski 418eb06e66 Fix #3987: division by zero in vehicle update 
Prevent division by zero by checking the value first.
 2016-07-23 21:52:28 +01:00
sparklerfox 0b04b44dbc Include park name and time in screenshot path. 
Closes #4159
 2016-07-23 21:57:23 +02:00
Michał Janiszewski 306cf2383c Zero the memory when creating new sprite 
Some fields were left uninitialised explicitly (like rct_peep::var_73) but
used when doing logic. If they contained garbage from before the new
sprites were created, it could eventually lead to a desync later on.

This commit adds a new function: `sprite_reset`, which zeroes memory for
a new sprite and is called whenever a sprite is created. Some fields
have to be retained for the sprite to link properly in linked lists,
this function takes care of it.
 2016-07-23 12:32:58 +01:00
OpenRCT2 git bot c3f3667619 Merge Localisation/master into OpenRCT2/develop. 2016-07-23 04:00:22 +00:00
Duncan 576132df74 Merge pull request #3169 from duncanspumpkin/track_paint 
Junior Rollercoaster Track Paint
 2016-07-22 19:31:27 +01:00
duncanspumpkin 9652f68024 Implemented junior rollercoaster paint 2016-07-22 19:16:03 +01:00
Ted John 2d1cbc916f Check for valid colour presets on vehicle game command 
Fixes an issue some people were getting on servers where clients were somehow sending invalid preset IDs for a given ride entry.
 2016-07-21 19:51:06 +01:00
OpenRCT2 git bot bc3ec7a463 Merge Localisation/master into OpenRCT2/develop. 2016-07-21 04:00:40 +00:00
Ted John 1a4bdbcb77 Fix #4141: Newcomers can't join my server 
S6 exporter was not being set to export objects for network game transfer.
 2016-07-20 18:04:57 +01:00
Maarten Peters 389ae72781 Add extra default RCT2 vanilla install locations 
* 32 bit path for Steam.
* 32 and 64 bit path for standard GOG Galaxy.
* Update readme with latest install locations
 2016-07-19 21:57:48 +01:00
Ted John e5722e1d9a Fix #4139: Windows first time firewall launch 
std::string can not handle nullptr as argument. Create and use helper method instead.
 2016-07-19 21:53:18 +01:00
Michał Janiszewski 583372e082 Fix #4136: Can't exit game 
Caused by badly placed check prevent exiting the game.
 2016-07-19 20:53:03 +01:00
Ted John 0c180b8171 Merge pull request #4133 from janisozaur/fixes 2016-07-19 18:38:41 +01:00
Ted John 487fcc3c5b Fix #4134: Can't enable park-wide photo price for log flume and river ra 
Caused by not shifting the shop item flags (those above 32) to the correct mask bit.
 2016-07-19 18:35:44 +01:00
Michał Janiszewski 8446ae9026 Check for NULL scenery 2016-07-18 23:46:59 +02:00
Michał Janiszewski 2900999944 Validate gSavePromptMode 2016-07-18 21:18:41 +02:00
Michał Janiszewski c2929181c2 Ensure validity of gActiveTrackDesign 2016-07-18 21:18:36 +02:00
Michał Janiszewski bb2ae29699 Limit valid sprite indices when renaming peeps 2016-07-18 21:18:23 +02:00
Matte A f6c8993da6 Fix #4080: Track list doesn't update when a track design gets deleted 
Show an error if it can't select a track design rather than silently failing. Updating the list would require a file watcher on the tracks directory, and this edge case isn't particularly important at the moment.
 2016-07-18 18:10:16 +01:00
Ted John 664c460aa0 Fix #4047: Game crashes when switching to OpenGL 2016-07-18 18:04:37 +01:00
duncanspumpkin 551afeef86 Fix #4096. Max map elements incorrectly sized 
Due to a mistake from 2014 the number of map elements that could be used in a park was mistakenly assumed to be the same size as the s6 data for map elements. It turns out there are 256*256 spare elements for whatever reason. When the map element reorginisation code was refactored to remove magic numbers this incorrect value was used instead. This would cause the map element inserter to allocate a map element that shared the same mememory as a sprite. This would cause issues when the sprite tried to update or the map element tried to draw.
 2016-07-18 17:49:51 +01:00
OpenRCT2 git bot ca06bbe6e5 Merge Localisation/master into OpenRCT2/develop. 2016-07-18 04:00:19 +00:00
Ted John fd32eef2f7 Merge pull request #4129 from janisozaur/g_sprite_list 
Refactor access to g_sprite_list
 2016-07-17 23:27:58 +01:00
Michał Janiszewski 010422c7da Load and save sprites to S6 explicitly 2016-07-18 00:23:33 +02:00
Ted John e6d1a71dad Use assertion code for Guard::Fail 2016-07-17 23:20:40 +01:00
Michał Janiszewski bc769ea248 Use openrct2_assert in get_sprite 2016-07-17 23:54:31 +02:00
Michał Janiszewski ce03b2fa5e Add openrct2_assert function for C 2016-07-17 23:54:12 +02:00
Michał Janiszewski 313230a9a4 Refactor more code to correctly handle sprite count 2016-07-17 23:24:16 +02:00
Michał Janiszewski 381545aa2b Refactor loop in vehicle update not to access invalid memory 2016-07-17 23:14:27 +02:00
Michał Janiszewski 9f57c82653 Refactor access to g_sprite_list 
Hide g_sprite_list behind accessor function with a check. `assert` is
temporarily disabled, as it breaks nearly every park.
 2016-07-17 22:19:34 +02:00
Michał Janiszewski dd25cdc4f4 Change gfx_clear argument type 
`colour` gets passed on to IDrawingContext::Clear, which expects
uint32
 2016-07-17 20:41:19 +01:00
Michał Janiszewski 4db876c184 Add missing data to SpriteTypeToSlowWalkMap 
* Add missing data to SpriteTypeToSlowWalkMap
 2016-07-17 17:47:22 +01:00
Ted John a7229b567d Fix #4123: Different water colour at the main menu title sequence 
Caused by title screen not refreshing the palette after loading a park
 2016-07-17 17:46:16 +01:00
Ted John 964cf66f6b Zero g1 elements when freeing images 
This is to help diagnose issues where we are drawing invalid sprites as well as general cleanliness
 2016-07-16 18:08:58 +01:00