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 |
|