Ted John
f36cffc98a
Fix running headless instances
...
colours_init_maps was not blocked when running in headless mode.
2017-11-16 21:53:34 +00:00
Ted John
d649a3e8b4
Merge pull request #6631 from sajattack/develop
...
replace flock with fcntl for better os compatibility
2017-11-16 20:28:24 +00:00
Ted John
b5137b0e37
Merge pull request #6574 from IntelOrca/protect-g1-access
...
Refactor g1 access
2017-11-16 18:51:32 +00:00
Michał Janiszewski
0f3b6b1590
Explicitly mention the expected root directory for discord-rpc
...
[ci skip]
2017-11-15 22:39:47 +01:00
Michał Janiszewski
0b5a067bbc
Update changelog with Linux support for Discord Rich Presence
...
[ci skip]
2017-11-15 22:38:10 +01:00
Michał Janiszewski
45421d6a4c
Update gitignore
2017-11-15 22:32:51 +01:00
Michał Janiszewski
8ec5f3ae82
Move FORCE32 option to top-level CMakeLists.txt
2017-11-15 22:32:51 +01:00
Michał Janiszewski
a9179fff52
chmod whole build directory on Travis
2017-11-15 22:32:51 +01:00
Michał Janiszewski
8f50660ad6
Use proper paths for discord-rpc in cmake
2017-11-15 22:32:51 +01:00
Michał Janiszewski
7612c2881d
Add some discord-rpc logging to cmake
2017-11-15 22:32:51 +01:00
Michał Janiszewski
8f3434d084
Add discord-rpc support to Linux
2017-11-15 22:32:51 +01:00
Christian F. Coors
58e8ef5de4
Fix build in clang
2017-11-14 21:01:11 +01:00
Michael Steenbeek
5409dedb7e
Remove unused C transfer functions in Tables.cpp
2017-11-14 11:55:53 +01:00
Michael Steenbeek
a663ab6cd2
Add extra NULL checks
2017-11-13 21:14:39 +01:00
Michael Steenbeek
2ebac91a2e
Add method to look up source game
2017-11-13 21:14:39 +01:00
Michael Steenbeek
11f2d60041
Automatically add all path bits and signs to the designated group
2017-11-13 21:14:39 +01:00
Michael Steenbeek
8d7d53de29
Correct Steel twister capacity
2017-11-13 20:37:13 +01:00
Michael Steenbeek
f073ec33fa
Fix #6646 : Max cars/train increase for RCT1 parity
2017-11-13 17:37:39 +01:00
Michael Steenbeek
c95a9e4c9b
Fix typo in 'separator'
2017-11-13 16:25:31 +01:00
Michael Steenbeek
9d686db86c
Fix typo in 'tolerance'
2017-11-13 16:23:19 +01:00
Michael Steenbeek
5eed8cecd4
Fix typo in 'multiplier'
2017-11-13 16:22:36 +01:00
Cody Jung
3bb9d41908
Fix #6657 : Reset tracking icon status when opening guest list
...
The guest tracking icon is hidden on the guest list if it's in
PAGE_SUMMARISED mode. Closing then reopening the window reset it back to
INDIVIDUAL mode but did not restore the icon state.
2017-11-13 10:36:16 +01:00
Michał Janiszewski
7f6471e896
Collapse identical branches
2017-11-13 10:31:48 +01:00
Michael Steenbeek
263b7537d7
Fix crash when removing scenery groups
2017-11-13 10:30:34 +01:00
Ted John
3fbdf117cd
Merge pull request #6651 from IntelOrca/discord-integration
...
Close #6639 : Integrate Discord Rich Presence
2017-11-12 21:09:28 +00:00
Ted John
36ffb1d3cb
Use initialiser instead of memset zero
2017-11-12 20:31:29 +00:00
kitsunenokenja
04f0048430
Add missing header include for std::ceil call ( #6655 )
...
OpenGLDrawingEngine::ConfigureCanvas calls std::ceil which is defined by
the cmath include. Adding the include directive resolves a compilation
failure to due std::ceil being otherwise undefined.
2017-11-12 14:02:30 +00:00
Ted John
4722f0fe94
Make DiscordService final
2017-11-11 23:56:24 +00:00
Ted John
a4a779d357
Update changelog
2017-11-11 23:50:34 +00:00
Ted John
324058a640
Delay presence refresh to 5s interval
2017-11-11 23:48:04 +00:00
Ted John
83e80d9658
Implement basic discord status report
2017-11-11 23:48:04 +00:00
Ted John
c7b7659cd6
Update VS dependencies to v14
2017-11-11 23:48:04 +00:00
Marijn van der Werf
bd0bd9e038
Move top toolbar to UI module
2017-11-11 23:57:19 +01:00
Marijn van der Werf
c247bbcb82
Move ride construction window to UI module
2017-11-11 23:57:19 +01:00
Marijn van der Werf
75e5f44717
Update Xcode project
2017-11-11 23:57:19 +01:00
OpenRCT2 git bot
891de0ad3e
Merge Localisation/master into OpenRCT2/develop.
2017-11-11 04:02:02 +00:00
Ted John
d3692dfb7a
Add Date class
...
To eventually replace passing around month ticks and date.c
2017-11-10 19:32:32 +01:00
OpenRCT2 git bot
c56d5b5f81
Merge Localisation/master into OpenRCT2/develop.
2017-11-09 04:00:20 +00:00
Michał Janiszewski
2775f5f3e5
Guard title sequence in headless mode
2017-11-08 23:27:51 +01:00
Robert Jordan
4c3065619e
Fix #996 , #2254 , #2589 , #2875 : Viewport scrolling getting stuck or shaking
...
Shaking while at the edge of the map has been completely eliminated. In
order to do this, comparison with tile height was also removed which
fixed a few outlier cases.
The main cause was viewport axis were only being set if it's respective
isometric axis was at the boundary, instead of either isometric axis.
Viewport no longer gets stuck which was related to the shaking in the
end. (#2875 )
Refactored viewport_update_position. I moved
viewport_set_underground_flag above the bounds checking function since
it had no relation to it. (#996 , #2589 )
Scrolling on the map edge with arrow keys or mouse edge will now go the
same speed in both directions. (#2254 )
Added changelog entry.
2017-11-08 17:43:50 +01:00
Philip Goto
27e3703fec
Add openrct2 URI handling to Linux
2017-11-08 16:14:01 +01:00
duncanspumpkin
55aea7188b
Fix #6617 . Maze deletion no longer costs 0x800000 for certain mazes.
...
When a maze does not have a completely hollowed out hedge the game command would return 0x8000000 as it tries to remove an element that has already been deleted. As game actions no longer use 0x80000000 to indicate a failure this would get interpreted as the refund price and cause the issue.
Fix was to introduce checks when adding up the refund price. This was done rather than changing the game action so that it can be properly fixed when get_refund_price is converted into a game action
2017-11-08 16:03:41 +01:00
Michał Janiszewski
49dbdefe0f
Format shared.c
2017-11-08 08:45:05 +01:00
Michał Janiszewski
b69b0be610
Move strndup implementation to shared.c
2017-11-08 08:45:05 +01:00
Richard Jenkins
d6bd26cd83
Fix #5836 , #6301 : Track list freezes after deletion in Track Manager
2017-11-08 07:51:59 +01:00
Michał Janiszewski
cabed0cef5
Remove unused field
2017-11-08 06:53:17 +01:00
OpenRCT2 git bot
0e4d9a2518
Merge Localisation/master into OpenRCT2/develop.
2017-11-08 04:00:35 +00:00
Robert Jordan
9ae4f7d1bc
Fix #6500 : Fail to load resources when no config
...
A simple fix of setting the environment paths before the repositories
are loaded.
Added a changelog entry
2017-11-07 21:03:58 +00:00
Paul
bf87489da8
make changes suggested in review
2017-11-07 00:15:22 -08:00
Paul
9325fffd9c
Update posix.c
2017-11-06 20:19:43 -08:00
