1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Commit Graph

13739 Commits

Author SHA1 Message Date
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
Aaron van Geffen
fce2996a73 Format braces in LoadSave.cpp. 2018-01-11 20:27:40 +01:00
Aaron van Geffen
6a404eb5dc Make MINGW happy, too. 2018-01-11 20:27:40 +01:00
Richard Jenkins
4a4aa80f31 Fix Windows implementation 2018-01-11 20:27:40 +01:00
Aaron van Geffen
aa82df2647 Experimental: use system date/time settings on Windows. 2018-01-11 20:27:40 +01:00
Aaron van Geffen
ada31ede29 Change header/sort button appearance. 2018-01-11 20:27:40 +01:00
Aaron van Geffen
9d96377e9b Infer optimal date width when opening load/save window.
In order to accomodate MSVC, we're not using strptime.
2018-01-11 20:27:40 +01:00
Aaron van Geffen
004e60ccc6 Use virtual columns to align date and time.
This also makes the date column use a fixed width. Useful when resizing.
2018-01-11 20:27:40 +01:00
Aaron van Geffen
ca172b46c1 Make load/save window resizeable. 2018-01-11 20:27:40 +01:00
Aaron van Geffen
c77b00898d Show formatted dates in load/save window. 2018-01-11 20:27:40 +01:00
Michał Janiszewski
c8048df5a6 Rename header files for testpaint 2018-01-11 16:29:52 +01:00
Michael Steenbeek
9a3e85f4f9 Fix Xcode 2018-01-11 16:29:52 +01:00
Michał Janiszewski
f817bf8483 Rename hook.c to Hook.cpp 2018-01-11 16:29:52 +01:00
Michał Janiszewski
a2aa8a0fb0 Rename compat.c to Compat.cpp 2018-01-11 16:29:52 +01:00
Michał Janiszewski
13ab77fe30 Rename addresses.c to Addresses.cpp 2018-01-11 16:29:52 +01:00
Michał Janiszewski
6951bf11f2 Rename data.c to Data.cpp 2018-01-11 16:29:52 +01:00
Michael Steenbeek
1787af8084 Fix #7003: Building sloped paths trough flat ones causes glitches 2018-01-11 16:30:11 +01:00
Michael Steenbeek
47a23603ae Remove unused functions 2018-01-11 13:25:09 +01:00
Michael Steenbeek
a0d43d2bd3 Fix Math::Clamp calls 2018-01-11 13:25:09 +01:00
Michael Steenbeek
cd5a1ba888 Compile files in world folder as C++ 2018-01-11 13:25:09 +01:00
Michael Steenbeek
1dada17bb0 Update changelog [ci skip] 2018-01-11 12:35:03 +01:00
Aaron van Geffen
1d7bec8a11 Make the virtual floor optional, on by default. 2018-01-11 10:37:40 +01:00
Aaron van Geffen
0fc596d758 Add changelog entry; add JeroenDStout to contributors.
[ci skip]
2018-01-11 10:37:40 +01:00