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

1762 Commits

Author SHA1 Message Date
Lucas bb111dfb9b translated 0000-0092 2014-09-06 15:24:56 +02:00
Lucas 59b2057631 added swedish language file using US english as a base 2014-09-06 15:24:03 +02: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
zsilencer 0c7f22f52a Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 2014-09-05 20:36:31 -06:00
zsilencer 02cacd45c1 cmake build 2014-09-05 20:35:16 -06:00
zsilencer 3a4c4938a9 cmake build 2014-09-05 19:56:42 -06:00
zsilencer 04a2d27c9a Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-09-05 19:36:38 -06:00
zsilencer bf805057f2 A new custom software mixer, supports playing streams at any rate, which is needed to emulate the directsound SetFrequency effects (when a ride malfunctions and the music slows down and stops). The speex resampler is added for this. Currently samples can be played and their volumes and looping set on an arbitrary number of channels. Support for FLAC and other streaming formats can be added. 2014-09-05 19:29:22 -06: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
qcz a172d5a5d5 decompile window_scenery_update_scroll, some fixes 2014-09-03 22:13:19 +02:00