Duncan Frost
07e5b58982
Merge to gfx_unstable
2014-05-27 22:37:16 +01:00
anyc
4c9c1fa5bd
save_prompt actually opens save dialog
2014-05-27 23:33:16 +02:00
IntelOrca
74f5db4ebd
Merge branch 'master' into gfx_unstable
2014-05-27 22:28:45 +01:00
anyc
2d216ff47a
better struct packing for MinGW
2014-05-27 23:24:09 +02:00
Duncan Frost
ba9d33de10
Merge
2014-05-27 22:22:57 +01:00
Duncan Frost
a3b33c4656
Split draw_string in two for draw_sprite and others to jump in. Started decoding top and trousers code.
2014-05-27 22:20:00 +01: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
Duncan
1aa7e33aae
Added notes about splitting gfx_draw_sprite
2014-05-27 16:35:11 +01: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
Duncan Frost
b8887876ea
Cleaned up more asm code
2014-05-26 22:28:26 +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
lnz
ee67b3b703
More critical bugfixes for the reachability code.
2014-05-26 18:19:34 +02:00
lnz
4993e6bed0
Fix lots of disgusting bugs
2014-05-26 17:39:18 +02:00
IntelOrca
c783898b36
fix #143 , incorrect object entry group addresses
2014-05-26 14:36:07 +01:00
lnz
8bdba74ba6
Cleanup and refactoring of ride reachability stuff
2014-05-26 15:22:52 +02: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
IntelOrca
70d3d652c5
add saving of screenshots in subfolder
2014-05-26 14:12:43 +01:00
IntelOrca
17a567292d
Merge branch 'master' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-master
2014-05-26 13:54:58 +01:00
IntelOrca
c2d5ec4381
fix #146 , broken ride structure
2014-05-26 13:50:37 +01:00
atmaxinger
16c0bde2f4
Check if path could be allocated, initialize it with an empty string.
2014-05-26 09:34:14 +02:00
atmaxinger
35ff9a510d
Fixed returning pointer from a local buffer
2014-05-26 09:27:54 +02:00
IntelOrca
ab697f8f93
add more to finances window
2014-05-26 01:29:59 +01:00