duncanspumpkin
2bd6dac20f
Merge branch 'develop' into vehicle-update
...
Conflicts:
openrct2.vcxproj
2016-01-10 08:57:41 +00:00
IntelOrca
df279b178b
clean up VS solution and project
2016-01-09 21:50:04 +00:00
IntelOrca
00f0f06e83
update VS project to use new dependencies
2016-01-09 21:50:03 +00:00
duncanspumpkin
268e2d34ce
Merge branch 'develop' into vehicle-update
...
Conflicts:
object.c
2016-01-09 16:51:23 +00:00
IntelOrca
15bc414581
add stopwatch class for profiling
2016-01-08 20:50:23 +00:00
Michał Janiszewski
133096cd64
Merge branch 'develop' into vehicle-update
2016-01-05 09:59:53 +01:00
IntelOrca
0c933234e0
remove all tutorial code
2016-01-04 23:21:23 +00:00
IntelOrca
af67cf5703
refactor scenario sources and improve scenario select window
2016-01-02 21:04:44 +00:00
IntelOrca
6a768c4a3c
redo entire scenario highscore load / saving
...
- load and save highscores to new file format (highscores.dat)
- scan scenarios from RCT2 data and user data
- load highscores from legacy file (scores.dat)
- fix various issues with new scenario select window
2016-01-02 21:04:10 +00:00
Michał Janiszewski
5f66cd48f8
Merge branch 'develop' into vehicle-update
...
Conflicts:
openrct2.vcxproj.filters
2015-12-31 11:41:23 +01:00
IntelOrca
00e5c4418d
refactor image IO to new source file
2015-12-30 13:36:09 +00:00
IntelOrca
652e9f6829
update VS project and filters
2015-12-30 13:20:28 +00:00
Michał Janiszewski
4c6ee9570c
Merge branch 'develop' into vehicle-update
...
Conflicts:
openrct2.vcxproj.filters
2015-12-27 18:11:13 +01:00
IntelOrca
cd99b87de6
add UI for notification settings
2015-12-26 17:30:13 +00:00
Michał Janiszewski
cd2ec16290
Merge branch 'develop' into vehicle-update
...
Conflicts:
openrct2.vcxproj.filters
projects/openrct2.vcxproj
2015-12-23 19:47:16 +01:00
IntelOrca
cb5dab3e57
move projects and add environment setup script
2015-12-22 21:31:26 +00:00