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

13201 Commits

Author SHA1 Message Date
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
Enrico Paganin 95e75c4575 Refactor colour.h flags 2017-11-17 17:03:57 +01:00
Michael Steenbeek e23c10863e Fix tile element type confusion 2017-11-17 14:20:49 +01:00
Michael Steenbeek 470c9993fa Fix calling wrong function 2017-11-17 13:10:58 +01:00
Michael Steenbeek 3bd68947b9 Create functions for getting large scenery type and sequence 2017-11-17 12:56:08 +01:00
Michael Steenbeek 9a4021996f Remove unnecessary comment 
[ci skip]
 2017-11-17 12:54:47 +01:00
Michael Steenbeek e12de39407 Fix include 2017-11-17 12:54:47 +01:00
Michael Steenbeek dd6257af1e Tackle the two residual usages of the colour property 2017-11-17 12:54:47 +01:00
Michael Steenbeek 268851aa87 Fix testpaint 2017-11-17 12:54:47 +01:00
Michael Steenbeek 3cf8da184d Create tile_element_get_ride_index() 2017-11-17 12:54:47 +01:00
Michael Steenbeek 99830ed069 Add track_cable_lift functions to compat.c 2017-11-17 12:54:47 +01:00
Michael Steenbeek a5dee3a0ae Add track_element_[sg]et_type to compat.c 2017-11-17 12:54:47 +01:00
Michael Steenbeek 60d5d5ca1e Cleanup 2017-11-17 12:54:47 +01:00
Michael Steenbeek f448d16707 Add methods for getting and setting track element type 2017-11-17 12:54:47 +01:00
Michael Steenbeek 5a7ace134f Apply changes to Testpaint 2017-11-17 12:54:47 +01:00
Michael Steenbeek 953d6840f4 Fix some missed occurrences 2017-11-17 12:54:47 +01:00
Michael Steenbeek ab3f42f1f9 Add getters and setters for ride index and maze entry 2017-11-17 12:54:47 +01:00
Michael Steenbeek 74209c7282 Move track tile element functions to Track.cpp 2017-11-17 12:54:47 +01:00
Aaron van Geffen 13f99e495e Reduce console verbosity for TTF loading. 2017-11-17 10:31:26 +01:00
Michael Steenbeek a292917e50
Compile mapgen.c as C++ 2017-11-17 10:22:54 +01:00