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

1445 Commits

Author SHA1 Message Date
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
Ted John cc097e3cc5 Merge pull request #375 from zsilencer/master 
dsound
 2014-08-27 07:48:50 +01:00
zsilencer 6250331bd0 compile test 2014-08-26 21:48:47 -06:00
zsilencer fba1a81e07 audio_remove_timer, audio_create_timer, map_file, audio_timer_callback 2014-08-26 20:23:32 -06:00
zsilencer 08ab2cdfe8 some directsound decompilation 2014-08-26 16:34:34 -06:00
Ted John 0499879c9a Merge pull request #370 from zsilencer/master 
sound_fill_buffer, sound_prepare
 2014-08-26 07:30:39 +01:00
zsilencer f6fde582bf audio work 2014-08-25 23:11:57 -06:00
zsilencer 44217734d0 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-25 19:57:02 -06:00
zsilencer 5fe03d9929 sound_fill_buffer, sound_prepare 2014-08-25 19:56:20 -06:00
Ted John 386e9c906f Merge pull request #368 from adrian17/message-day-fix 
Fix #305, the day value wasn't increased by 1 as it should be
 2014-08-25 23:23:19 +01:00
adrian17 f14a9411c4 Fix #305, the day value wasn't increased by 1 as it should be 2014-08-25 23:51:05 +02:00
Ted John 4ddb26fc21 Merge pull request #364 from zsilencer/master 
Additional sound decompilation and fixes
 2014-08-25 19:14:45 +01:00
zsilencer 9cb6b2ada5 compile fix 2014-08-25 11:39:01 -06:00
IntelOrca 449f5afe50 stop working directory from changing on load and save 2014-08-25 15:46:11 +01:00
Ted John a096fda3c1 Merge pull request #367 from xzbobzx/patch-2 
Done the dutch tutorial. Dutch is almost finished.
 2014-08-25 15:34:03 +01:00
xzbobzx 212756e31c Done the dutch tutorial. Dutch is almost finished. 
There are a few spare phrases laying around here and there that need translating, and I wouldn't count on my spelling to be 100% perfect.

We'll also need someone to check for consistency in the naming of things.

Other than that, this language is ready to ship.
 2014-08-25 16:27:06 +02:00
IntelOrca d3055fd3ef add and start implementing ride window 2014-08-25 15:04:28 +01:00
Ted John fd7eb4c107 Merge pull request #366 from xzbobzx/patch-1 
Did some more work
 2014-08-25 13:48:06 +01:00
xzbobzx f8a696d7b9 Did some more work 
The tutorials (is there a name in Dutch for tutorial, btw?) still have to be done, and there's a few phrases missing here and there, but otherwise it's coming together nicely.
 2014-08-25 14:43:58 +02:00
Ted John 6614483ba7 Merge pull request #365 from jcdavis/master 
First pass at 0x00406C96
 2014-08-25 13:11:13 +01:00
Ted John 6a2bbcc5cf Merge pull request #363 from marcotc/rain 
Created named address RCT2_ADDRESS_SCENARIO_TICKS
 2014-08-25 11:52:21 +01:00
Jackson Davis cbb617c56f First pass at 0x00406C96 2014-08-25 12:15:29 +07:00
zsilencer de918219b0 -march=pentium 2014-08-24 22:51:17 -06:00
zsilencer 7f5b501808 travis 2014-08-24 22:39:37 -06:00
zsilencer 799797876a Audio fixes #361 #355 2014-08-24 22:18:01 -06:00
Marco Costa b3e1da78a4 Update gfx_draw_rain declaration to match definition 2014-08-24 21:33:09 -04:00
Marco Costa bb81bfd5d0 Created named address RCT2_ADDRESS_SCENARIO_TICKS 
* 0x00F663AC is now named RCT2_ADDRESS_SCENARIO_TICKS. This variable
starts at an arbitrary value, defined by the current scenario, and
increments by 1 on every game tick.
* Also, added meaningful name to some variables in draw_light_rain and
draw_heavy_rain.
 2014-08-24 21:27:56 -04:00
Ted John 841f9bd390 Merge pull request #362 from xzbobzx/patch-1 
Updated lots of ride descriptions and other things
 2014-08-25 01:42:01 +01:00
xzbobzx c7997d0780 Updated lots of ride descriptions and other things 
'air time' is now 'hang tijd', we might just want to keep calling it 'air time', I'm not certain.

Changed autorondrit to rit in een karretje, which is what I remembered it as from my youth. Smalspoorweg also got changed to miniatuur spoorbaan, as most theme parks would refer to them as such.

Renamed the Heartline-twisteractbaan to Heartline-kurkentrekkerachtbaan. Twister = kurkentrekker.

Stoelrot. changed to Stoeldraaing (I'm not sure if it fits, otherwise revert to Stoelrot.)

Also changed a whole bunch of other things down the road. This is fun!
 2014-08-25 02:01:04 +02:00
IntelOrca 16b552270b add rct_ride_type structure 2014-08-24 23:02:19 +01:00
zsilencer 178a2fe3d0 Merge remote-tracking branch 'remotes/remote/master' 2014-08-24 14:50:11 -06:00
zsilencer 362082980f Audio things 2014-08-24 14:30:48 -06:00
IntelOrca 83ba89214c move input functions to input code file 2014-08-24 18:45:47 +01:00
IntelOrca 425881b8b1 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git 2014-08-24 17:52:21 +01:00
IntelOrca 02293c46a8 fixes #357, glitchy viewport dragging 2014-08-24 17:52:17 +01:00
Ted John 46ad6732c7 Merge pull request #359 from duncanspumpkin/investigate_viewport 
viewport update position
 2014-08-24 17:51:41 +01:00
Duncan Frost f94ebfc4e5 Tidied up 689174. Fixed remaining small map bugs 2014-08-24 17:39:36 +01:00
Duncan Frost 3b2fa2ddce Trying to find cause of subtle bug 2014-08-24 17:39:35 +01:00
Duncan Frost d095dce810 Finished viewport_update_position. 2014-08-24 17:39:34 +01:00
Duncan Frost 330fa2326c Fix bugs with viewport 2014-08-24 17:39:33 +01:00
Duncan Frost 169a69cfec First draft of viewport_update. 
Not working
 2014-08-24 17:39:33 +01:00
Duncan Frost 2d2ff0dead Started reverse of viewport_update_position 2014-08-24 17:39:32 +01:00
Ted John 85d8f26d89 Merge pull request #358 from Balletie/master 
Fix for blank screen at startup. (fixes #350)
 2014-08-24 17:36:20 +01:00
Balletie 271290c308 Make toolchain compatible for both OSX and Linux 2014-08-24 16:40:57 +02:00
Balletie d5c19fa56e Clean the code up (indentation) 2014-08-24 13:15:56 +02:00
Balletie 0a37d51b4e Set the correct permissions after extracting. 2014-08-24 13:15:56 +02:00
Balletie 0986ed6eb0 mkdir if it isn't present 2014-08-24 13:15:56 +02:00
Balletie dc9a3d361f Extract to subdirectory... 2014-08-24 13:15:56 +02:00
Balletie 22f090a688 Extract with root privileges 2014-08-24 13:15:56 +02:00
Balletie fd1943d3cb install.sh: Download mingw from sourceforge. 
It will automatically extract to /usr/local/
 2014-08-24 13:15:56 +02:00