Michał Janiszewski
c26b5ec2b8
Add checks ensuring CI scripts only run on CI
2016-10-21 17:08:16 +02:00
Ted John
2aac1dd4e3
Merge pull request #4620 from marijnvdwerf/clean/testpaint-1
...
Start cleanup of testpaint
2016-10-21 08:50:07 +01:00
OpenRCT2 git bot
f241ae2181
Merge Localisation/master into OpenRCT2/develop.
2016-10-21 04:00:17 +00:00
Ted John
aeb6d40703
Change Windows x64 output name to openrct2.exe
2016-10-20 22:45:22 +01:00
duncanspumpkin
8187b4a4d1
Remove setenv.ps1 file no longer used. Fixes #4657 .
...
This file has been broken for some time since the msbuild version was introduced.
2016-10-20 17:50:15 +01:00
Duncan
81bb6cb950
Merge pull request #4649 from zsilencer/multiplayer
...
Guest+staff pickup and balloon pop commands
2016-10-20 12:46:27 +01:00
Duncan
a572ecf477
Merge pull request #4576 from zaxcav/fixPathFind
...
Pathfinding checks all map elements on each tile.
2016-10-20 12:42:48 +01:00
Duncan
912080c473
Merge pull request #4529 from zaxcav/adjacentStationRatingBonus
...
Check for adjacent station(s) when applying rating bonus.
2016-10-20 12:42:36 +01:00
Duncan
811111b08e
Merge pull request #4585 from zaxcav/fixPeepHappiness
...
Fixes to peep happiness, hunger, thirst, thoughts.
2016-10-20 12:38:15 +01:00
Ted John
12cddd10bd
Merge pull request #4653 from marijnvdwerf/paint/fix-1
...
Various paint fixes
2016-10-20 12:25:14 +01:00
Michał Janiszewski
bcf8d5422c
Make sure to not push pull requests from travis
2016-10-20 11:47:54 +02:00
zaxcav
b85e53e898
Replace hex number with decimal number per PR review comments.
2016-10-20 11:08:14 +02:00
zaxcav
989a8fc4bc
Update comment with new limits of ride satisfaction following commit 7f58c89.
2016-10-20 11:06:56 +02:00
zaxcav
d36c756ee7
Spelling corrections in code comments.
2016-10-20 11:06:56 +02:00
zaxcav
b92cddf536
Bump network version.
2016-10-20 11:03:54 +02:00
zaxcav
68f89c6b07
Comment peep update code related to updating happiness, etc.
2016-10-20 11:03:54 +02:00
zaxcav
6011429630
Fix potential under/over-flow of happiness, hunger, thirst in peep generation.
2016-10-20 10:45:15 +02:00
zaxcav
dfd27efaba
Correct condition on running out of money thought.
2016-10-20 10:45:15 +02:00
Duncan
b0c500e79b
Merge pull request #4655 from duncanspumpkin/satisfaction
...
Re-refactor peep calculate satisfaction
2016-10-20 08:42:15 +01:00
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
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
