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

2469 Commits

Author SHA1 Message Date
Gymnasiast 5cc21fd21b Replace NULL with nullptr in C++ files 2018-01-29 21:33:21 +00:00
Gymnasiast b78e84702d Always show vehicle name in Research window 2018-01-29 20:09:05 +01:00
Michał Janiszewski 818a71efe8 Add constexprs to TrackData 2018-01-29 15:37:17 +01:00
Gymnasiast 2dc56f4393 Fix renamed define 2018-01-29 14:08:08 +01:00
Hielke Morsink 8fac2e1480 Add guard to ensure game action is registered 
This also reorders the headers, which caused RideDemolishAction to fail compiling, but that's also solved by adding the namespace before the call.
 2018-01-29 13:22:13 +01:00
Gymnasiast e8b2a3df0d Slight research refactor 2018-01-29 12:52:12 +01:00
Gymnasiast 566f3d901f Small refactor of research_get_current_item() 2018-01-28 21:39:50 +01:00
rwjuk f2792688ea Fix #7084: SC4 scenario completion not marked correctly 2018-01-28 21:38:37 +01:00
Gymnasiast 0e606c4b8c Fix research and guest references in RCT1 news items 2018-01-28 21:36:42 +01:00
Gymnasiast b7ff54480c Import more RCT1 fields 2018-01-28 21:36:42 +01:00
Michael Steenbeek 9d04593734 Slightly refactor staff_can_ignore_wide_flag() 
This should also take care of some compilers failing.
 2018-01-28 19:31:51 +01:00
Gymnasiast 68516fc2bb Import RCT1 research progress 2018-01-28 19:03:33 +01:00
Gymnasiast 4780ae6e3d Import RCT1 parks with an interest rate of 1% 2018-01-28 15:38:09 +01:00
Gymnasiast 658131bfec Fix import of RCT1 vintage cars 
They only had one colour in RCT1.
 2018-01-28 14:38:11 +01:00
pss9205 d6bf08e407 Fix #7030: Ride reliability underflows 2018-01-28 12:51:45 +01:00
Gymnasiast f217582f8e Revert "Add default exit value to staff_can_ignore_wide_flag" 
AppVeyor fails because the code is unreachable.
This reverts commit a7c7dc68e3.
 2018-01-28 12:13:47 +01:00
Michał Janiszewski a7c7dc68e3 Add default exit value to staff_can_ignore_wide_flag 2018-01-26 20:29:37 +01:00
Ted John 8f1100c986
Merge pull request #7066 from IntelOrca/refactor/memory-operations 
Refactor memory operations 1
 2018-01-26 11:41:19 +00:00
Richard Jenkins f1df94b6d1 Standardise caret with TextInput window 2018-01-25 10:56:35 +01:00
Richard Jenkins daecb02d00 Fix macOS build use uint32 rather than char32_t 2018-01-23 21:45:58 +00:00
Gymnasiast 2c8ab6fb68 Fix #7065: Guests cannot enter Great Wall Of China scenario 2018-01-23 19:03:00 +01:00
Richard Jenkins 1fc32182af Fix #6314: SV4s do not mark corresponding scenario as completed 2018-01-23 18:42:00 +01:00
Ted John 8304f01aef Fix #5809: Support Steam RCT1 file layout 
Checks RCTdeluxe_install sub directory for csg1.1 and csg1i.dat when loading CSG images.
 2018-01-23 18:28:33 +01:00
Hielke Morsink c965f854d8 Add maximum number of lines in console window 
Changed the container type from a vector to a deque, as that supports FIFO with random access.
 2018-01-23 16:43:33 +01:00
Hielke Morsink 7c0bcc2c34 Handle codepoints for text colour in a nicer way 
This replaces a couple more buffers with std::strings and makes {WINDOW_COLOUR_2} the default colour when adding a new line. Codepoints for any other colour will be added, and overwrite the codepoint that gets calculated in `console_draw` (which is only there for when the user has text set to black).
 2018-01-23 16:43:33 +01:00
Hielke Morsink 3633d56e3e Refactor and cleanup in-game console to use C++ strings 
Instead of storing the console text in one large buffer, it gets stored in a vector of strings. This makes the code easier to understand, as the `std::string`s now handle the buffer lenghts, instead of doing that manually and bloating the code with it, but at the cost of some performance (not noticable though). This fixes an issue where the buffer would be cut off when the total length exeeded the buffer length.
With this commit printed warnings and errors will have a red and yellow colour. It looks like this was intended, but it didn't work before, and makes `gfx_draw_string` and related functions take const strings.
 2018-01-23 16:43:33 +01:00
Gymnasiast 9a362a8aa3 Import RCT1 gardens correctly 2018-01-22 20:25:29 +01:00
Gymnasiast 498ca56f57 Fix unicode values of some characters 2018-01-22 12:16:22 +01:00
Gymnasiast 6bf09e7abb Add preview images for RCT1 edge styles 2018-01-22 11:44:38 +01:00
ZehMatt 1f5140ae94 Fix benchgfx attemping to render unloaded parks. 2018-01-21 21:46:11 +00:00
ZehMatt abd74dbb1e Add exception handling in LoadParkFromFile. 2018-01-21 21:46:11 +00:00
Michael Steenbeek fdeaaa5631
Allow selecting RCT1 map edges in land tool 2018-01-21 17:18:00 +01:00
Ted John 131286f758 Refactor memory handling in OpenGLShaderProgram.cpp 2018-01-21 11:17:41 +00:00
Ted John cb44dc5c21 Fix changelog 2018-01-21 11:17:41 +00:00
Ted John ba5bc415c7 Refactor memory handling in window sources 2018-01-21 11:17:40 +00:00
Ted John 51df68a7d9
Merge pull request #7051 from IntelOrca/refactor/remaining-ride-to-cpp 
Refactor remaining ride sources to C++
 2018-01-19 10:49:54 +00:00
Ted John 6d63729a40 Fix MSVC 2018-01-18 22:59:30 +00:00
Ted John aa0d7645da Refactor ride_ratings.c to C++ 2018-01-18 22:33:06 +00:00
Richard Jenkins d9725702ca Make console text colour themeable 2018-01-18 23:18:23 +01:00
Richard Jenkins 78a5406468 Visual improvements to the in-game console 2018-01-18 23:18:23 +01:00
Ted John f2014fb6b1 Refactor music_list.c to C++ 2018-01-18 22:08:56 +00:00
Ted John 6a8cce710c Refactor track_design_save.c to C++ 2018-01-18 22:04:09 +00:00
Marijn van der Werf d09134e64a Decrease Window dependencies in Vehicle.cpp 2018-01-18 22:57:55 +01:00
Marijn van der Werf 7d0417a366 Import private headers in remaining files 2018-01-18 22:57:55 +01:00
Marijn van der Werf baf56db937 Use rct_window internals in Theme 2018-01-18 22:57:55 +01:00
Marijn van der Werf 7aa2cd7ac5 Move peep list refreshing to UI module 2018-01-18 22:57:55 +01:00
Marijn van der Werf 430bf482f2 Add viewport getter 2018-01-18 22:57:55 +01:00
Marijn van der Werf aa0933d08a Convert rct_window to opaque pointer 2018-01-18 22:57:55 +01:00
Michał Janiszewski a634b7e2cb Add comment explaining reasoning behind our own getumask() 2018-01-18 22:47:10 +01:00
Michał Janiszewski c6e2f1a6ea Fix Android.cpp 2018-01-18 22:42:54 +01:00