mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,428 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

2428 Commits

Author SHA1 Message Date
IntelOrca f6c09b44b6 merge in random map generator 2015-02-10 20:11:59 +00:00
IntelOrca 5b3c1b6764 finalise placing of trees 2015-02-10 19:52:24 +00:00
Ted John c3246fc7a9 Merge pull request #771 from duncanspumpkin/fix_751 
Fix #751
 2015-02-10 19:36:48 +00:00
Duncan Frost 00583d12e6 Fix #751. Main bug caused by doing subtraction before factoring in zoom 2015-02-10 19:13:37 +00:00
IntelOrca 9cc108abbb remove toolbar.c and ignore seperators at the end of the toolbar 2015-02-10 14:41:35 +00:00
Ted John 4b095b65d6 Merge pull request #770 from duncanspumpkin/draw_track_preview 
Draw track preview
 2015-02-09 19:06:48 +00:00
Ted John 6cd0c264b3 Merge pull request #769 from Gymnasiast/patch-2 
Added new strings for units and title screen music
 2015-02-09 19:05:34 +00:00
Duncan Frost b388512c4f Remove hack to pass exapanison check 2015-02-09 19:02:54 +00:00
Michael Steenbeek 9d07a94407 Added new strings for units and title screen music 
Rebase of #767
 2015-02-09 19:56:40 +01:00
Duncan Frost edfbd80747 Added track_data refactored track_place to use track_data 2015-02-09 18:52:01 +00:00
Duncan Frost 5fb09400e7 Fix track name null 2015-02-09 18:52:00 +00:00
Duncan Frost a0775f9ac9 Refactor track_place to use new structs 2015-02-09 18:51:59 +00:00
Duncan Frost bc847628cd Labelled track preview offsets 2015-02-09 18:51:58 +00:00
Duncan Frost 3e047d7c8c Fix track place bug. Add all remaining view directions 2015-02-09 18:51:57 +00:00
Duncan Frost 04e7ff76e4 Added start of actual paint code. Bugs encountered 2015-02-09 18:51:57 +00:00
Duncan Frost 6943c7dce0 Finished sub_6D2189 2015-02-09 18:51:56 +00:00
Duncan Frost df723b871c Added more of 6d2189 2015-02-09 18:51:55 +00:00
Duncan Frost 88a22a9283 started sub_6d2189 2015-02-09 18:51:54 +00:00
Duncan 3eb5350fb1 Added reload map backup. 2015-02-09 18:51:54 +00:00
Duncan Frost aeb3764ab5 Added load track objects 2015-02-09 18:51:53 +00:00
Duncan Frost 7598904073 Added blank_map() 2015-02-09 18:51:52 +00:00
Duncan Frost f8f1019c34 Added backup_map 2015-02-09 18:51:52 +00:00
IntelOrca 9d2abf1925 add map generation window 2015-02-09 18:32:58 +00:00
Ted John 15938d5062 Merge pull request #768 from mrtnptrs/develop 
Update dutch translation according to latest changes
 2015-02-09 16:57:03 +00:00
Maarten Peters 3fc315c3f4 Minor enhancement 2015-02-09 17:38:04 +01:00
Maarten Peters c190269e9c Update dutch translation according to latest changes 2015-02-09 17:34:31 +01:00
IntelOrca 647d9a42a5 Merge branch 'develop' into random-map 
Conflicts:
	projects/openrct2.vcxproj.user
 2015-02-09 14:30:41 +00:00
Ted John 547d67c355 Merge pull request #766 from adrian17/polish-language 
Small progres on Polish translation
 2015-02-09 14:14:25 +00:00
Adrian Wielgosik aee937e9d9 Add new localizable strings to polish.txt 2015-02-09 14:51:29 +01:00
Adrian Wielgosik 769e77d3d5 Some work on Polish language 2015-02-09 14:13:45 +01:00
IntelOrca 7ea809492a allow translation of unit and date strings, closes #307 2015-02-09 12:53:11 +00:00
IntelOrca ee51f31f57 fix station-to-station operating tab error on ride window 2015-02-08 16:50:49 +00:00
IntelOrca 4a9dfcc849 implement scenario_create_ducks 2015-02-08 15:37:33 +00:00
IntelOrca dfc723573c fix expenditure table issues, fixes #762 2015-02-08 14:31:57 +00:00
Ted John 84c655e817 Merge pull request #763 from duncanspumpkin/fix_peep 
Fix peep
 2015-02-08 13:47:25 +00:00
Duncan Frost f7f5ad28f7 Fix bin related peep bugs. Fix original bug that causes bins to never get full. 2015-02-08 11:22:45 +00:00
Duncan Frost 8135cb11dc Fix peeps not using all bins 2015-02-08 10:47:46 +00:00
Duncan Frost c9040106bb Fix peeps not finding seats 2015-02-08 10:26:34 +00:00
IntelOrca 63ad70a0f3 fix errors 2015-02-08 03:19:24 +00:00
IntelOrca 1298031fd2 Merge branch 'develop' into random-map 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	projects/openrct2.vcxproj.user
	src/editor.c
	src/input.c
	src/platform/osinterface.c
	src/rct2.c
	src/scenario.c
	src/world/map.h
 2015-02-08 03:05:07 +00:00
Ted John cc668238b8 Merge pull request #749 from adrian17/top-toolbar-invalidate-refactor 
[suggestion/RFC] Refactor placement of top toolbar widgets
 2015-02-07 23:43:56 +00:00
Adrian Wielgosik 6380ce63d9 Make bottom toolbar panels bigger to hold longer date strings 2015-02-07 23:53:17 +01:00
Adrian Wielgosik c0b2c79aad Add widget ordering in editor top toolbar 2015-02-07 23:50:51 +01:00
Adrian Wielgosik cdc8642709 Add an artificial separator widget 2015-02-07 23:50:51 +01:00
Adrian Wielgosik dc4d14b16b Refactor placement of top toolbar items 2015-02-07 23:50:50 +01:00
Ted John 37675718af Merge pull request #755 from duncanspumpkin/palette 
Added load_palette
 2015-02-07 17:52:44 +00:00
Duncan Frost 0f6dd51736 Added load_palette. Labelled offset for paused and palette effect frame. Fixed fast moving water. 2015-02-07 17:40:20 +00:00
IntelOrca 55dcef13ad ensure only g1.dat exists, also allow title screen scenario to not exist 2015-02-06 23:15:11 +00:00
IntelOrca ce719ef086 fix fullscreen issues and add title music option 2015-02-06 22:35:08 +00:00
Ted John aad90f39ef Merge pull request #719 from IntelOrca/fullscreen-fixes 
Fix fullscreen issues
 2015-02-06 00:19:59 +00:00