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

239 Commits

Author SHA1 Message Date
IntelOrca 345b71f8a4 implement rct1_clear_extra_sprite_entries and rct1_clear_extra_tile_entries 2015-07-13 23:49:39 +01:00
IntelOrca d5ffaefdf0 add better disable clearance cheat 2015-07-10 21:32:11 +01:00
IntelOrca 57fd914a52 implement ride construction 2015-06-27 15:17:54 +01:00
Robert Jordan a3a993dabd Title Sequence editor 2015-06-24 12:25:54 -04:00
IntelOrca ce924b4b1b add new custom title sequence to celebrate 0.0.2 release 2015-06-14 21:01:48 +01:00
IntelOrca b69487cbba add changelog window 2015-06-13 13:30:50 +01:00
rd3k fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
IntelOrca d51f6ac3c9 add more ride rating calculations and fix bugs 2015-06-05 03:10:42 +01:00
IntelOrca bb309f34c6 refactor test project and add ride ratings test 2015-06-04 12:46:17 +01:00
IntelOrca f6eec3725c Merge branch 'develop' of https://github.com/marcotc/OpenRCT2 into marcotc-develop 
Conflicts:
	src/openrct2.c
 2015-06-04 11:54:27 +01:00
Marco Costa f05d851811 Create simple test framework 
* Run all tests by passing "test" as a command line argument to
'openrct2'
* Using CuTest 1.5 as a test framework
 2015-06-01 21:45:12 -04:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Miso Zmiric (Mike Squinter) 21a5c02333 use powershell pre-build, switch back to /MT 2015-05-30 22:11:06 +01:00
Robert Jordan 3fae3c2017 Resolved more conflicts 2015-05-30 16:03:39 -04:00
Robert Jordan 41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
rd3k 3bd079a9f4 Add handy input windows to mapgen first tab 2015-05-30 20:10:10 +01:00
Duncan Frost 3bd3fccb57 Fix rotation disapearing sprites 
This was caused by the sprite quadrant assignment not being reset when a new rotation was assigned
 2015-05-30 10:15:29 +01:00
IntelOrca c6aa17f053 add headless game support 2015-05-29 20:45:21 +01:00
Robert Jordan dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
IntelOrca 31e0bdd76f add partial working screenshot by command line 2015-05-28 23:04:02 +01:00
Robert Jordan 16105af1e7 Progress on window colour schemes 2015-05-26 16:59:25 -04:00
Miso Zmiric (Mike Squinter) 858c098da2 make libs pre-build step relative to project 2015-05-25 23:13:01 +01:00
Miso Zmiric (Mike Squinter) c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00
Robert Jordan ac17b52139 g2.dat is now updated every build. 
data/g2.dat is now ignored.
 2015-05-20 14:20:24 -04:00
IntelOrca d6e27c8241 fix #1097 2015-05-20 01:10:53 +01:00
IntelOrca 8772cdd7aa add in game console 2015-05-19 03:54:09 +01:00
IntelOrca c1260fc11f add command line sprite editor and additional custom graphics (g2.dat) 2015-05-19 00:26:31 +01:00
Robert Jordan 09cc46c1e6 Almost finished land rights tool 2015-05-15 11:28:27 -04:00
Duncan Frost cfeb039ad2 Added install_track window 2015-04-02 22:00:59 +01:00
IntelOrca c9ea1b6979 refactor RCT1 import code 2015-04-01 18:14:30 +01:00
IntelOrca d1e4fe8060 implement scenery_set_default_placement_configuration 2015-03-29 02:29:07 +01:00
IntelOrca 745614c959 refactor misc. sprites and implement jumping_fountain_begin 2015-03-23 10:39:47 +00:00
IntelOrca 7d383a586e implement map_update_tiles, grass growing and scenery aging 2015-03-22 17:04:50 +00:00
Adrian Wielgosik 12deac1859 Add /MP flag to enable multiprocess compilation 2015-03-19 22:59:54 +01:00
IntelOrca cd16af0f60 add some event handlers for invalidating map objects 2015-03-18 19:52:45 +00:00
Duncan Frost 013be11aed Refactored water and entrance paint functions 2015-03-01 21:06:51 +00:00
Duncan Frost 67b82b1065 Fix negative money due to cheat detection. 2015-02-20 19:45:23 +00:00
Timmy Weerwag 09e9288eb8 Added options button to title screen 2015-02-20 01:35:29 +01:00
IntelOrca 7f0ed995b5 improve reading and saving of configuration 2015-02-16 22:47:11 +00:00
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