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

1875 Commits

Author SHA1 Message Date
IntelOrca d821456709 fix don't save button on quit game prompt, fixes #465 2014-11-17 01:20:20 +00:00
Ted John 3876965c07 update src/readme.md 2014-11-16 15:37:41 +00:00
Duncan Frost e822894de9 Added peep_update_watering 2014-11-16 14:05:10 +00:00
Duncan Frost 7984c0cbe0 Added peep_update_emptying_litter. 2014-11-16 12:52:52 +00:00
Duncan Frost e54a0bd9bf Fix build 2014-11-15 20:27:53 +00:00
Duncan Frost f07bafef31 Labled destination_x/y peep offsets. 2014-11-15 20:23:21 +00:00
Duncan Frost c2e187522c Added update_mowing. Fixed peep thought bug. Fixed viewport footpath bug. 2014-11-15 19:45:49 +00:00
Duncan Frost 4aff805727 Refactor thought update. Removed bug in updating thoughts 2014-11-15 19:45:47 +00:00
Duncan Frost 68e7b8666c Added sub_68F3AE some sort of ground check 2014-11-15 19:45:46 +00:00
Duncan Frost ca8d76f4dd Added peep_update_sweeping 2014-11-15 19:45:45 +00:00
Duncan Frost 4a4bb28c36 Added peep_update_1 2014-11-15 19:45:45 +00:00
Duncan Frost 38e1669c7d Added peep_update_leaving_park. Fixed bug in watching 2014-11-15 19:45:43 +00:00
Duncan Frost 93b408f7f3 Added peep_update_watching 2014-11-15 19:45:42 +00:00
Duncan Frost 135abc90a4 Added sub_693b58 2014-11-15 19:45:42 +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
zsilencer 2dcd3b4935 use mixer for ride music 2014-11-13 19:51:02 -07:00
zsilencer c3086a5b9f finish ride music decompile 2014-11-12 18:32:33 -07:00
zsilencer 0e414ebae7 #558 2014-11-12 18:32:33 -07:00
IntelOrca 2be36b1621 fixes #564 - ebp not restored on mouse down event call 2014-11-12 22:59:50 +00:00
Duncan Frost 59ef4ac0e3 Added peep_actions set var_71 to these values 2014-11-12 19:09:17 +00:00
Duncan Frost bd06488450 Fix peeps sitting. Renamed a function to sprite_move 2014-11-12 17:45:39 +00:00
Adrian Wielgosik ad2502e4d5 - fixed a condition in sub_6939EB that compared against a wrong field 
- added a missing break that caused the wrong text to be displayed in ride window
 2014-11-12 12:30:28 +01:00
IntelOrca 5a4b940fc2 fix and refactor window event calls 2014-11-11 20:51:25 +00:00
IntelOrca 0cef1c9517 refactor input widgets and keyboard_shortcut screen flags 2014-11-11 16:06:51 +00:00
IntelOrca 53c8a20e0b refactor input window position and resize 2014-11-11 00:20:06 +00:00
IntelOrca d8844513a1 remove windows.h from input.c and improve window resize 2014-11-10 22:37:55 +00:00
Duncan Frost 502b4c4cbd Fix peeps walking on water after entering. Added some known offsets. 2014-11-10 17:23:13 +00:00
IntelOrca 798efef6e7 use standard integer constants 2014-11-10 02:30:55 +00:00
IntelOrca e4bd82347e refactor some of the input functions 2014-11-10 02:17:45 +00:00
IntelOrca d111c715d6 implement viewport_interaction_get_item_left 2014-11-10 00:40:59 +00:00
IntelOrca 13b56f68d3 add window snapping 2014-11-09 17:18:51 +00:00
Duncan Frost a375068f66 Remove redundant comment 2014-11-09 08:52:23 +00:00
Duncan Frost 8f2b180603 Fix another viewport issue by removing new function call it can be fixed at a later date. Change viewport address name to make it more obvious how to use it. 2014-11-09 08:50:02 +00:00
IntelOrca 6aa0241c23 fix string format, peep real names not popping arguments 2014-11-06 23:15:17 +00:00
Ted John 471fb2a45d Merge pull request #556 from duncanspumpkin/fix_viewports 
Fix viewports
 2014-11-06 22:29:44 +00:00
IntelOrca d556e5032b fix custom strings not popping arguments 2014-11-06 22:11:54 +00:00
Duncan Frost 2ddbc8f190 Found cause of viewport issue. Added invalidate_sprite function. 2014-11-06 21:42:18 +00:00
Duncan Frost f3da25622a Added start of new function 2014-11-06 21:16:48 +00:00
Duncan Frost 21dd6f227d Added some more viewport functions 2014-11-06 21:16:47 +00:00
Duncan Frost 3003419160 Add debug flag to dirty box draw 2014-11-06 21:16:46 +00:00
Duncan Frost 1a857edc21 Playing about with viewport setup 2014-11-06 21:16:45 +00:00
Ted John 74a0110b0d Merge pull request #555 from duncanspumpkin/weather_cheats 
Added force sun/thunder cheat.
 2014-11-05 21:05:36 +00:00
IntelOrca f1cc82f258 prepare for left viewport interaction implementation 2014-11-05 20:28:51 +00:00
Duncan Frost 97abffd4e8 Added force sun/thunder cheat. 2014-11-05 20:26:27 +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
Ted John a773ada29e Merge pull request #554 from duncanspumpkin/peep_update 
Peep update
 2014-11-05 17:54:52 +00:00
Duncan Frost 3016011949 Refactor scroll_input 2014-11-05 17:17:56 +00:00
Duncan Frost c1ef7ac61f Use reversed peep functions where required 2014-11-05 16:45:42 +00:00
Duncan Frost f85a2e8ad9 decompiled 6939EB unsure of its use 2014-11-05 16:35:23 +00:00
Duncan Frost 481fd08ab5 Added update_picked and update_entering_park. Added new entries to peep struct 2014-11-05 16:35:22 +00:00
Duncan Frost 97d47c3039 Fix merge fail 2014-11-05 16:35:20 +00:00
Duncan Frost c861a999ce Finished peep update sitting 2014-11-05 16:35:19 +00:00
Duncan Frost c033965faa Added start of peep sitting update. Fixed bug that caused peeps to spin 2014-11-05 16:35:19 +00:00
Duncan Frost 22df12c1c8 Added sub_69e9d3 a sprite moving function 2014-11-05 16:35:18 +00:00
Duncan Frost 573fe0c6f7 Added peep_decrement_num_riders 2014-11-05 16:35:17 +00:00
Duncan Frost 388b8ec337 Added peep_window_state_update 2014-11-05 16:35:16 +00:00
Duncan Frost 2f64d2a6db Fixed bugs and refactored 2014-11-05 16:35:16 +00:00
Duncan Frost 5439aa8755 Finished peep_update_falling 2014-11-05 16:31:23 +00:00
Duncan Frost 61e1645de0 Added a very small bit of not drowning 2014-11-05 16:31:22 +00:00
Duncan Frost 606d8c5a25 Added peep_update_drowning. 2014-11-05 16:31:21 +00:00
Duncan Frost bfe45e5996 Refactored insert_thought 2014-11-05 16:30:22 +00:00
Duncan Frost 95557bc732 Added peep_insert_new_thought 2014-11-05 16:30:21 +00:00
Duncan Frost 11c4ac52ac Added notes on peep actions 2014-11-05 16:30:19 +00:00
Duncan Frost 0624736b47 Decompiled PEEP_STATE_QUEUING 2014-11-05 16:30:19 +00:00
IntelOrca 0e223c524e implement sub_6EDE88 2014-11-05 16:14:12 +00:00
IntelOrca 2f4fd67170 implement more viewport input functions 2014-11-05 14:38:19 +00:00
IntelOrca ad84e6d076 implement ride_modify and supporting methods 2014-11-05 02:55:29 +00:00
IntelOrca 508ed131f7 implement sub_6CC3FB 2014-11-04 21:39:03 +00:00
IntelOrca 39ad49bac9 implement find mechanic in ride window 2014-11-04 19:33:17 +00:00
IntelOrca 0104042640 Merge branch 'ride-update' 
Conflicts:
	src/world/map.c
 2014-11-04 19:01:59 +00:00
IntelOrca d92a4d9418 implement clear scenery game command, try out removing paths feature 2014-11-04 03:34:48 +00:00
IntelOrca 015e85d263 refactor station update and fix bugs 2014-11-04 01:07:54 +00:00
Ted John c75ae048a4 Merge pull request #550 from duncanspumpkin/zero_clearance 
Added zero clearance cheat tool
 2014-11-03 23:03:22 +00:00
IntelOrca 073a747660 fix ride update, financial statistics 2014-11-03 21:53:22 +00:00
IntelOrca 1b8a88e828 add more gentle / thrill ride rating calculation functions 2014-11-03 21:24:10 +00:00
Duncan Frost 70c06d62ef Added zero clearance cheat tool. Warning does not clean itself up 2014-11-03 21:15:35 +00:00
IntelOrca 8ab3188914 Merge branch 'master' into ride-update 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-11-03 17:37:08 +00:00
IntelOrca 3ecfee72a2 refactor ride_get_measurement 2014-11-03 17:20:07 +00:00
Ted John e2ed908a79 Merge pull request #546 from duncanspumpkin/window_sign 
Window sign
 2014-11-02 18:26:01 +00:00
Duncan Frost c6bda25ddf Fixes none generation of tracks.idx. This is not how rct2 does it 2014-11-02 15:48:18 +00:00
Duncan Frost c87e373ced Added window_sign_small 2014-11-02 14:16:44 +00:00
Duncan Frost 49ccea7f26 Fix remaining bugs with window_sign(large) 2014-11-02 14:16:43 +00:00
Duncan Frost 828c6ff7a2 Added window_sign. Invalidate function to be finished 2014-11-02 14:15:18 +00:00
Duncan Frost 880cf21d6f Added code to call sign windows 2014-11-02 14:15:17 +00:00
IntelOrca 19d3852f9c refactor update ride more 2014-11-02 14:03:28 +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
IntelOrca 3d40c7e3ee add various ride mechanic functions 2014-11-02 01:41:00 +00:00
IntelOrca e4dc9b8c8e improve ride update and add some breakdown functions 2014-11-01 22:21:28 +00:00
Duncan Frost f58be44a20 Remove previous hack 2014-11-01 13:13:11 +00:00
Duncan Frost 53e0ebc57c Refactored a bit of tooltip window. Added hack to fix #540 note this should be fixed better 2014-11-01 13:10:14 +00:00
IntelOrca 1d3fc842e3 fix bugs and refactor ride update 2014-11-01 03:32:57 +00:00
IntelOrca 1095c1d33a finish update ride, still testing and refactoring to go 2014-11-01 01:25:25 +00:00
IntelOrca 7f7c380bd6 fix ride_get_station_start_track_element 2014-10-31 02:37:28 +00:00
IntelOrca 7e17f4fcf9 start implementing ride update and station update 2014-10-31 02:33:33 +00:00
Duncan Frost ae09e6ffcc Fix issues with peeps picked up 2014-10-30 09:09:04 +00:00
Duncan Frost 605c62f566 Window banner complete 2014-10-21 17:59:47 +01:00
IntelOrca 287b614392 fix window_map_tooltip using original window events instead of new 2014-10-21 11:07:11 +01:00
IntelOrca 9299588663 Merge branch 'german' of https://github.com/Yepoleb/OpenRCT2 into Yepoleb-german 2014-10-21 10:59:54 +01:00
Gabriel Huber 4ae393e85d Added german translation 2014-10-21 02:08:55 +02:00
Sijmen Schoon 3d53529abf Fix some warnings and do some optimizations 2014-10-21 01:12:10 +02:00
Sijmen Schoon a7b1e50a92 Implement redraw_peep_and_rain 2014-10-20 23:20:13 +02:00
Duncan Frost a72ef76e72 Fix error in gcc asm 2014-10-18 09:47:26 +01:00
Duncan Frost 442794de7d RCT_CALLFUNC now saves flags register. 2014-10-18 09:43:06 +01:00
IntelOrca 217ae84c62 add cross platform interface for enumerating files 2014-10-17 03:22:45 +01:00
IntelOrca ae85fc265e implement window_map_tooltip 2014-10-17 02:01:58 +01:00
Duncan Frost 04965ae9d2 Added home, end key. Now uses host window colours. 2014-10-16 21:50:03 +01:00
Duncan Frost 76caeaf040 Fix warning. 2014-10-16 21:00:49 +01:00
Duncan Frost 1c62a0c29d Cleaned up code, renamed variables, added comments. Switched over all existing text boxes to new code 2014-10-16 20:58:31 +01:00
Duncan Frost edbfb43251 Added ok/cancel buttons. Added closing on main. 2014-10-16 20:58:30 +01:00
Duncan Frost 94c517decb Fix slight mistake with cursor position when using delete. 2014-10-16 20:58:29 +01:00
Duncan Frost 9a3aeed508 Added some of the suggested changes 2014-10-16 20:58:28 +01:00
Duncan Frost 9cb03a9d3e Fixed bugs in existing method. Now has correct title and description 2014-10-16 20:58:27 +01:00
Duncan Frost cad821349b New technique for text input. 2014-10-16 20:58:26 +01:00
Duncan Frost 306310c5d9 Fix warning 2014-10-16 20:58:26 +01:00
Duncan Frost b1721f217d Trying out a new technique for text input 2014-10-16 20:58:25 +01:00
Ted John 0053dd82dc Merge pull request #529 from duncanspumpkin/fix_527 
Fix #527
 2014-10-16 19:44:31 +01:00
Duncan Frost 0a5e304a92 Fixes #527. Error caused by passing a variable a factor of 8 out. 2014-10-16 19:35:01 +01:00
zsilencer 98d27b44fd fix things 2014-10-15 20:03:15 -06:00
zsilencer bd128402f0 0x006EC9CE 2014-10-15 20:03:15 -06:00
zsilencer 6628a4eace 0x006BC3AC, 0x00405199, 0x00404E0D, sort audio functions by address, volume fading 2014-10-15 20:03:15 -06:00
IntelOrca ece2522273 refactor window search functions 2014-10-16 02:02:43 +01:00
IntelOrca 268e7530c2 fix #525, creating a ride crashes when footpath window is open 2014-10-16 00:35:42 +01:00
IntelOrca 6fe1bace20 refactor input (flags in particular) and add sub_6EA73F 2014-10-15 22:59:26 +01:00
IntelOrca dda40cb99a add missing breaks in dropdown switch for top toolbar 2014-10-14 03:38:46 +01:00
IntelOrca f22cc6bbeb Merge branch 'master' into viewport-window 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-10-12 17:28:17 +01:00
IntelOrca 9ebf6e5550 add open extra viewport to map button on top toolbar 2014-10-12 15:48:21 +01:00
Duncan Frost 18db536f87 Less magic numbers 2014-10-12 15:04:37 +01:00
Duncan Frost bab896ad1e Finished staff window. 2014-10-12 11:37:07 +01:00
Duncan Frost 2774c63eba Added first draft of tool update and down 2014-10-12 11:37:06 +01:00
Duncan Frost 5ee4616685 Added remaining paint and invalidate functions 2014-10-12 11:37:05 +01:00
Duncan Frost d02017cb48 Refactored widgets. Added staff stats invalidate 2014-10-12 11:37:05 +01:00
Duncan Frost 0ba79d70ab Added remaining widgets 2014-10-12 11:37:04 +01:00
Duncan Frost 950bbccb34 Fix bugs introduced by previous commit. 2014-10-12 11:37:03 +01:00
Duncan Frost 10793011c4 Fix small mistakes in fire prompt 2014-10-12 11:37:02 +01:00
Duncan Frost 2a3989019b Fix merge fails. Renamed a few functions 2014-10-12 11:37:02 +01:00
Duncan 252d7f7987 Added fire staff cmd. Fire staff wind complete. 2014-10-12 11:35:12 +01:00
Duncan af6926350e Added fire staff id entry 2014-10-12 11:35:11 +01:00
Duncan 3612f7f89d Finished window staff fire paint 2014-10-12 11:35:10 +01:00
Duncan Frost 719ca2ddd2 Added start of window_staff_fire. Refactored some of window_staff_peep 2014-10-12 11:35:09 +01:00
IntelOrca a12c771190 add locate button to viewport 2014-10-12 03:10:03 +01:00
IntelOrca 17e9ea1fc4 implement the viewport window 2014-10-12 02:55:42 +01:00
IntelOrca 8190fa48be implement rating calculations for g forces and drops 2014-10-11 23:50:04 +01:00
IntelOrca c91c4f7ea0 implement mine train coaster rating calculation 2014-10-11 23:07:20 +01:00
IntelOrca 13b4280404 add more ride_rating calculation functions 2014-10-11 22:05:52 +01:00
IntelOrca 77e3c7a65d implement ride_ratings_calculate_elevator and related functions 2014-10-11 18:55:56 +01:00
IntelOrca 69ab8700dc implement ride_ratings_get_scenery_score 2014-10-11 18:18:20 +01:00
IntelOrca 5928b685ea add more ride ratings calculations and refactor 2014-10-11 14:14:10 +01:00
IntelOrca 3377187a76 implement ride rating calculation table and a few other things 2014-10-11 13:25:09 +01:00
IntelOrca 409d54dbfc implement ride_ratings_update_state_3 2014-10-11 03:28:09 +01:00
IntelOrca 4e827bb64e start implementing ride_ratings_update_all 2014-10-11 02:43:39 +01:00
IntelOrca c628f6fea0 change track loading to use stdio (FILE) 2014-10-11 01:18:08 +01:00
IntelOrca 1714f94263 implement some of editor_load_landscape for sv4 and sc4 files 2014-10-10 22:50:22 +01:00
IntelOrca 9dd6c8dd15 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-10-09 20:32:11 +01:00
IntelOrca 70a33f6593 refactor game_logic_update 2014-10-09 20:31:58 +01:00
Neranjen 9f556549c7 fix #516 2014-10-09 21:19:29 +05:30
IntelOrca 3cf28d6ef8 refactor config and add window size 2014-10-09 15:55:47 +01:00
IntelOrca edf2b9c93a refactor openrct2 loop 2014-10-09 14:31:51 +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 dcb7fde625 Merge branch 'master' into cmdline-scenario 2014-10-08 23:32:51 +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 7607468a42 Merge branch 'master' into research-update 2014-10-08 21:30:20 +01:00
zsilencer 6d2616b0ca fix #513 2014-10-08 12:15:16 -06:00
zsilencer 9df2ee4b77 use mixer for title music, crowd noise, rain/thunder, and sound effects 2014-10-07 23:00:11 -06:00
IntelOrca daeb4d8c6d implement research_finish_item 2014-10-08 00:42:11 +01:00
IntelOrca 141f33acf8 implement research_next_design 2014-10-07 23:42:17 +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 b828f678b8 organisation: move wrongly categorised drawing functions and mark some addresses as obsolete 2014-10-07 19:53:21 +01:00
IntelOrca 1770e82643 organise: refactor peep / staff window names 2014-10-07 19:39:52 +01:00
Ted John b80abdc0c2 Merge pull request #509 from duncanspumpkin/window_shortcut 
Window shortcut
 2014-10-07 19:29:37 +01:00
Ted John 26616a9bf0 Merge pull request #508 from zsilencer/master 
mixer fix
 2014-10-07 19:28:45 +01:00
Duncan Frost 880ae7cb94 Added the ability to read the current keyboard assignment 2014-10-07 19:17:02 +01:00
Duncan Frost f2ec0a4bb7 Moved mini window into seperate file. Fixed all bugs 2014-10-07 19:17:01 +01:00
Duncan Frost 75f71de53a Added missing functions and window_shortcut_change 2014-10-07 19:17:00 +01:00
Duncan Frost 160a1f8dda Added the smaller shortcut functions 2014-10-07 19:16:59 +01:00
Duncan Frost ff1b124572 Added start of shortcut window 2014-10-07 19:16:59 +01:00
zsilencer c51b9d7cb0 mixer fix 2014-10-07 12:16:17 -06: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 71e6f90e08 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-10-07 18:48:46 +01:00
IntelOrca f9f7dcfe32 Merge branch 'research-update' 2014-10-07 18:46:57 +01:00
zsilencer b0f5271985 vehicle sounds now using Mixer 
Fixed bug that caused widgets to miss draw. Fix #335

Merge pull request #505 from duncanspumpkin/gfx_rect

Fixed bug that caused widgets to miss draw.

fix #506 Paths can no longer be placed

Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2

vehicle sounds now using Mixer

Fixed bug that caused widgets to miss draw. Fix #335

Merge pull request #505 from duncanspumpkin/gfx_rect

Fixed bug that caused widgets to miss draw.

fix #506 Paths can no longer be placed

Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Fixed bug that caused widgets to miss draw. Fix #335

Merge pull request #505 from duncanspumpkin/gfx_rect

Fixed bug that caused widgets to miss draw.

fix #506 Paths can no longer be placed

Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2

vehicle sounds now using Mixer

Fixed bug that caused widgets to miss draw. Fix #335

Merge pull request #505 from duncanspumpkin/gfx_rect

Fixed bug that caused widgets to miss draw.

fix #506 Paths can no longer be placed

Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

vehicle sounds now using Mixer

Fixed bug that caused widgets to miss draw. Fix #335

Merge pull request #505 from duncanspumpkin/gfx_rect

Fixed bug that caused widgets to miss draw.

fix #506 Paths can no longer be placed

Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
 2014-10-06 20:21:55 -06:00
IntelOrca 4733089bf4 fix #506 Paths can no longer be placed 2014-10-07 00:08:32 +01:00
IntelOrca daf231a2e9 organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
IntelOrca dd6247f6ee organisation: fix real name array sizes 2014-10-06 18:53:33 +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 f4b2d4b0b5 implement research_update_uncompleted_types and refactor research 2014-10-05 19:18:36 +01:00
IntelOrca 79ad5c0702 implement research_calculate_expected_date 2014-10-05 17:53:08 +01:00
IntelOrca 95a9b1ca2e implement research_update 2014-10-05 15:23:52 +01:00
Duncan Frost 068e0c3396 Fixed bug that caused widgets to miss draw. Fix #335 2014-10-05 12:24:14 +01:00
IntelOrca 7869b8efd8 implement window_error 2014-10-05 02:51:17 +01:00
Ted John f6bdab1eea Merge pull request #498 from duncanspumpkin/renable_cso 
Renable cso
 2014-10-04 12:23:42 +01:00
Duncan Frost bfb132146d Fixed bugs in RLE code. Loading now works 2014-10-04 11:41:16 +01:00
IntelOrca ff2dad17a0 Merge branch 'track-list-window' 2014-10-04 00:53:44 +01:00
Ted John 2b69e9e914 Merge pull request #501 from zsilencer/master 
0x006838BD, 0x006BA8E0
 2014-10-04 00:53:12 +01:00
IntelOrca 7c79a0199f implement window_track_place_draw_mini_preview 2014-10-04 00:28:43 +01:00
zsilencer bfbcbbc996 small fixes 
palette effects

small fixes

palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c

palette effects

palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c

palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2

added window_music_credits.c

added window_music_credits.c

Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
 2014-10-03 16:43:52 -06:00
Duncan Frost 45f9f585f1 Added encode functions. Missing check sum calc for end of chunk 2014-10-03 20:07:21 +01:00
IntelOrca db8b9439b8 refactor window_track_place.c 2014-10-03 18:15:20 +01:00
Ted John 666fe7211c Merge pull request #484 from marcotc/work 
Basic analysis of window_map_mousedown
 2014-10-03 17:51:11 +01:00
IntelOrca 24a6f27551 fix path bug and implement tooldown for place track 2014-10-03 17:50:09 +01:00
IntelOrca 67512d7cd7 Merge branch 'master' into track-list-window 2014-10-03 16:53:20 +01:00
zsilencer f2e501134e palette effects 2014-10-02 19:04:29 -06:00
IntelOrca 44c2e29b51 add zoom touch gesture support 2014-10-02 21:55:04 +01:00
Duncan Frost 2ea8d9e4b2 Added start of sawyer write chunk 2014-10-01 21:49:37 +01:00
Duncan Frost e2c78f236c Fix travis errors 2014-10-01 20:08:40 +01:00
Duncan Frost 593acfc867 Added code for writing new packed file. 2014-10-01 18:52:59 +01:00
Duncan Frost bbc06c9ed7 Added code for finding next avaliable file name 2014-10-01 18:52:58 +01:00
Duncan Frost a1a3df8158 Added more of load packed 2014-10-01 18:52:57 +01:00
Duncan 44a4862466 Small refactoring of load packed 2014-10-01 18:52:57 +01:00
Duncan 760ecf1525 Switched to main version of chunk read. 2014-10-01 18:52:56 +01:00
Duncan 85ccec4885 Switched to main version of chunk read. 2014-10-01 18:52:55 +01:00
Duncan 1133f7b609 Removed redundant function 2014-10-01 18:52:54 +01:00
Duncan 72c1acf207 Integrated fix of read chunk into main code 2014-10-01 18:52:54 +01:00
Duncan Frost 335aca4164 Cso now partially working. 2014-10-01 18:52:53 +01:00
Duncan Frost a63ad06e76 Fixed remaining bugs caused by not using rct2 malloc. 2014-10-01 18:52:52 +01:00
Duncan Frost 5cf517c789 Added a fixed version of read_chunk requires more testing before joining 2014-10-01 18:52:51 +01:00
Duncan Frost 81121db634 Still trying to find bug 2014-10-01 18:52:50 +01:00
Duncan Frost 387ce00ae2 Added more of object load. Remember to change the openedEntry code 2014-10-01 18:52:50 +01:00
Duncan Frost d2910392a4 Started reverse of load_object 2014-10-01 18:52:49 +01:00
Duncan Frost 928a61e167 Still searching for bug 2014-10-01 18:52:48 +01:00
IntelOrca f761306beb implement window_track_place_toolupdate 2014-10-01 02:03:36 +01:00
IntelOrca 2b9aa8a2b7 start implementing window_track_place 2014-09-30 18:56:30 +01:00
IntelOrca 4aff83e508 implement sub_67726A, track loading function 2014-09-28 17:57:25 +01:00
IntelOrca b7162b6979 implement track_get_info 2014-09-28 00:58:05 +01:00
IntelOrca f246b97c69 implement window_track_list_select 2014-09-27 23:48:42 +01:00
IntelOrca a0bdde2525 implement track list window paint 2014-09-27 20:26:04 +01:00
IntelOrca 70ebc89c37 implement scrollmouseover and scrollpaint for track list window 2014-09-27 01:49:47 +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 6f23f46055 implement random trees 2014-09-26 02:33:15 +01:00
IntelOrca db744b3b79 implement basic smooth map generation 2014-09-25 18:57:13 +01:00
IntelOrca 03048edfed begin simple map generator 2014-09-25 02:39:17 +01:00
IntelOrca f708a70976 Merge branch 'cmdline-scenario' into random-map 2014-09-25 01:44:49 +01:00
Duncan Frost ddc047241e Added some checks on object loading to eventualy fix #225 2014-09-24 17:47:19 +01:00
Duncan Frost 4d41118be7 Fixes #482 caused by not passing the widgetIndex and x and y coordinates. 2014-09-24 17:12:07 +01:00
Marco Costa 9d2ceec196 Basic analysis of window_map_mousedown 
* This function doesn't appear to relevant for the normal map window, as
it doesn't have the required widgets. Considering that the Scenario
Editor has a more complex map window, I assume that this function does
processing referred to that instance instead.
 2014-09-23 21:52:50 -04:00
IntelOrca 91bfc392c9 implement window_dropdown_show_colour 2014-09-23 21:22:14 +01:00
Ted John 912c80f867 Merge pull request #477 from zsilencer/master 
window_scroll_to_location
 2014-09-23 12:57:14 +01:00
Ted John 9124549b65 Merge pull request #480 from duncanspumpkin/fix_window_ride 
Fix window ride
 2014-09-23 12:57:07 +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
zsilencer 10f60d205d #479 2014-09-22 12:35:47 -06:00
Duncan Frost 69e13758d0 Move cursor location fix #476 2014-09-22 17:57:46 +01:00
Duncan Frost e0a7d4533d Use new ride window when clicking on ride 2014-09-22 17:46:14 +01:00
Duncan Frost b1886a53e4 Finished viewport_create for window_ride 2014-09-22 17:39:24 +01:00
zsilencer d4734c9ac2 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-22 02:15:47 -06:00
zsilencer f7cc9e4501 window_scroll_to_location 2014-09-22 02:04:10 -06:00
Duncan Frost 63280b200c Fix compile error 2014-09-21 17:44:22 +01:00
Duncan Frost 0f7ca91caf Started adding init_viewport 2014-09-21 17:44:22 +01:00
Duncan Frost 3c1a18e506 Fixes issues with colour drop down. 2014-09-21 17:44:21 +01:00
IntelOrca 8017bc8d27 fixes #472, invalid vehicle status' 2014-09-21 17:42:00 +01:00
IntelOrca 0164a1822a implement ride_get_measurement 2014-09-21 17:26:20 +01:00
IntelOrca fa8fca8dff remove warnings from audio.c 2014-09-21 15:40:39 +01:00
IntelOrca 2f8402e461 refactor peep easter egg names 2014-09-21 15:38:55 +01:00
IntelOrca 42ef09253e implement ride measurement update 2014-09-21 13:50:35 +01:00
IntelOrca f60b4d8f62 fix scroll flags not reset bug 2014-09-21 11:31:13 +01:00
Duncan Frost fa2a5cfa2c Fix pressed widgets 2014-09-21 10:42:13 +01:00
Duncan Frost f2fe4df1ed Fix small issues with ride_window. 2014-09-21 09:21:36 +01:00
zsilencer 1856cedaa6 Merge remote-tracking branch 'remotes/remote/ride-window' 2014-09-20 20:11:51 -06:00
IntelOrca 012ffcd8b2 finish graph tab on ride window 2014-09-21 00:01:17 +01:00
IntelOrca 409ee7a3da implement most of graphs tab on ride window except drawing 2014-09-20 19:41:03 +01:00
IntelOrca 8f134f7278 fix viewport on ride window 2014-09-20 17:32:11 +01:00
IntelOrca 73b9e2127a Merge branch 'master' into ride-window 2014-09-20 17:20:18 +01:00
IntelOrca 30067346ae finish vehicle tab for ride window 2014-09-20 17:19:58 +01:00
IntelOrca ac5985eaa0 refactor ride entries for ride window 2014-09-20 16:02:21 +01:00
Adrian Wielgosik f6c43e0b7d Decompile window_peep_stats_bars_paint 2014-09-20 12:19:06 +02:00
IntelOrca 8355bf6a61 add drawing of vehicles on ride window vehicle page 2014-09-19 23:43:35 +01:00
IntelOrca 2d2face52a fix merge problems 2014-09-19 22:17:14 +01:00
IntelOrca 828dabc9be Merge branch 'master' into ride-window 
Conflicts:
	src/peep.c
	src/peep.h
	src/ride.c
	src/ride.h
	src/vehicle.h
 2014-09-19 22:11:20 +01: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
zsilencer 961e151232 0x0069A5A0, 0x006AC988, couple fixes 2014-09-18 20:48:04 -06:00
Duncan Frost f25b6e2ba2 Fixed incorrectly assuming peep was underground if on water 2014-09-18 17:18:39 +01:00
Duncan Frost b40ebfe7a2 Fixed dropdown location after pickup. Labbeld variables to make it easier to read 2014-09-18 16:52:56 +01:00
IntelOrca fef1427271 implement most of vehicle tab for ride window 2014-09-18 02:48:51 +01:00
IntelOrca ccdc383a92 finish colour tab for ride window 2014-09-18 00:31:20 +01:00
IntelOrca 403d52b5e6 Merge branch 'master' into ride-window 2014-09-17 23:47:10 +01:00
IntelOrca 7002720f24 add and fix terrain get/set functions 2014-09-17 23:42:18 +01:00
Adrian Wielgosik eded73c5fb Fix footpath construction arrow not showing up 2014-09-18 00:05:28 +02:00
zsilencer d276e40b7f 0x00401AF3, 0x006BC6D8, corrections 2014-09-17 13:44:29 -06:00
Duncan Frost bcfe502647 Fixes half drawn doors in scenery window 2014-09-16 22:10:16 +01:00
Duncan Frost f37928c06a Fix #455. Since there is no reason to show both quit windows may as well just close the previous one. 2014-09-16 21:06:47 +01:00
Duncan Frost f2f69bb788 Switched to no_of_rides instead of staff_type 2014-09-16 18:16:32 +01:00
Duncan Frost 722eac949a Labelled a few peep variables. Added voucher type enum 2014-09-16 18:13:18 +01:00
Duncan Frost 3afafe4f6b Fix #432. Mistake was caused by oppacity bit in colour 2014-09-16 17:59:22 +01:00
Ted John bbd1ead111 Merge pull request #429 from KingHual/master 
Added rct_peep struct union (staff_id and guest_peep_varC5)
 2014-09-16 16:51:13 +01:00
Adrian Wielgosik d17091f16b Fix disabled widgets being clickable and reenable third tab of Cheats 2014-09-16 16:33:45 +02:00
zsilencer d87ede04a4 gcc fix? 2014-09-15 15:19:12 -06:00
zsilencer 33ae29b11f hook 2014-09-15 15:14:06 -06:00
zsilencer 44683a9246 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-15 15:12:48 -06:00
zsilencer 298de189f5 0x006BBC6B, hook 2014-09-15 15:12:25 -06:00
Duncan Frost 5b02d5b1f7 Fixes unselectable fifth row. Fix #431. 2014-09-15 21:42:49 +01:00
IntelOrca bd2ff2db05 Merge branch 'master' into ride-window 
Conflicts:
	src/peep.c
	src/peep.h
 2014-09-15 21:40:14 +01:00
King_Hual 1c1db75c28 Added rct_peep struct union (staff_id and guest_peep_varC5) 2014-09-15 22:50:34 +03:00
Duncan Frost 7c6a35af7a Fix graphical bug when drawing inline sprites caused by using strlen instead of get_string_length 2014-09-15 20:49:18 +01:00
Duncan Frost 9aee80e5a6 Added enum name to window flag 2014-09-15 20:49:17 +01:00