Michael Steenbeek
a292917e50
Compile mapgen.c as C++
2017-11-17 10:22:54 +01:00
OpenRCT2 git bot
36236d8c97
Merge Localisation/master into OpenRCT2/develop.
2017-11-17 04:00:43 +00:00
TELK
d6131ed062
Fix #6547 : logging does not work if server contains CJK characters ( #6565 )
2017-11-16 23:02:37 +00:00
Mike Slone
aca7048377
Fix #6293 : Screenshot sound not played when the game is paused ( #6429 )
...
Stop all sounds when pausing the game, but allow new sounds to play.
This allows interface sounds to function while paused, which fixes #6293 .
2017-11-16 23:02:16 +00:00
Ted John
271f15328b
Merge pull request #6329 from JeroenDStout/railway-crossings-fix-clip
...
Fix railway/path clipping when on same height
2017-11-16 23:00:40 +00:00
Michał Janiszewski
63e246938f
Make sure PORTABLE option is honoured globally
2017-11-16 23:08:03 +01:00
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
f7c7a5bace
Fix build
2017-11-16 19:11:10 +00:00
Ted John
6b5ad0cf73
Fix alignment in sprites.h
2017-11-16 19:06:19 +00:00
Jeroen D Stout
deb37a8de8
Add missing 3-tile turn piece
2017-11-16 19:04:08 +00:00
Jeroen D Stout
0c1265aba3
Add sprites to sprite index
2017-11-16 19:04:08 +00:00
Jeroen D Stout
f8b4ee2602
Add gravel / grooved track painting behaviour to miniature railway
2017-11-16 19:04:08 +00:00
Jeroen D Stout
c6d548cc36
Increase bouding box z of peeps
2017-11-16 19:03:14 +00:00
Jeroen D Stout
b207826e56
Increase bounding box z of litter
2017-11-16 19:03:14 +00:00
Jeroen D Stout
afab2bd51f
Change path bounding box when intersecting with track
2017-11-16 19:03:14 +00:00
Jeroen D Stout
3410330bb2
Add paint session memory for tracks and paths
2017-11-16 19:02:28 +00:00
Jeroen D Stout
95997ae78e
Update sprites json
2017-11-16 18:59:25 +00:00
Jeroen D Stout
43e7eb8623
Add sprites
2017-11-16 18:59:25 +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