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

13861 Commits

Author SHA1 Message Date
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
Marijn van der Werf 4c956def67 Update UI imports 2018-01-18 22:57:55 +01:00
Ted John 738b72d0ce
Merge pull request #7046 from OpenRCT2/refactor/platform-to-cpp 
Refactor remaining platform files to C++
 2018-01-18 21:51:58 +00: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
Ted John 61450353cb Fix build for Linux 2018-01-18 21:25:54 +00:00
Michael Steenbeek f551a150fe Fix Xcode project 2018-01-18 21:13:38 +00:00
Ted John 974ef800cb Rename remaining platform c files to cpp 2018-01-18 21:12:41 +00:00
Ted John d9d2b2373d Rename crash.h to Crash.h 2018-01-18 21:12:41 +00:00
Ted John 34d41aeadd Convert shared.c to C++ 2018-01-18 21:12:41 +00:00
Richard Jenkins 3df8ae6960 Use colour defines in dazzling colours array 2018-01-18 21:28:51 +01:00
Michał Janiszewski 409a995e7f Discard const on returned type 2018-01-18 19:06:27 +01:00
Michał Janiszewski 48c3225cb7 Fix types of caught exception in IniReader.cpp 2018-01-18 19:06:05 +01:00
Richard Jenkins af76cef94b
Fix bracket placement 2018-01-18 14:08:06 +00:00
Ted John 8630498213
Convert platform/windows.c to C++ (#7044) 2018-01-18 12:50:34 +00:00
Ted John bea500638b Remove old file enumerator functions from platform 2018-01-18 11:38:52 +01:00
Ted John cb720025fa Replace platform_enumerate_directories_begin with FileScanner code 
This is isn't a particularly pretty implementation but it is only temporary until we can use std::filesystem.
 2018-01-18 11:38:52 +01:00
Ted John 6fd56d140d Remove remaining uses of platform_enumerate_files_begin 2018-01-18 11:38:52 +01:00
Ted John d8b3fb01a7 Fix FileScanner not taking notice of recurse flag 2018-01-18 11:38:52 +01:00
Michał Janiszewski 4eb2ceac47 Fix #7004: Placing track design makes the park disappear 2018-01-18 10:30:34 +01:00
OpenRCT2 git bot ec3e34aba7 Merge Localisation/master into OpenRCT2/develop. 2018-01-18 04:01:03 +00:00
Michał Janiszewski d253588549 Break overlong function declarations 
Before:
```diff
-static void large_scenery_paint_supports(paint_session * session, uint8 direction, uint16 height, rct_tile_element *tileElement, uint32 dword_F4387C, rct_large_scenery_tile *tile)
+static void large_scenery_paint_supports(paint_session * session, uint8 direction, uint16 height,
+                                         rct_tile_element * tileElement, uint32 dword_F4387C, rct_large_scenery_tile * tile)
-static rct_large_scenery_text_glyph *large_scenery_sign_get_glyph(rct_large_scenery_text *text, uint32 codepoint)
+static rct_large_scenery_text_glyph * large_scenery_sign_get_glyph(rct_large_scenery_text * text, uint32 codepoint)
```

After:
```diff
-static void large_scenery_paint_supports(paint_session * session, uint8 direction, uint16 height, rct_tile_element *tileElement, uint32 dword_F4387C, rct_large_scenery_tile *tile)
+static void large_scenery_paint_supports(
+    paint_session *          session,
+    uint8                    direction,
+    uint16                   height,
+    rct_tile_element *       tileElement,
+    uint32                   dword_F4387C,
+    rct_large_scenery_tile * tile)
-static rct_large_scenery_text_glyph *large_scenery_sign_get_glyph(rct_large_scenery_text *text, uint32 codepoint)
+static rct_large_scenery_text_glyph * large_scenery_sign_get_glyph(rct_large_scenery_text * text, uint32 codepoint)
```

[ci skip]
 2018-01-18 00:13:55 +00:00
spacek531 64aa221ffb update title sequence version numbers 
[ci skip]
 2018-01-18 00:04:30 +00:00
Grant Barker 52ad1e1795 fix make error on macOS 2018-01-17 23:54:57 +00:00
OpenRCT2 git bot 5af2b6c214 Merge Localisation/master into OpenRCT2/develop. 2018-01-17 04:00:31 +00:00
Aaron van Geffen a1e7a18a67 Cheats window: format braces et cetera. 2018-01-16 23:22:52 +01:00
Aaron van Geffen c951c7b539 Ride cheats: reorder and group cheats in boxes by function. 
* Change button order.
* Move checkboxes into a more logical order.
* Add group boxes around checkboxes.
 2018-01-16 23:22:52 +01:00
Michał Janiszewski 3ba0cc3dae Add missed constexprs 2018-01-14 16:13:37 +01:00
rwjuk c0321c3d91 Fix capitalisation of 'Object selection' [ci skip] 2018-01-14 13:37:27 +00:00
OpenRCT2 git bot 6b79ea6515 Merge Localisation/master into OpenRCT2/develop. 2018-01-14 04:02:11 +00:00
Ted John 888f60c583 Use new platform functions in theme.cpp 
Also uses std::string instead of C strings in most places.
 2018-01-14 01:17:04 +00:00
Ted John ca7f9dec8e Move function out of C extern 2018-01-14 01:06:47 +00:00
Ted John 9afbfe02ab Add new helper to check if raining 2018-01-14 01:06:47 +00:00
Ted John 742690b4f4 Add enums for weather effect and rain level 2018-01-14 01:06:47 +00:00
Ted John 68202db51c Make ClimateWeatherData and ClimateWeatherGloomColours internal to Climate.cpp 2018-01-14 01:06:47 +00:00
Ted John 83cdd56825 Unify current and next climate state into common struct 2018-01-14 01:06:47 +00:00
Adakite Systems 0681ba4e04 Read and set edge scrolling speed via config 
- For future reference, the default edge scrolling speed
value of 12 is retained.
 2018-01-14 00:51:51 +00:00
Michael Steenbeek 037b236d8f Add the RCT1 edge styles 2018-01-13 15:39:22 +01:00
deurklink c1c6413337 Fix #7011: Swinging and bobsleigh cars going backwards swing in the wrong direction 
This fix will make swinging rides like the suspended swinging coaster and the bobsleigh coaster back to the outside of corners when moving backwards (For example during a rollback). This was an original bug in RCT2.
 2018-01-13 15:28:07 +01:00
OpenRCT2 git bot 27b57f8126 Merge Localisation/master into OpenRCT2/develop. 2018-01-13 04:00:43 +00:00
Ted John 354a8edf40 Fix a few mistakes in en-GB strings 2018-01-12 23:46:02 +00:00
Aaron van Geffen c581656693 Add extra padding to label text in track install window. 
Also fixes the window height, not just to accommodate the extra padding,
but also to accommodate the 'space required' field.
 2018-01-12 22:29:32 +01:00
Richard Jenkins 8fb5f5c2be
Fix #6993: Inverting track design causes a crash 2018-01-12 15:42:02 +00:00
OpenRCT2 git bot bf06948c51 Merge Localisation/master into OpenRCT2/develop. 2018-01-12 04:01:26 +00:00
ZehMatt 84f2917f59 Use const and constexpr whenever possible. 2018-01-11 22:29:08 +01:00
Aaron van Geffen 81398d9225 Reset resize widget's top position properly when invalidating. 2018-01-11 20:27:40 +01:00
Aaron van Geffen 4d219c3abe Refactor name and path into std::string, too. 2018-01-11 20:27:40 +01:00
Aaron van Geffen eb0ad92e6d Use std::vector as LoadSaveListItem container. 2018-01-11 20:27:40 +01:00