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

668 Commits

Author SHA1 Message Date
IntelOrca
e489b999f3 fix picked-up staff and rain drawing 2014-05-28 18:11:33 +01:00
IntelOrca
32cfe28081 Merge branch 'atmaxinger-config-save-ini' 2014-05-28 16:06:13 +01:00
IntelOrca
dee0c6c730 fix warnings 2014-05-28 16:06:04 +01:00
IntelOrca
015b067f7e Merge branch 'config-save-ini' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-config-save-ini 2014-05-28 16:03:42 +01:00
Ted John
d5f9f4d611 Merge pull request #156 from kevinburke/top-toolbar-note
add note about debugging routines
2014-05-28 16:00:36 +01:00
atmaxinger
d8b735a1ef New setting: save_plugin_data 2014-05-28 11:19:49 +02:00
atmaxinger
4ae98b18e6 New setting: show_height_as_units 2014-05-28 11:12:12 +02:00
atmaxinger
098fe08fdf New setting: landscape_smoothing 2014-05-28 10:55:35 +02:00
Kevin Burke
fe9757acff add note about debugging routines 2014-05-28 17:39:58 +09:00
atmaxinger
0e6e11798b New setting: always_show_gridlines. 2014-05-28 10:36:55 +02:00
atmaxinger
c89cd803f6 edge_scrolling and forced_software_buffering can now be edited ingame.
* edge_scrolling
* forced_software_buffering
2014-05-28 09:56:49 +02:00
IntelOrca
d8a61d9792 fix award window bug and clean reset history 2014-05-28 01:50:50 +01:00
IntelOrca
aedc8844d1 Merge branch 'anyc-testing' 2014-05-28 00:06:30 +01:00
IntelOrca
f2be32eadb Merge branch 'testing' of https://github.com/anyc/OpenRCT2 into anyc-testing 2014-05-28 00:06:22 +01:00
IntelOrca
cc85e93e9e add initial s6 structure 2014-05-28 00:05:11 +01:00
anyc
4c9c1fa5bd save_prompt actually opens save dialog 2014-05-27 23:33:16 +02:00
anyc
2d216ff47a better struct packing for MinGW 2014-05-27 23:24:09 +02:00
IntelOrca
65e579045c show full date in bottom right panel 2014-05-27 21:28:16 +01:00
IntelOrca
20a18a8ba3 fix awards window and remove original call 2014-05-27 21:02:20 +01:00
atmaxinger
15e5a8b3cf Initial support for saving settings to config.ini
Supported settings:
* currency
* measurement_format
* temperature_format
* sound_quality
2014-05-27 21:55:53 +02:00
IntelOrca
014a2245f4 remove original call for awards 2014-05-27 20:46:45 +01:00
IntelOrca
4e7ec2feb6 finish award checks 2014-05-27 20:45:40 +01:00
IntelOrca
0fdaa1f3fb Merge branch 'atmaxinger-os-specific' 2014-05-27 19:01:39 +01:00
IntelOrca
1321892024 Merge branch 'os-specific' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-os-specific 2014-05-27 18:59:47 +01:00
IntelOrca
fcb9a407f5 fix peep loop bug 2014-05-27 18:28:24 +01:00
atmaxinger
a0380fc1f8 travis doesn't like capitalized <Windows.h> ... 2014-05-27 19:28:22 +02:00
atmaxinger
66e6dfc3f9 clean up header files, keep windows.h for MAX_PATH 2014-05-27 19:22:06 +02:00
IntelOrca
72b2272b1f apply loop macros and implement more awards 2014-05-27 18:03:25 +01:00
atmaxinger
cdee1dddea replaced WIN32 file i/o in config_save() 2014-05-27 19:00:21 +02:00
atmaxinger
76a7cc98b8 replaced WIN32 file i/o in config_load() 2014-05-27 17:14:27 +02:00
atmaxinger
a70021d53a Add function for checking wether file exists to osinterface, BMP screenshots can now be saved without WIN32 specific methods. 2014-05-27 16:48:15 +02:00
IntelOrca
967af4f032 Merge branch 'awards' 2014-05-27 15:15:11 +01:00
IntelOrca
30e6358fd4 implement more awards WIP 2014-05-27 15:14:45 +01:00
IntelOrca
ebcbc2d2f1 Merge branch 'master' into awards 2014-05-27 14:03:05 +01:00
IntelOrca
e4af287153 Merge branch 'kevinburke-document-2dp' 2014-05-27 14:02:31 +01:00
IntelOrca
88ffb17a4a add initial update awards implementation 2014-05-27 14:00:13 +01:00
Kevin Burke
1df8b061d8 Document RIDE_RATING macro 2014-05-27 20:57:27 +09:00
Kevin Burke
b40d92f359 tweaks 2014-05-27 20:24:25 +09:00
IntelOrca
835835bbec Merge branch 'kevinburke-genericize-build' 2014-05-27 08:47:46 +01:00
Kevin Burke
b036a51cfd Move build instructions from travis into shell scripts
fix syntax

use elif

run it with bash

fix directory incantations

add missing build steps

dont use colors if not terminal

update install.sh

add sanity check

changes

set verbose mode

enable debug output

changes to get it working on mac

Platform specific cmakelists

fix issue with intptr_t not being found/defined

update build scripts

see if it can find the pkg-config

try running it outside of cmake

check whether excho works way we expect

try -e

remove debug info
2014-05-27 12:36:56 +09:00
IntelOrca
6d824fd3a8 fix compile error and add update history placeholder 2014-05-27 00:35:14 +01:00
IntelOrca
a8182b945b improve guest generation with comments 2014-05-27 00:09:33 +01:00
IntelOrca
1b3c46c17d implement park_calculate_guest_generation_probability 2014-05-26 23:44:47 +01:00
IntelOrca
d68cec0172 Merge branch 'anyc-testing' 2014-05-26 21:47:33 +01:00
anyc
fafc8083ac don't show confirmation prompt for loading on title screen, fixes #145 2014-05-26 22:22:25 +02:00
anyc
c07edd0d10 fix warning 2014-05-26 20:20:48 +02:00
IntelOrca
7190e4c3f6 implement object_get_scenario_text 2014-05-26 17:59:42 +01:00
IntelOrca
c783898b36 fix #143, incorrect object entry group addresses 2014-05-26 14:36:07 +01:00
IntelOrca
a22534e099 free path in screenshot.c 2014-05-26 14:14:03 +01:00
IntelOrca
ac2521526b Merge branch 'atmaxinger-master' 2014-05-26 14:13:26 +01:00