IntelOrca
|
fa0e9a1b80
|
Merge branch 'master' into ride-window
|
2014-09-11 18:26:15 +01:00 |
|
hexdec
|
ac7c204284
|
Changed place on WC_MUSIC_CREDITS and WC_PUBLISHER_CREDITS.
|
2014-09-11 18:55:19 +02:00 |
|
hexdec
|
e0cb2e6abf
|
Fixed padding for widgets.
|
2014-09-11 18:50:37 +02:00 |
|
hexdec
|
361e33d3dd
|
Finished decompiling window_music_credits.
|
2014-09-11 18:48:40 +02:00 |
|
hexdec
|
f384b31b65
|
Initial work on music credits.
|
2014-09-11 17:44:23 +02:00 |
|
vahiki
|
c4c74b81d0
|
added swedish to language list
|
2014-09-11 13:05:18 +02:00 |
|
IntelOrca
|
589fc3eaf8
|
finish ride window colour invalidate
|
2014-09-11 00:31:00 +01:00 |
|
IntelOrca
|
9c1689a9ef
|
implement more of ride window colour invalidate
|
2014-09-10 23:05:20 +01:00 |
|
IntelOrca
|
0d8d30f46d
|
Merge branch 'master' into cmdline-scenario
|
2014-09-10 19:36:16 +01:00 |
|
IntelOrca
|
645b8fbb46
|
add edit command line function
|
2014-09-10 19:36:11 +01:00 |
|
IntelOrca
|
b40844c634
|
begin colour tab for ride window
|
2014-09-10 18:13:07 +01:00 |
|
qcz
|
2f2a03fe1f
|
fix crash of scenery window when selecting the first entry of a given type
|
2014-09-09 19:38:19 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
02cacd45c1
|
cmake build
|
2014-09-05 20:35:16 -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
|
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
|
4de8808fdb
|
Merge branch 'master' of https://github.com/vanderkleij/OpenRCT2 into vanderkleij-master
|
2014-09-04 23:17:37 +01:00 |
|