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

13244 Commits

Author SHA1 Message Date
Ted John 84305af7ab
Merge pull request #6715 from Broxzier/screenshot_climate 
Add optional screenshot argument to set weather
 2017-11-25 23:32:35 +00:00
Ted John 79a1755666
Merge pull request #6722 from duncanspumpkin/name_sprite_fields 
Name known misc sprite fields
 2017-11-25 23:31:00 +00:00
Michał Janiszewski 0a9ee59152 Change format to use 5-wide index 2017-11-25 16:42:12 +01:00
Michał Janiszewski 39bb4bcc41 Report indexing progress 2017-11-25 16:42:12 +01:00
duncanspumpkin b3cf757ee1 Increment network version 2017-11-25 09:31:16 +00:00
duncanspumpkin b6ce5ce4a5 Simplify fountain code. Name sprite fields. Fix warning 
Fountain jumping code has been sped up slightly so that the code can be simplified and not require rolling over a unsigned int. Also removed setting direction of the fountain as the field was not used.
 2017-11-25 09:30:38 +00:00
duncanspumpkin 464f5e858a Remove unused fields 2017-11-25 09:30:36 +00:00
duncanspumpkin 6905b81216 Label unused vars as pad and remove where required 2017-11-25 09:30:35 +00:00
duncanspumpkin 993ca5a03d Fix warning 2017-11-25 09:30:35 +00:00
duncanspumpkin e7774a4012 Clean up balloon update code. See previous commit for more info 2017-11-25 09:30:34 +00:00
duncanspumpkin 8bf42ea4f9 Modify how steam updates to simplify code. 
This will move steam in exactly the same way as the previous code but the
code is easier to understand. Note on first load of a save that was made
prior to this change there will be 1 tick of incorrect movement for steam. This is barrely noticeable.
 2017-11-25 09:30:33 +00:00
duncanspumpkin 0afc0eba5e Name known misc sprite fields. 2017-11-25 09:30:32 +00:00
OpenRCT2 git bot 4b860f5efd Merge Localisation/master into OpenRCT2/develop. 2017-11-25 04:01:15 +00:00
Michał Janiszewski a1bd146ac2
Set CMAKE_SYSTEM_PROCESSOR for Mingw toolchain file 2017-11-24 20:59:04 +01:00
Michael Steenbeek 1f4643b19c Show TT's Glass Roofs in the Abstract Theming group 2017-11-24 13:56:11 +01:00
Michael Steenbeek b5a4aa30cc Add TT's tile roofs to R&W tab, add TT's wooden roofs to Mine theming 2017-11-24 13:17:25 +01:00
Michael Steenbeek 303447f647 Show TT's Pirate Roofs in the Pirates Theming group 2017-11-24 12:27:22 +01:00
Michael Steenbeek c9ca5d55cd Rename incorrectly named flag 2017-11-24 11:44:57 +01:00
Michael Steenbeek bb569d35fb Fix some CC base blocks 2017-11-24 11:44:57 +01:00
rwjuk d920083503 Fix #6663: Object load error window filename corruption 2017-11-24 07:53:49 +01:00
Marijn van der Werf 2ce115ce3c Update Xcode project 2017-11-23 23:12:25 +01:00
Marijn van der Werf f19344aea6 Move tile inspector to UI module 2017-11-23 23:12:25 +01:00
Michael Steenbeek d88c01de74 Split Steel Wild Mouse and Spinning Wild Mouse when using Ride Groups 
Includes a little cleanup for the Ride Groups and a fix in the table with available pieces, which erroneously listed banked pieces as available.
 2017-11-23 16:00:58 +01:00
Michael Steenbeek 1011d6172d
Clean up string IDs 2017-11-23 15:52:06 +01:00
Hielke Morsink ce6d7415e5 Add ability to search object by filename 
This commit increases the max length of the filter string from 40 to
MAX_PATH, so that entire paths can be pasted inside the search box.
 2017-11-23 12:08:04 +01:00
Michał Janiszewski 65c21db2fc
Make GCC aware Object class is not final (#6726) 
* GCC suddenly decided `Object` should be marked as `final`, however it is
used as a base class for more specific types that inherit from it.

* Also ignore -Wsuggest-final-methods for Object class

* Guard Object::GetName from being final
 2017-11-23 10:14:28 +01:00
Ted John 323b8dd352 Partially fix #6129: Guest List not updating after a ride rename 
- Force refresh of ride list and guest list for both rename ride and demolish ride actions.
 2017-11-23 09:40:39 +01:00
OpenRCT2 git bot ad8fce4d77 Merge Localisation/master into OpenRCT2/develop. 2017-11-23 04:01:09 +00:00
Ted John aff7609b86 Name remaining wall entry flags 2017-11-22 22:53:13 +00:00
Ted John 53493d0977 Name only flag for banner objects 2017-11-22 22:06:56 +00:00
Ted John ef65a5208b Rename fields in rct_scenery_group_entry 2017-11-22 21:42:41 +00:00
Michael Steenbeek 430d95bd95 Fix vehicle name fallback 2017-11-22 18:15:07 +01:00
zyliwax 7bffc4ae33 Adding gridlines display toggle shortcut. (#6313) 
This feature existed in the original RCT1/2 games but was not present in
the latest development commit.

The original shortcut for this key was '7', placing it between the
"Invisible people toggle" (6) shortcut and the "Height marks on land
toggle" (8). This commit preserves as much as possible, using
placeholder comments that signify the relevant values which this
feature actually uses where this is not possible.
 2017-11-22 12:02:23 +00:00
OpenRCT2 git bot 65ab767597 Merge Localisation/master into OpenRCT2/develop. 2017-11-22 04:00:47 +00:00
Ted John 5cf30b0745 Fix #6700: Maze rendering issues 2017-11-22 01:08:48 +00:00
Hielke Morsink a5111d9feb Small fixes 
- Including C++ stdlib version and using std:: for its functions
- Added new line after printing the IOexception
- Properly clean up after quiting when weather has an invalid value
 2017-11-22 00:46:29 +01:00
Ted John a98c936316 Fix #5636: Pausing the game shows mute button as active 2017-11-21 23:23:43 +00:00
Michael Steenbeek c1400a12eb Allow separate ride and vehicle names per ride entry 2017-11-21 18:55:42 +01:00
Michael Steenbeek 76dc490fca Clip available vehicles string in New Ride window 2017-11-21 18:28:21 +01:00
Hielke Morsink 34bce9892d Turn weather setting into command line option 
Inside the HandleScreenshot function, the argc will be reduced to the
number of arguments minus the options. This way the function doesn't
have to deal with extra optional arguments.
 2017-11-21 18:18:42 +01:00
Michael Steenbeek 2a01c22e8c Raise vehicle tab window height to avoid text clipping 2017-11-21 15:10:35 +01:00
OpenRCT2 git bot 28497cae4a Merge Localisation/master into OpenRCT2/develop. 2017-11-21 04:00:34 +00:00
Hielke Morsink 9452457bf9 Add optional screenshot argument to set weather 2017-11-21 00:29:24 +01:00
Michał Janiszewski a1c1842a52 Fix #6675: Ensure libdiscord-rpc.so is packaged properly 2017-11-20 22:02:28 +01:00
Michael Steenbeek adae6041f3 Show list of available vehicles in New Ride window 2017-11-20 19:42:29 +01:00
Hielke Morsink b3f9fb5299 Invalidate ride window when opening/closing all 
The ride window was not invalidated, resulting in old text being still
visible inside the list. This was especially noticable when the game was
paused.
 2017-11-20 18:28:22 +01:00
Ted John 8c53b6a70b Fix #6681: Tons of visual glitches when zooming out 
Regression from #6574. Restoring the backup of SPR_TEMP was removed which was necessary as it is the sprite for grass tile zoomed out. Instead make SPR_TEMP a special sprite ID which is not used for anything else apart from temporary sprite drawing.
 2017-11-20 13:48:00 +00:00
Michael Steenbeek dd8464f907 Refactor small, large and wall scenery 2017-11-20 14:40:56 +01:00
Michael Steenbeek 1d3f6b1634 Reformat Particle.cpp 2017-11-20 14:27:32 +01:00
Michael Steenbeek 97683a38d6 Reformat TileInspector.cpp 2017-11-20 14:27:32 +01:00