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
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
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
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
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
Jonathan Haas
e0a166d3a3
Reduce volume of toilet sound
2016-10-17 21:42:32 +02:00
Ted John
2bf4ded732
Merge pull request #4638 from OpenRCT2/janisozaur-mingw-test
...
Configure MinGW to consume Vista+ APIs
2016-10-17 12:10:59 +01:00
Michael Steenbeek
a6c95d8691
Merge pull request #4639 from Broxzier/patch-1
...
Fixes typo
2016-10-17 12:44:05 +02:00
Hielke Morsink
394e30633e
Fixes typo
...
`Currupt` to `Corrupt`
2016-10-17 12:41:16 +02:00
Michał Janiszewski
46021ed2bf
Fix self-assignment in ScenarioRepository
2016-10-17 11:59:10 +02:00
Michał Janiszewski
7f5b70ea78
Move WINVER definition before including common.h
2016-10-17 09:52:26 +02:00
Michał Janiszewski
33c3432556
Update MinGW to use APIs from WINVER 0x0600
2016-10-17 09:46:08 +02:00
Ted John
d405e32c48
Merge pull request #4635 from LRFLEW/macos64
...
Update Xcode Project to build x64 macOS Builds
2016-10-17 07:59:08 +01:00
LRFLEW
0afc593fd3
Update Xcode Project to build x64 macOS Builds
2016-10-16 17:10:48 -05:00
Ted John
dd3db116f7
Merge pull request #4606 from IntelOrca/refactor/scenario-sources
...
Refactor scenario sources and scenario list to C++
2016-10-16 22:27:34 +01:00
Hielke Morsink
8434258a62
Tile inspector fixes
...
1. Collision typo (sxtra s)
2. Selection area from previous window session was being used
3. Add label and value for base height spinner for entrances
2016-10-16 21:56:44 +01:00
Hielke Morsink
da9fbf0562
Highlight all selected tiles for cluster tool
2016-10-16 21:19:05 +01:00
Ted John
00e907d007
Merge pull request #4414 from Broxzier/extended_tile_inspector
...
Extended tile inspector
2016-10-16 21:12:21 +01:00
Ted John
0c20b547f4
Fix #4625 : Guest/peep hover text not rendered on x64 build
...
A recent regression where inline string sprites were changed to be treated as intptr rather than uint32.
2016-10-16 20:26:02 +01:00
Ted John
b6a0890d97
Add string format debugging assistance
2016-10-16 20:24:32 +01:00
Ted John
f680f84523
Update openrct2.sln
...
VS keeps making this change, we will just have to let it be and not have x64 default platform.
2016-10-16 20:22:46 +01:00
Ted John
5b9f7904ea
Update dependencies for Windows and remove certificates
2016-10-16 16:11:33 +01:00
Ted John
9635fbaa77
Update openrct2.vcxproj.user
2016-10-16 11:07:39 +01:00
Ted John
70c26b470b
Merge pull request #4624 from IntelOrca/build/win32-no-rct2
...
Deliver no RCT2 builds for Win32
2016-10-16 00:32:54 +01:00
Ted John
a3df31a533
Enable high DPI for Win32 release builds
2016-10-16 00:08:13 +01:00
Ted John
fb112ce779
Do not distribute openrct2.dll anymore
2016-10-16 00:06:58 +01:00
Ted John
f051430ea3
Make release Win32 builds NO_RCT2 and Win32 sub system
2016-10-15 23:39:50 +01:00
Michał Janiszewski
f87e60dbd4
Merge pull request #4622 from janisozaur/new-jobs
...
New Travis-CI jobs
2016-10-16 00:34:04 +02:00
Michał Janiszewski
9e229bcd45
Re-order Travis-CI jobs to improve concurrency
2016-10-16 00:24:12 +02:00
Michał Janiszewski
f76c7d794c
Make DISABLE_RCT2 imply FORCE32
2016-10-16 00:24:12 +02:00
Michał Janiszewski
2e4a5cd441
Fix mingw builds
2016-10-16 00:24:12 +02:00
Michał Janiszewski
17ab7a4879
Build 32 bit builds with mingw
...
Mostly because I don't want to update all the libs right now
2016-10-16 00:24:12 +02:00
Michał Janiszewski
8266c08215
Add docker64 entry to travis scripts
2016-10-16 00:24:11 +02:00
