mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,761 Commits 9 Branches 41 Tags 392 MiB
Commit Graph

85 Commits

Author SHA1 Message Date
IntelOrca f78b7a4c74 Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-09-19 19:58:09 +01:00
IntelOrca 3430e4da6f add swedish.txt to VS filters 2014-09-17 23:21:51 +01:00
zsilencer 298de189f5 0x006BBC6B, hook 2014-09-15 15:12:25 -06:00
zsilencer 48b13231b9 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	projects/openrct2.vcxproj.filters
	src/window_scenery.c
 2014-09-13 11:55:32 -06:00
hexdec f384b31b65 Initial work on music credits. 2014-09-11 17:44:23 +02:00
qcz 7939112adc replace RCT2_GLOBAL calls with macros where possible 2014-09-06 13:31:33 +02: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
qcz a172d5a5d5 decompile window_scenery_update_scroll, some fixes 2014-09-03 22:13:19 +02:00
qcz 2eef202628 Merge remote-tracking branch 'upstream/master' into scenery-window 
Resolve conflict in projects/openrct2.vcxproj.filters
 2014-08-27 18:21:11 +02:00
IntelOrca d3055fd3ef add and start implementing ride window 2014-08-25 15:04:28 +01:00
IntelOrca 83ba89214c move input functions to input code file 2014-08-24 18:45:47 +01:00
qcz 168537d338 Add window_scenery.c, start working on scenery window 2014-08-21 21:53:17 +02:00
Ted John 0969c0bcff Merge pull request #341 from qcz/hire-staff-command 
Decompile the hire staff game command
 2014-08-20 23:44:40 +01:00
qcz fa6caa856a Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
IntelOrca 6ab6c5d9a6 add spanish language entry, #338 2014-08-20 20:32:25 +01:00
qcz 9a4fd48d97 Add hungarian and polish language files to the solution 2014-08-19 22:23:54 +02:00
Duncan Frost b0d39bbf0e Added sepearte file for staff_peep_window 2014-08-17 11:45:43 +01:00
IntelOrca 62a24e5383 add research window 
As seen from RollerCoaster Tycoon 1. This allows the player to change the priorities in a "no money" park. I find it also more logical than the two research panels being separated in finances and new ride windows.
 2014-08-15 22:05:35 +01:00
Duncan Frost e418b926a5 Add new language files to vs project 2014-08-15 13:45:12 +01:00
IntelOrca e66b686f75 add ability to change language 2014-08-14 23:46:36 +01:00
IntelOrca 4f5b905760 implement finances graph tabs and marketing 2014-08-11 01:09:17 +01:00
IntelOrca 1169329b09 refactor graph drawing and add finances cash graph tab 2014-08-10 18:12:07 +01:00
IntelOrca 13d95ded35 prepare for loading a language file 2014-08-07 23:20:58 +01:00
Duncan Frost 89ba3d1faf Add sdl cursors 2014-07-28 17:45:47 +01:00
ZedThree ebe6c95a88 Add localised currency string formatting - fixes #222 2014-07-26 22:08:19 +02:00
Duncan Frost eec5f80bfc Added window_peep. Widget array not finished 2014-06-28 21:34:53 +01:00
IntelOrca 30e6358fd4 implement more awards WIP 2014-05-27 15:14:45 +01:00
IntelOrca bfc35511f2 Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master 2014-05-25 23:18:47 +01:00
IntelOrca 092764ea6b separate marketing and add finances window 2014-05-25 23:17:55 +01:00
adrian17 c3a5ce2c7c Remove settings.h from project 2014-05-25 21:51:00 +02:00
IntelOrca 5b568f376c add peep_applause 2014-05-25 19:47:11 +01:00
IntelOrca 275f66d287 add vehicle_update_all 2014-05-25 18:40:11 +01:00
IntelOrca 99ca1c2b90 Merge branch 'crooked-house-excitement' of https://github.com/kevinburke/OpenRCT2 into kevinburke-crooked-house-excitement 2014-05-24 14:21:08 +01:00
IntelOrca 36e2cce045 add object list load 2014-05-24 01:34:17 +01:00
IntelOrca 075e0619c1 fix filters 2014-05-24 00:00:07 +01:00
IntelOrca 98b01edaaa clean up scenario list 2014-05-23 23:52:13 +01:00
Kevin Burke a35fc6bdef add new files to sln 2014-05-23 21:18:45 +09:00
Kevin Burke eccb4af048 Add new files to vcxproj, vcxproj +filters 2014-05-23 07:45:19 +09:00
anyc 82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
ddevrien c069d0fa50 Started work on map window 2014-05-14 12:43:14 +02:00
IntelOrca 8dcca91092 mass clean up and reduce warnings 2014-05-12 01:45:45 +01:00
ddevrien b39cf4d1af Started work on options window 2014-05-11 09:01:01 +02:00
Maciek Baron d3382e3a38 Renaming ride construction content 2014-05-09 23:43:10 +01:00
ddevrien 6ddeb610f0 Some additions to window_banner 2014-05-09 20:59:41 +02:00
ddevrien 6eb635fd2b master project files 2014-05-09 10:15:10 +02:00
ddevrien e6e3fce74d Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
 2014-05-09 10:12:05 +02:00
ddevrien 1eda151c70 Added basic code for banner window 2014-05-09 10:04:40 +02:00
Maciek Baron 0c34c3791c Cleaning up files and code related to windows 2014-05-08 21:48:31 +01:00
lnz 589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00
IntelOrca a35a9f29a4 add guest list window 2014-05-05 03:27:17 +01:00