mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,937 Commits 8 Branches 39 Tags 369 MiB
Commit Graph

9937 Commits

Author SHA1 Message Date
Michał Janiszewski 4d61396146 Set openrct2.org token for x86 builds on Travis-CI 2016-10-20 09:05:59 +02:00
OpenRCT2 git bot 04783e8905 Merge Localisation/master into OpenRCT2/develop. 2016-10-20 04:00:17 +00:00
zsilencer d83df63acf Increment network version 2016-10-19 16:24:14 -06:00
zsilencer 3617c2cb93 Code review 2016-10-19 16:20:13 -06:00
zsilencer 986c2ab97e Fix bug - prevent firing of staff while being picked up 2016-10-19 16:20:05 -06:00
Marijn van der Werf f2033b0d93 Fix #3561: Tunnels drawn incorrectly 2016-10-19 21:45:19 +01:00
duncanspumpkin 8b196234e9 Flip the calcs 2016-10-19 21:30:08 +01:00
Michał Janiszewski dd377bcfc1 Drop unnecessary flags for Launchpad builds 2016-10-19 11:32:13 +02:00
Michael Steenbeek 0abb53f6ae Merge pull request #4582 from wolfreak99/create_folder 
"Create folder" button for save dialog
 2016-10-19 11:06:45 +02:00
wolfreak99 ca19ececd6 Create folder button 
Fixed remarks

Update comments to plural usage
 2016-10-19 02:48:02 -04:00
OpenRCT2 git bot 29a277edb2 Merge Localisation/master into OpenRCT2/develop. 2016-10-19 04:00:20 +00:00
Marijn van der Werf 1be2dd996c Make testpaint a lot more quiet 2016-10-19 01:58:47 +02:00
LRFLEW 2392e2658a Replace spinlock in main game loop 2016-10-18 22:13:10 +01:00
duncanspumpkin 430d1c4bcd Re-refactor peep calculate satisfaction 2016-10-18 21:53:01 +01:00
Michał Janiszewski cdffaa0712 Fix travis runs of testpaint 
`build.sh` script has `set -e` in the invocation, it fails the script
before we have a chance to inspect exit code of `testpaint`.

This melds checking of exit status into one command, so bash won't fail
it early.
 2016-10-18 22:27:43 +02:00
Yaroslav Tretyakov 82b18ddaf3 Fix #4644: steam particle sprite crash 2016-10-18 20:59:53 +01:00
Ted John 7ca8b3d278 Refactor viewport_paint 2016-10-18 20:59:32 +01:00
zsilencer 541ae91d67 fix pickup commands to work with hiring staff 2016-10-18 13:40:50 -06:00
zsilencer db3aa2b656 Add balloon popping as game command 2016-10-18 13:40:50 -06:00
zsilencer d74efb23fe Add picking up peeps/staff as game command 2016-10-18 13:40:49 -06:00
Marijn van der Werf 0c82651d97 Fix Lay Down RC 2016-10-18 19:37:56 +02:00
Marijn van der Werf 18a2cf1f73 Fix mine train coaster 2016-10-18 19:37:56 +02:00
Marijn van der Werf d678495f8b Fix Flying RC 2016-10-18 19:37:56 +02:00
Marijn van der Werf bd7b2c536e Fix 'left corkscrew up' track 2016-10-18 19:37:56 +02:00
Marijn van der Werf 75ab5548f7 Fix Dinghy Slide 2016-10-18 19:37:56 +02:00
Marijn van der Werf 2666088ce4 Fix station covers 2016-10-18 19:37:56 +02:00
Marijn van der Werf 3dcebfc97f Update TODOs 2016-10-18 19:37:08 +02:00
Alexander Overvoorde 9c52e36332 Fix #4648: Fix title music playing during intro sequence 
The title screen music already started playing during the intro sequence
if it was enabled. This commit changes the behaviour such that the title
music only starts playing once the title screen actually shows up.
 2016-10-18 17:35:51 +01:00
Michael Steenbeek 2efe0a8843 Merge pull request #4642 from HaasJona/toilet 
Reduce toilet volume
 2016-10-18 17:41:41 +02:00
Ted John a9908b80c9 Add debug assistance 2016-10-18 13:35:33 +01:00
Michał Janiszewski ead79360c8 Add architecture info to crash dump file name 2016-10-18 12:25:57 +01:00
OpenRCT2 git bot 3df88895f7 Merge Localisation/master into OpenRCT2/develop. 2016-10-18 04:00:21 +00:00
Ted John d773d14473 Add light instead of lerp 2016-10-17 23:28:02 +01:00
Ted John 8da6654fc6 Mix lights into hw texture 2016-10-17 22:56:08 +01:00
Ted John 1ddb95874a Add lightfx_get_palette 2016-10-17 22:54:25 +01:00
Ted John 6d45c5ac5e Fix footpath lights 2016-10-17 22:51:18 +01:00
Marijn van der Werf a44745e2fa Fix General/SegmentSupportHeightCalls 2016-10-17 23:12:54 +02:00
Marijn van der Werf 4f10555002 Move include to extern C 2016-10-17 21:43:31 +02:00
Jonathan Haas e0a166d3a3 Reduce volume of toilet sound 2016-10-17 21:42:32 +02:00
Michał Janiszewski 262655e2e0 Validate access to functionNames 
# Conflicts:
#	test/testpaint/Printer.cpp
 2016-10-17 21:42:03 +02:00
Ted John c4f67e9d95 Use lightfx palette transform 2016-10-17 20:34:53 +01:00
Marijn van der Werf 871857ee24 Use debug build for Travis testpaint 2016-10-17 21:30:01 +02:00
Marijn van der Werf d7f27cff72 Fix GCC 2016-10-17 21:28:27 +02:00
Marijn van der Werf 8eac13b867 Run testpaint slightly more silent on Travis 2016-10-17 21:13:10 +02:00
Michał Janiszewski 5f422905b6 Allow testpaint's tests to pass a build 
This will not pass a segfault, though.
 2016-10-17 21:12:07 +02:00
Michał Janiszewski a617342519 Make 32 build also do `testpaint` target 2016-10-17 21:12:07 +02:00
Marijn van der Werf c150c968bf Remove `printf` call 2016-10-17 20:04:24 +02:00
Marijn van der Werf a93e12b5d9 Add silent mode 2016-10-17 20:04:13 +02:00
Marijn van der Werf ed9f67cc46 Fix original call 2016-10-17 19:56:26 +02:00
Marijn van der Werf 58e5df75f0 Fix MSVC 2016-10-17 19:16:53 +02:00