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

1613 Commits

Author SHA1 Message Date
IntelOrca 508ce63c75 finish operating tab on ride window 2014-09-09 17:17:08 +01:00
IntelOrca a132b52766 finish invalidate event for ride window 2014-09-09 14:16:09 +01:00
IntelOrca fcc847beb4 start implementing operating tab on ride window 2014-09-09 01:12:32 +01:00
IntelOrca beafbc354c Merge branch 'master' into ride-window 
Conflicts:
	src/string_ids.h
 2014-09-09 00:11:03 +01:00
Ted John df107d3db4 Merge pull request #404 from vanderkleij/master 
Decompilation of move_sprite_to_list (0x0069ED0B)
 2014-09-08 19:38:04 +01:00
IntelOrca 8f586ae245 add msbuild script launch for windows 2014-09-07 23:15:31 +01:00
Tom van der Kleij 7058756d9c Incorporated suggested change by @qcz and fixed an enum member name and a compiler warning 2014-09-06 23:46:45 +02:00
Ted John 4150273851 Merge pull request #409 from qcz/scenery-fixes 
Scenery fixes
 2014-09-06 16:23:35 +01:00
qcz 7939112adc replace RCT2_GLOBAL calls with macros where possible 2014-09-06 13:31:33 +02:00
qcz 36d2c47706 fix scenery cursor bug, get rid of multiple unneccessary returns 2014-09-06 12:52:30 +02:00
qcz 288afe14b8 fix scenery window not closing after switching to a different tool, clarify name of the helper function 2014-09-06 12:45:00 +02:00
Ted John 5cf93db4a4 Merge pull request #407 from qcz/fix-double-payment 
Fix double payment in game_do_command
 2014-09-06 08:52:18 +01:00
Tom van der Kleij 212849ec6c Merge remote-tracking branch 'upstream/master' 2014-09-06 09:48:54 +02:00
qcz 5be600cf5b Fix double payment in game_do_command 2014-09-06 09:45:23 +02:00
Tom van der Kleij 87667b78d4 Implemented suggestions from comments on pull request 2014-09-06 09:11:04 +02:00
IntelOrca bc616af7de Merge branch 'qcz-scenery-window' 2014-09-06 01:07:41 +01:00
IntelOrca b4c7723368 fix warnings in window_scenery.c 2014-09-06 01:06:31 +01:00
IntelOrca 13fd5de6ce finish implementing income tab on ride window apart from command events 2014-09-06 00:58:02 +01:00
qcz a70df144ed Merge remote-tracking branch 'upstream/master' into scenery-window 2014-09-06 01:10:06 +02:00
qcz 7b2b9e5859 Finalize scenery window, fix encoding 2014-09-06 01:09:12 +02:00
IntelOrca 651a5a35ea Merge branch 'master' into ride-window 2014-09-05 23:47:19 +01:00
IntelOrca 6b3c39655f fixes #279, WWT_24 no longer shows a checkbox 2014-09-05 23:46:35 +01:00
IntelOrca abdfa95b24 implement most of income tab for ride window 2014-09-05 23:44:02 +01:00
qcz 6abc2327af added constants for frequently used variables, renamed register named variables where the purpose is known 2014-09-06 00:30:08 +02:00
Tom van der Kleij 9de2520a8a Fixing some travis compilation errors due to compiler used there being more strict than visual studio 2013 2014-09-05 23:47:18 +02:00
qcz 01986241de use local variable for scenery tab entries instead of the old location 2014-09-05 23:40:42 +02:00
Tom van der Kleij 185d64e157 Decompilation of move_sprite_to_list (0x0069ED0B) 2014-09-05 23:35:59 +02:00
qcz d4201a7eb7 add rct_scenery_set_entry struct, use it everywhere where referenced, continue to unify code in scenery window 2014-09-05 23:08:51 +02:00
qcz 90b0ec02b3 fix tab ordering, add pressed state for cluster button 2014-09-05 21:32:08 +02:00
IntelOrca 5c1b8a7c3c fix various bugs with ride window 2014-09-05 19:33:51 +01:00
IntelOrca caa7a50ec2 implement measurements tab on ride window 2014-09-05 18:10:30 +01:00
IntelOrca 4d5dd76713 refactor and implement locate mechanic for ride window 2014-09-05 14:24:54 +01:00
IntelOrca 9fe7f7ab2c implement maintenance tab on ride window 2014-09-05 02:37:48 +01:00
IntelOrca f7a5e82ebb Merge branch 'master' into ride-window 2014-09-04 23:27:29 +01:00
IntelOrca 2bb4274f05 fix warnings 2014-09-04 23:27:16 +01:00
IntelOrca 914ff60680 Merge branch 'master' into ride-window 2014-09-04 23:23:55 +01:00
Ted John b284077b73 Merge pull request #401 from adrian17/window_rotate_camera 
Window rotate camera
 2014-09-04 23:23:35 +01:00
IntelOrca 77d0ab9b0e Merge branch 'vanderkleij-master' 2014-09-04 23:19:41 +01:00
IntelOrca 4de8808fdb Merge branch 'master' of https://github.com/vanderkleij/OpenRCT2 into vanderkleij-master 2014-09-04 23:17:37 +01:00
Tom van der Kleij c9f081e5d2 Renamed peep_create --> create_sprite + minor changes from feedback 2014-09-04 23:22:06 +02:00
adrian17 7359134fc5 Fix off-by-one error in center_2d_coordinates 2014-09-04 22:53:54 +02:00
adrian17 657621db20 Decompile window_rotate_camera, change sub_689174 to use z parameter 2014-09-04 22:53:40 +02:00
qcz 9b39a211e4 remove debug printf 2014-09-04 22:38:38 +02:00
qcz f6da2edc1c fix most of the bugs, rename widget ids 2014-09-04 22:37:03 +02:00
Tom van der Kleij 10ab0030ae Decompiled peep_create (0x0069EC6B) 2014-09-04 22:10:53 +02:00
IntelOrca 490027a2a8 implement customer tab on ride window 2014-09-04 19:59:42 +01:00
IntelOrca 722976e237 implement music tab for ride window 2014-09-04 15:42:36 +01:00
IntelOrca ae9b91d859 implement tab images 2014-09-03 23:19:13 +01:00
IntelOrca e452ed00fa Merge branch 'master' into ride-window 2014-09-03 23:18:53 +01:00
IntelOrca f639fd6054 refactor ride structure 2014-09-03 23:17:31 +01:00