mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 15:54:31 +01:00
Code Issues Releases Wiki Activity
11,328 Commits 8 Branches 59 Tags
5b16e0587fccacddb834dcafe277039cf1478788
Commit Graph

11328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IntelOrca
beafbc354c Merge branch 'master' into ride-window 
Conflicts:
	src/string_ids.h
 2014-09-09 00:11:03 +01:00
IntelOrca
31eec46c4d allow scenarios from any location to be started via command line 2014-09-08 19:58:15 +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
Lucas
5faa6b5861 translated up to 2209, all products done 2014-09-07 23:00:14 +02:00
Lucas
1ae29e3220 translated up to 1893 2014-09-07 21:38:09 +02:00
Lucas
5ee4bf7db1 translated up to 1654, all thoughts done 2014-09-07 20:16:30 +02:00
Lucas
842b467a6a translated up to 1530 2014-09-07 19:43:12 +02:00
Lucas
7f1c2f671f translated up to 1414 2014-09-07 17:07:37 +02:00
Lucas
9c0852833d translated up to 1170 2014-09-07 01:29:46 +02:00
Lucas
0af402e045 translated up to 1040 2014-09-07 00:36:59 +02: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
Lucas
c0e062d43e translated up to 1027 and did some minor fixes 2014-09-06 22:39:16 +02:00
Lucas
7f36c2aceb translated up to 953 2014-09-06 22:08:18 +02:00
Lucas
a8f33bfc5c translated 0514-0876 2014-09-06 17:29:44 +02:00
Ted John
4150273851 Merge pull request #409 from qcz/scenery-fixes 
Scenery fixes
 2014-09-06 16:23:35 +01:00
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