mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-30 14:06:07 +02:00
Code Issues Projects Releases Wiki Activity
4241 commits 9 branches 41 tags 335 MiB
Commit graph

200 commits

Author SHA1 Message Date
IntelOrca
ac4cd56b63 add new load / save window, closes #580 2015-02-14 02:16:03 +00:00
IntelOrca
e8e7dfbc70 improve object selection window 2015-02-13 18:43:22 +00:00
IntelOrca
a66b29076b move osinterface code to shared or windows 2015-02-12 20:51:40 +00:00
IntelOrca
bfb58133e9 remove user project settings from git 2015-02-12 19:04:56 +00:00
IntelOrca
f6c09b44b6 merge in random map generator 2015-02-10 20:11:59 +00:00
IntelOrca
9cc108abbb remove toolbar.c and ignore seperators at the end of the toolbar 2015-02-10 14:41:35 +00:00
Duncan Frost
edfbd80747 Added track_data refactored track_place to use track_data 2015-02-09 18:52:01 +00:00
IntelOrca
9d2abf1925 add map generation window 2015-02-09 18:32:58 +00:00
IntelOrca
647d9a42a5 Merge branch 'develop' into random-map 
Conflicts:
	projects/openrct2.vcxproj.user
 2015-02-09 14:30:41 +00:00
IntelOrca
dfc723573c fix expenditure table issues, fixes #762 2015-02-08 14:31:57 +00:00
IntelOrca
63ad70a0f3 fix errors 2015-02-08 03:19:24 +00:00
IntelOrca
658d949733 add RCT1 SC6/SV6 data structure 2015-01-21 15:54:33 +00:00
IntelOrca
9203bff09e fix output project directories 2014-12-20 13:13:08 +00:00
Adrian Wielgosik
448b82b6fa Separate external libraries and language files into VS projects 2014-12-18 22:31:16 +01:00
IntelOrca
47329713e1 remove temporary debug argument 2014-11-26 17:56:28 +00:00
IntelOrca
85c41488ce implement RLECOMPRESSED chunk encoding, closes #598 2014-11-26 16:27:21 +00:00
IntelOrca
8e3ee3f7e9 implement bare minimum so that close button is implemented on object selection window, partial fix for #433 2014-11-24 23:05:35 +00:00
IntelOrca
73a6b1acea implement editor_read_s6, partial fix for #433 2014-11-24 02:58:48 +00:00
IntelOrca
0e0e9c9840 merge qcz editor early to help finish other editor parts 2014-11-23 16:28:23 +00:00
IntelOrca
335774dc08 add log level check so that --verbose option works 2014-11-21 18:39:56 +00:00
IntelOrca
2b7142e49f attempt to fix #566 and other bugs, also refactor some footpath related functions 2014-11-15 18:22:06 +00:00
IntelOrca
62be863476 refactor viewport interaction functions 2014-11-05 19:42:19 +00:00
IntelOrca
ea6b0de6a6 refactor and move keyboard shortcuts to a new source file 2014-11-05 18:50:51 +00:00
IntelOrca
508ed131f7 implement sub_6CC3FB 2014-11-04 21:39:03 +00:00
IntelOrca
8ab3188914 Merge branch 'master' into ride-update 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-11-03 17:37:08 +00:00
Duncan Frost
49ccea7f26 Fix remaining bugs with window_sign(large) 2014-11-02 14:16:43 +00:00
Duncan Frost
40a26f689f Added demolish ride prompt 2014-11-02 08:39:01 +00:00
IntelOrca
cf59455d69 refactor ride update and fix bugs 2014-11-02 03:38:05 +00:00
Gabriel Huber
4ae393e85d Added german translation 2014-10-21 02:08:55 +02:00
IntelOrca
ae85fc265e implement window_map_tooltip 2014-10-17 02:01:58 +01:00
Duncan Frost
b1721f217d Trying out a new technique for text input 2014-10-16 20:58:25 +01:00
IntelOrca
f22cc6bbeb Merge branch 'master' into viewport-window 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-10-12 17:28:17 +01:00
Duncan Frost
2a3989019b Fix merge fails. Renamed a few functions 2014-10-12 11:37:02 +01:00
IntelOrca
17e9ea1fc4 implement the viewport window 2014-10-12 02:55:42 +01:00
IntelOrca
1714f94263 implement some of editor_load_landscape for sv4 and sc4 files 2014-10-10 22:50:22 +01:00
IntelOrca
70a33f6593 refactor game_logic_update 2014-10-09 20:31:58 +01:00
IntelOrca
71e508c416 refactor various platform functions and includes 2014-10-09 14:03:54 +01:00
IntelOrca
a35ebea72a improve command line parsing 2014-10-09 01:36:59 +01:00
IntelOrca
e57a625c9f refactor game startup and initialisation 2014-10-09 00:30:22 +01:00
IntelOrca
db85a215f9 move rain drawing functions into its own module 2014-10-08 23:17:16 +01:00
IntelOrca
93c5bddd4e fix various research issues and improve 2014-10-08 22:11:50 +01:00
IntelOrca
d2dd110253 organisation: fix filters 2014-10-07 21:42:23 +01:00
IntelOrca
a32f73d27f Merge branch 'master' into reorganise-src 
Conflicts:
	projects/openrct2.vcxproj
	src/interface/window.h
 2014-10-07 20:07:15 +01:00
IntelOrca
1770e82643 organise: refactor peep / staff window names 2014-10-07 19:39:52 +01:00
Duncan Frost
f2ec0a4bb7 Moved mini window into seperate file. Fixed all bugs 2014-10-07 19:17:01 +01:00
Duncan Frost
ff1b124572 Added start of shortcut window 2014-10-07 19:16:59 +01:00
IntelOrca
1d92e3d7ab Merge branch 'master' into reorganise-src 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	src/audio/audio.c
	src/audio/mixer.h
	src/game.c
	src/ride/vehicle.c
	src/windows/finances.c
	src/windows/research.c
 2014-10-07 19:10:16 +01:00
IntelOrca
daf231a2e9 organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
IntelOrca
c8df6174b8 organisation: fix includes 2014-10-06 17:36:58 +01:00
IntelOrca
554e1fe70e organisation: move files and update project 2014-10-06 10:21:07 +01:00
IntelOrca
95a9b1ca2e implement research_update 2014-10-05 15:23:52 +01:00
IntelOrca
f246b97c69 implement window_track_list_select 2014-09-27 23:48:42 +01:00
IntelOrca
f026f92d1e start implementation of track list window 2014-09-27 00:41:24 +01:00
hexdec
6973b6586b Decompiled published credits window. 
Renamed window_credits to window_music_credits.
Added draw_string_centred_underline to gfx.c.
 2014-09-26 22:19:48 +02:00
Ted John
912c80f867 Merge pull request #477 from zsilencer/master 
window_scroll_to_location
 2014-09-23 12:57:14 +01:00
Marco Costa
58cea29223 Fix errors/warnings in VS build 
* Added libspeex to 'Debug' target, previously only 'Release' had it.
* Initialize some pointers with NULL when an uninitialized code path is
unlikely, but possible.
 2014-09-22 20:37:35 -04:00
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
zsilencer
a71fdf34b3 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-09-18 21:46:46 -06: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
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