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
vahiki
81ba275826
Merge branch 'master' into swedish-translation
2014-09-12 07:34:30 +02:00
hexdec
f384b31b65
Initial work on music credits.
2014-09-11 17:44:23 +02:00
vahiki
d76219583a
added swedish to visual studio project file
2014-09-11 13:07:55 +02:00
qcz
7939112adc
replace RCT2_GLOBAL calls with macros where possible
2014-09-06 13:31:33 +02: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
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
zsilencer
08ab2cdfe8
some directsound decompilation
2014-08-26 16:34:34 -06: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
Duncan Frost
3b7ffe8b4a
Decompiled view_menu dropdown. Fixed issue when no item selected. Added a post build event to copy langauge file.
2014-08-10 09:34:27 +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
Duncan Frost
dc3804bfa2
Fixes one of the issues of #121 but 526 cannot be easily fixed
2014-05-23 11:28:35 +01: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
IntelOrca
00cd901441
add news window
2014-05-04 14:10:32 +01:00
IntelOrca
9f71cea261
update project file for settings merge
2014-05-03 13:18:56 +01:00
IntelOrca
b9925cd5a0
Merge branch 'master' into path-window
2014-05-02 22:36:04 +01:00
IntelOrca
af5ef5e75d
add game_load_or_quit function
2014-05-02 22:21:08 +01:00
IntelOrca
d49cd5648d
Merge branch 'master' into path-window
2014-05-02 02:14:39 +01:00
atmaxinger
f305a518b2
Changed screenshot format from BMP to PNG (using LodePNG)
...
NOTE: The little popup window ("Screenshot saved to disk as") still
displays a BMP filename, but it saves a PNG file to disk.
2014-05-01 19:10:07 +02:00
IntelOrca
1246a14fe3
add footpath window
2014-04-28 17:35:12 +01:00
IntelOrca
8b7a940aa4
add about window
2014-04-28 02:35:37 +01:00
IntelOrca
2afb4e12eb
add screenshot and error window base functions
2014-04-25 18:25:34 +01:00
IntelOrca
ea4ea99212
add more input logic and tooltip window
2014-04-24 18:53:42 +01:00
IntelOrca
75dc8243c4
add track definitions
2014-04-23 01:50:40 +01:00
IntelOrca
6b0ba5c6d0
add ride list window
2014-04-19 03:16:20 +01:00
IntelOrca
cfd9467e30
add clear scenery window
2014-04-18 19:51:18 +01:00
IntelOrca
eba4b6da9d
add other pages to park window
2014-04-16 02:05:49 +01:00
IntelOrca
03db7f5bc0
anchor bottom toolbar to window width
2014-04-15 02:36:58 +01:00
IntelOrca
98aab20369
add cheat window and compile manual
2014-04-15 00:50:20 +01:00
IntelOrca
3f59b7ad9e
add park objective window
2014-04-14 21:25:20 +01:00
IntelOrca
b5b23cb91b
add water and input logic
2014-04-14 03:09:51 +01:00
IntelOrca
b98ca0e45b
add land window
2014-04-13 22:23:56 +01:00
IntelOrca
5cb1600417
add bottom toolbar
2014-04-11 03:58:17 +01:00
IntelOrca
ceb8f8113a
add top toolbar and ride types
2014-04-11 02:42:39 +01:00
IntelOrca
32dec4ab52
add some object loading
2014-04-10 17:08:41 +01:00
IntelOrca
3ae8971340
add scenario / saved game decoding
2014-04-10 00:22:57 +01:00
IntelOrca
0402ffe6fc
add title menu and dropdown
2014-04-09 14:43:27 +01:00
IntelOrca
c8d2b0bf1e
add climate and date
2014-04-09 11:16:35 +01:00
IntelOrca
535e62f3aa
add map initialisation
2014-04-09 03:09:30 +01:00
IntelOrca
f5917e71f5
add ride initialisation
2014-04-09 02:39:28 +01:00
IntelOrca
286b43355a
start work on window drawing
2014-04-08 17:52:39 +01:00
IntelOrca
1b92d895a2
add some park functions
2014-04-08 00:41:35 +01:00
IntelOrca
880e741341
add config load
2014-04-08 00:05:05 +01:00
IntelOrca
882c3fa9ae
add scenario list loading
2014-04-06 17:45:09 +01:00
IntelOrca
7a83a8b1a8
fix window problems and add scenario select
2014-04-03 19:49:00 +01:00
IntelOrca
3a6a55147f
add window functions and title screen windows
2014-04-03 03:08:06 +01:00
IntelOrca
0a12f15a25
add peep updating
2014-04-03 00:22:33 +01:00
IntelOrca
182db27ab3
add intro screen code
2014-04-02 16:46:58 +01:00
IntelOrca
bfd3ad8b28
add window definitions and update all subroutine
2014-04-02 04:56:26 +01:00
IntelOrca
643db7ae01
initial commit
...
Working game in SDL2 window but with various bugs and incomplete input
logic.
2014-04-02 00:31:55 +01:00