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

13220 Commits

Author SHA1 Message Date
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
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
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
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
Michael Steenbeek 459682721d Reformat MoneyEffect.cpp 2017-11-20 14:27:32 +01:00
Michael Steenbeek a050c6944f Compile money_effect.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek ec0f672e71 Compile particle.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek 005ce63a0f Compile tile_inspector.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek ed05d45072 Clean up ride groups and related functions 2017-11-20 13:40:03 +01:00
Michael Steenbeek bf69b2e682 Make terminology use more consistent 2017-11-20 11:20:04 +01:00
Ted John 38024bbd0d
Merge pull request #6699 from IntelOrca/refactor/available-entertainers 
Refactor entertainer invented logic
 2017-11-19 23:46:54 +00:00
Michael Steenbeek e3ab7e723d Fix #6701: assertion on string ID -2 and name it 2017-11-19 22:22:04 +01:00
Ted John 110730015b Rename scenery set to scenery group 2017-11-19 20:40:55 +00:00
Ted John 3251af4f30 Refactor entertainer invented logic 
Remove hard dependency on scenery window by calling a new is scenery set invented function. I don't think this the performance is any worse as it called init_scenery anyway for every call to get_available_entertainers.
 2017-11-19 16:06:10 +00:00
Michael Steenbeek 03299b9a64 Assert string number is not -2 2017-11-19 16:47:35 +01:00
Marijn van der Werf 67ebf40f83 Move main editor window to UI project 2017-11-18 21:07:21 +01:00
Marijn van der Werf dceb403ca9 Move editor bottom toolbar to UI module 2017-11-18 21:07:21 +01:00
Marijn van der Werf 8b7322ad6e Move bottom toolbar to UI module 2017-11-18 21:07:21 +01:00
Marijn van der Werf 3d7867791d Move scenery window to UI module 2017-11-18 21:07:21 +01:00
platipo 789b47b7bb Refactor slope flags and path type flag 2017-11-18 12:58:27 +01:00
Ted John 06cd6a958e Fix #6274: Demolishing launched freefall track piece removes entrance and exit 
Regression caused by multiple refactor commits. Track type and sequence was being retrieved from the entrance element instead of the track element in sub_6CB945.

Also fixes #6690.
 2017-11-18 00:04:40 +00:00
Michael Steenbeek 81ee4793df Fix #6688: reverser elements not correctly registered 
Issue caused by using tile_element_get_type() where track_element_get_type was intended.
 2017-11-17 23:44:05 +01:00
Michael Steenbeek 8027af56b6 Fix multi-dim coasters freezing and crashing 2017-11-17 23:23:45 +01:00
Michael Steenbeek bb483b0c5f Replace direct access to large scenery colour with helper functions 2017-11-17 22:54:54 +01:00
Enrico Paganin 8ffe7d5b43 Refactor maze flags 2017-11-17 17:03:57 +01:00
Enrico Paganin 27b420374e Refactor path flags 2017-11-17 17:03:57 +01:00
Enrico Paganin c2bf44ab1b Refactor scenery flags 
Every SCENERY_GHOST_FLAG_X is connected with its respective
SCENERY_TYPE_xxx flag
 2017-11-17 17:03:57 +01:00
Enrico Paganin 94bdfb0e43 Refactor marketing.h flag 2017-11-17 17:03:57 +01:00