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

15067 Commits

Author SHA1 Message Date
Ted John c640427d89 Add missing change from b80913d 2018-06-20 22:00:11 +01:00
Michał Janiszewski 3067534ef1
Merge pull request #6752 from janisozaur/android-cli 
Fix #6751: Android CLI client is missing
 2018-06-20 22:55:24 +02:00
Ted John b80913df08 Revert unintended changes in 1b08fb4 
Change `FORMAT_uint16_t` back to `FORMAT_UINT16`
 2018-06-20 21:42:52 +01:00
Ted John f79954bde3 Refactor map element organisation 
Committing some changes that were originally for #7637.
- Refactor map_check_free_elements_and_reorganise
- Refactor map_strip_ghost_flag_from_elements
- Remove sub_68B089

I have removed sub_68B089 because this function was run every game tick
and 1000 times when trying to request some spare elements. It was a
lighter function which tried to stretch out the tile element pointers
behind any spare elements. In this day and age, doing a full tile
element defrag is very fast (even in debug mode it takes no more than
10ms), so I don't think keeping sub_68B089 is necessary.
 2018-06-20 21:35:27 +01:00
Michał Janiszewski 5eda335b12 Link Android libopenrct2 with SDL2 for SDL_AndroidGetJNIEnv 2018-06-20 21:29:14 +02:00
Michał Janiszewski 0029fca38f Fix libraries linked to Android builds 2018-06-20 21:29:14 +02:00
Michał Janiszewski 362852f12e Fix #6751: Android CLI client is missing 2018-06-20 21:29:14 +02:00
Michael Steenbeek 085cb7f3b1
Merge pull request #7716 from Gymnasiast/integer-types 
Replace our own integer types with standard ones
 2018-06-20 21:04:05 +02:00
Michael Steenbeek fae7c61f05 Fix config read/write 2018-06-20 17:56:57 +02:00
Michael Steenbeek 16f5c92bde Fix copy-paste error 2018-06-20 17:55:34 +02:00
Michael Steenbeek 57ab1bb2e9 Fix failing test 2018-06-20 17:55:17 +02:00
Michael Steenbeek 1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Michael Steenbeek ec3a1e575e
Replace Math::Min and Max with std variants 2018-06-20 17:11:35 +02:00
Michael Steenbeek 323162cfe8
Fix #7711: Inverted Hairpin RC allows building invisible banked pieces 2018-06-20 11:32:29 +02:00
Michał Janiszewski 5f6f65f138
Merge pull request #6771 from janisozaur/android-multiplayer 
Compile Android builds with network support
 2018-06-19 23:10:50 +02:00
Michał Janiszewski 41b2168824 Fix namespace unused with HTTP disabled 2018-06-19 22:41:33 +02:00
Michał Janiszewski e1c5fda28d Compile Android builds with network support 2018-06-19 22:03:31 +02:00
Michał Janiszewski 6c4f714ecc
Update Android builds to use libs v0.9, link with ICU (#7712) 2018-06-19 21:57:44 +02:00
OpenRCT2 git bot 0ec3ccdaf4 Merge Localisation/master into OpenRCT2/develop. 2018-06-18 04:00:56 +00:00
Michał Janiszewski 65d1c7f490
Fix and enable -Wtautological-unsigned-zero-compare (#7706) 2018-06-17 22:48:45 +02:00
Aaron van Geffen d5eb1c504d Fix #7685: Disable warning due to problems compiling OpenSSL on macOS. (#7704) 2018-06-17 09:29:05 +02:00
OpenRCT2 git bot 05fa04a8d6 Merge Localisation/master into OpenRCT2/develop. 2018-06-17 04:00:26 +00:00
Ted John 182bc1afe6 Fix #7696: Servers do not get registered on master server list 
Correct the HTTP method used for the heartbeat request.
 2018-06-16 22:37:23 +01:00
Ted John ee50895d81
Merge pull request #7703 from IntelOrca/refactor/window-2 
Allocate the windows on the heap
 2018-06-16 21:41:05 +01:00
Ted John 98905fdbc3 Change g_window_list to use the heap for windows 2018-06-16 16:04:01 +01:00
Ted John 0f6138f8b6 Convert g_window_list to a std::vector 2018-06-16 16:04:01 +01:00
Ted John a716b4aa28 Remove use of window list in Viewport.cpp 2018-06-16 16:04:01 +01:00
Aaron van Geffen 1f5572fe28 Fix #7701: Strings overflow in drawing debug windows. (#7702) 
The last widget was not taken into account.
 2018-06-16 14:41:18 +01:00
Ted John 26666b1da9 Remove empty function: viewport_update_pointers 2018-06-15 23:15:52 +01:00
Michael Steenbeek c4cae83335
Fix AddRange to avoid duplicates in EntryList 2018-06-15 23:36:13 +02:00
devnoname120 4dea7f7971 Make related projects icons clickable (#7699) [ci skip] 2018-06-15 21:27:44 +02:00
Hielke Morsink 14d6625c15
Merge pull request #7695 from Broxzier/wide-path-debug 
Add debug option to visualize wide path flags.
 2018-06-15 17:07:50 +02:00
Hielke Morsink 0528a455e9 Automatically resize debug window to fit strings 2018-06-15 16:13:47 +02:00
Hielke Morsink 0fda25d365 Add debug option to visualize wide path flags. 
This implements #7694
 2018-06-15 16:08:25 +02:00
Hielke Morsink 0cf256ac9e Ready copyright notice for clang-format 
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.

I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
 2018-06-15 14:07:34 +02:00
Michael Steenbeek d28e8a6126
Introduce calls to check for research markers 2018-06-15 12:11:03 +02:00
Hielke Morsink aad1e69d7e
Add parentheses to macro arguments (#7686) 
This adds parentheses around macro arguments that are either negative or used for calculations inside the macro itself. Doing this avoids getting errors in code that may look right.
 2018-06-15 10:54:05 +02:00
Michael Steenbeek 706843e135
Use `get_ride_entry()` to build the correct `rct_research_item` 2018-06-15 10:39:38 +02:00
Michael Steenbeek 74dd8a4eac
Merge pull request #5993 from wolfreak99/improved_window_inputs/ride_price_textinput 
Make ride window prices allow text input
 2018-06-15 10:09:37 +02:00
Michael Steenbeek 7bd4244797
Merge pull request #7628 from Chaosmeister/unpickable-research-items 
make always researched researchitems unpickable.
 2018-06-15 09:47:08 +02:00
Michael Steenbeek 029ad2b5eb Update changelog for #5993 2018-06-15 09:37:32 +02:00
Michael Steenbeek e6dcf43680 Adjust money-string functions for exchange rates 2018-06-15 09:36:17 +02:00
Aaron van Geffen ee64daae58 Fix event list. 2018-06-15 09:36:17 +02:00
Gymnasiast fe54cf5ee6 Allow forcing decimals 2018-06-15 09:36:17 +02:00
wolfreak99 961d25dbb9 Make ride window prices allow text input 2018-06-15 09:36:17 +02:00
Ted John fdb1d98868
Move rain window loop to libopenrct2ui (#7684) 2018-06-15 07:46:04 +01:00
Aaron van Geffen 9d68ba86ff Update changelog. 2018-06-15 00:43:19 +02:00
Hielke Morsink c3cff07b91 Disallow placing items in-between always researched items 
This adds a loop that iterates down the list, until it reaches either a researched item or the end.
 2018-06-15 00:34:30 +02:00
Hielke Morsink c437f438f1 Remove invalid cast 2018-06-15 00:34:30 +02:00
Hielke Morsink 30b9d3a338 Move always_researched checks and add comments 2018-06-15 00:34:30 +02:00