1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Commit Graph

7399 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
5b9f7904ea Update dependencies for Windows and remove certificates 2016-10-16 16:11:33 +01:00
Michał Janiszewski
2e4a5cd441 Fix mingw builds 2016-10-16 00:24:12 +02:00
Ted John
f519bc6cad Fix bugs 2016-10-15 21:50:52 +01:00
Michał Janiszewski
00c47b8a04 Fix clang builds
Redeclaring the same typedef is not legal in C < 11, but a
forward-declaration works just fine for having a pointer to struct. No
changes needed in .cpp, as it includes the `typedef` from `object.h`
(via `scenario.h`).
2016-10-15 21:50:52 +01:00
LRFLEW
f776527a2b Fix Warnings in Xcode 2016-10-15 21:50:52 +01:00
Ted John
babf261542 Refactor scenario list to C++ 2016-10-15 21:50:52 +01:00
Ted John
b7f7af3123 Refactor scenario sources to C++ 2016-10-15 21:50:52 +01:00
Ted John
15b653e233 Fix track place colours for TD4, version 0 2016-10-15 21:25:29 +01:00
Ted John
de341f1d86 Fix td6_reset_trailing_elements
Only one byte, 0xFF terminates the track elements rather than a track element with a type of 0xFF.
2016-10-15 20:57:29 +01:00
Ted John
5708b2e749 Fix colours for TD4, version 0 designs 2016-10-15 18:56:51 +01:00
Ted John
e1a5200332 Fix TD4, version 0 river rapids 2016-10-15 18:56:51 +01:00
Ted John
af05688764 Fix TD4 version 0 mazes 2016-10-15 18:56:51 +01:00
Ted John
6316d9eb20 Use RCT1 table method for converting ride type 2016-10-15 18:56:51 +01:00
Ted John
951bfaa081 Fix reading of TD4 / TD6 version 2016-10-15 18:56:51 +01:00
Ted John
4e0298e8de Fix TD4 to TD6 issues 2016-10-15 18:56:51 +01:00
Ted John
bcd3384f49 Fix TD4 to TD6 issues 2016-10-15 18:56:51 +01:00
Ted John
98c71dcf5b Fix TD4 loading / memory violation
Instead of doing these hacks to load bits of TD4 into a TD6, load TD4 data directly into its own struct and then copy field by field to TD6. Simplify TD6 loading.
2016-10-15 18:56:51 +01:00
Marijn van der Werf
c063c4dccf Initialize variable for gcc 2016-10-15 19:26:43 +02:00
Marijn van der Werf
40dbb9db1f Fix typo in filename 2016-10-15 19:23:13 +02:00
Marijn van der Werf
b0c98588a5 Removes unused variables 2016-10-15 14:14:32 +02:00
Marijn van der Werf
0fc10f22a1 Fix right eight to diag 2016-10-15 13:53:10 +02:00