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

106 Commits

Author SHA1 Message Date
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
IntelOrca 3430e4da6f add swedish.txt to VS filters 2014-09-17 23:21:51 +01:00
hexdec f384b31b65 Initial work on music credits. 2014-09-11 17:44:23 +02:00
qcz 7939112adc replace RCT2_GLOBAL calls with macros where possible 2014-09-06 13:31:33 +02: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
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
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