Michał Janiszewski
3750a89089
Update ubuntu_amd64 docker image to clang 4.0
2017-06-14 23:19:56 +02:00
Ted John
1dae7f9f32
Move SDL_LoadBMP call to libopenrct2ui ( #5616 )
2017-06-14 19:47:22 +01:00
wolfreak99
46b575ee18
Remove unnecessary gFirstTimeSaving call, handle gFirstTimeSaving in game_load_save
2017-06-14 16:28:11 +02:00
wolfreak99
67160d2f70
Rename sint32 gFirstTimeSave to bool gFirstTimeSaving
2017-06-14 16:28:11 +02:00
Gymnasiast
f3f15d18f7
Replace more occurrences of scenery IDs
2017-06-14 16:06:43 +02:00
Christian F. Coors
c506c4be2d
Add defines for scenery IDs
2017-06-14 16:06:43 +02:00
Gymnasiast
4059d9e8a7
Clean up boosters, ride_type_null, max rides per entry, formatting
2017-06-14 16:06:43 +02:00
Michael Steenbeek
08a668bb0d
Add missing fixes to changelog
2017-06-14 13:40:24 +02:00
Michael Steenbeek
96a7a8ab50
Sort rides into ride groups when in select-by-track-type mode
...
* Add ride groups
* Convert ride groups to C++
* Fix linking and crashes in Xcode
* Comment out .field syntax to make Visual Studio happy
* Fix alignment, fix changelog, cleanup
* Properly save ride group index in the ride object repository and bump its version
* Fix fallback behaviour when the ride entry is not available or not invented
* Fix include
* Rename RideGroup to RideGroupManager, add const, cleanup
* Break after finding matching ride group
2017-06-14 13:31:27 +02:00
Ted John
fda2f38097
Merge pull request #5589 from duncanspumpkin/remove_win32_debug
...
Remove Win32 debug special builds as they no longer work and we will soon be removing RCT2 interop entirely.
2017-06-14 07:45:15 +01:00
Michał Janiszewski
9d5a86d0ae
Fix condition checks for being in logic update code ( #5610 )
2017-06-14 07:44:23 +01:00
Richard Jenkins
3952971920
Fix peep sounds persisting during pause ( #5612 )
2017-06-14 07:43:41 +01:00
OpenRCT2 git bot
4f873ce64a
Merge Localisation/master into OpenRCT2/develop.
2017-06-14 04:00:21 +00:00
Ted John
20197d50c3
Fix #5595 : No longer able to navigate map diagonally using arrow keys
2017-06-13 17:20:50 +01:00
Ted John
906b71796c
Remove testpaint for VS
2017-06-13 12:23:26 +01:00
Ted John
c609a0bff8
Remove RCT2 interop code in proj / prop files
2017-06-13 12:23:26 +01:00
duncanspumpkin
e70a96c04f
Remove Win32 debug special builds
...
Win32 debug previously built a special .dll build to allow calling into RCT2. This has been broken for a while and has little use anymore. It has therefore been removed.
2017-06-13 12:23:26 +01:00
Gymnasiast
fb807dedb9
Use spaces in the Xcode project, fixes #5565
2017-06-13 11:12:31 +02:00
OpenRCT2 git bot
f5ce5c9289
Merge Localisation/master into OpenRCT2/develop.
2017-06-13 04:00:22 +00:00
Ted John
f76ca6ea8b
Fix #5603 : Game fails on startup ( #5604 )
...
The game tries to use a ui context while setting up a platform environment. Let the platform environment be created before looking for the RCT2 directory. This is a bit hacky at the moment, but a necessary fix until it can be cleaned up.
2017-06-13 00:38:56 +01:00
Ted John
cf6f497cde
Merge pull request #5601 from IntelOrca/refactor/nosdl/headers
...
Remove / reduce SDL2 from headers
2017-06-12 23:37:01 +01:00
Ted John
29f0372da8
Reduce SDL2 in headers
2017-06-12 19:56:32 +01:00
Ted John
7e9f7df7d1
Use standard platform defines
2017-06-12 18:01:51 +01:00
Ted John
25b6c613b9
Merge pull request #5597 from IntelOrca/refactor/nosdl/remaining-platform
...
Remove remaining SDL from platform code
2017-06-12 17:52:11 +01:00
Ted John
407e99bbc2
Fix mingw builds
2017-06-12 17:13:18 +01:00
Richard Jenkins
4c67ef1d6a
Implement persistent 'real names of guests' setting
2017-06-12 14:05:19 +02:00
Richard Jenkins
5db340743f
Merge pull request #5599 from Gymnasiast/fix/5596
...
Fix #5596 : Incorrect colours in the Map window
2017-06-12 11:26:11 +01:00
ZehM4tt
60bf5083fc
Fixed few multiplayer desync issues. ( #5578 )
...
This addresses some of the desync causes:
* `vehicle_create_car` was using `scenario_rand` when it shouldn't have
* ghost elements affected grass growth
* ghost elements affecting peep logic[1]
It also adds some desync debug facilities, enabled at compile time.
It also reverts part of change introduced in
https://github.com/OpenRCT2/OpenRCT2/pull/5185 ,
namely reorder of desync check vs call to `ProcessGameCommandQueue();`
[1] It is not ideal to have this check in multiple locations, it is prone
to human error. We already have `map_remove_provisional_elements`,
but it is possible it does not work as well as it should. This needs
further investigation.
2017-06-12 12:11:01 +02:00
Gymnasiast
a586a6e15d
Fix #5596 : Incorrect colours in the Map window
2017-06-12 11:59:53 +02:00
Michał Janiszewski
0757582c93
Add missing include
2017-06-12 11:53:26 +02:00
Michał Janiszewski
4547dfab95
Prevent a crash in headless mode when showing error
2017-06-12 11:52:04 +02:00
Ted John
902bba6906
Fix compiler errors, add ctype.h in required source files
2017-06-11 23:43:28 +01:00
Ted John
36cfc1bb29
Remove remaining SDL from platform code
2017-06-11 23:26:14 +01:00
Ted John
ee7c97b7be
Move scancode to key to openrct2ui
2017-06-11 23:22:32 +01:00
Ted John
993f078a2a
Merge pull request #5594 from IntelOrca/refactor/nosdl/remaining-input
...
Move remaining SDL in input.c to openrct2ui
2017-06-11 23:07:05 +01:00
Richard Jenkins
006d6b7209
Xcode fix
2017-06-11 22:15:01 +01:00
Ted John
31c2b9c6b7
Move remaining SDL in input.c to openrct2ui
2017-06-11 21:18:56 +01:00
Ted John
3988b7797e
Fix display of chat shortcut on network games ( #5593 )
2017-06-11 18:19:15 +01:00
Ted John
a6bd541445
Merge pull request #5591 from IntelOrca/refactor/nosdl/keyboard
...
Refactor keyboard shortcuts to openrct2ui
2017-06-11 17:41:21 +01:00
Richard Jenkins
2a3dda9838
Xcode fix
2017-06-11 17:23:52 +01:00
Ted John
7a86fc2cb5
Link back shortcut functions
...
Some of this will be temporary until input and windows move over to libopenrct2ui.
2017-06-11 17:23:52 +01:00
Ted John
524248cfec
Fix libopenrct2ui.vcxproj
2017-06-11 17:23:52 +01:00
Ted John
89ea9064de
Move things in keyboard_shortcut.h into KeyboardShortcuts.h
2017-06-11 17:23:51 +01:00
Ted John
cbd53f920c
Create IWindowManager to open window from libopenrct2
2017-06-11 17:23:51 +01:00
Ted John
f62a6713ff
Fix libopenrct2.vcxproj
2017-06-11 17:23:51 +01:00
Ted John
dfa1b47a4f
Move keyboard shortcut code to libopenrct2ui.
2017-06-11 16:52:15 +01:00
Ted John
c8e4e6dae1
Remove usages of MAX_PATH
2017-06-11 15:42:06 +01:00
Ted John
0d8f9d6618
Refactor IPlatformEnvironment ( #5590 )
2017-06-11 12:53:37 +01:00
Ted John
b563d26ffe
Fix #5588 : crash in object selection
...
Add more safety guards for -1 image IDs which can happen if images were unsuccessfully allocated during object load.
2017-06-11 11:14:58 +01:00
Ted John
71b63a3c8a
Merge pull request #5587 from IntelOrca/refactor/nosdl/lightfx
...
Remove SDL from drawing engine and lightfx
2017-06-10 23:53:55 +01:00