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 358 MiB
Commit Graph

1875 Commits

Author SHA1 Message Date
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
Duncan Frost 7127140f16 Added window_peep_inventory events. All events finished. 2014-09-15 20:49:17 +01:00
Duncan Frost a730c4d106 Added window_peep_thoughts events. 2014-09-15 20:49:16 +01:00
Duncan Frost a309fa3e30 Finished window_peep_finance events. Added note to peep.h 2014-09-15 20:49:15 +01:00
Duncan Frost b34a65cafa Added window_peep_rides_scroll_paint. Peep rides finished 2014-09-15 20:49:14 +01:00
Duncan Frost ce1a4fe473 Added window_peep_rides_invalidate and paint 2014-09-15 20:49:13 +01:00
Duncan Frost 5498e3cb90 Added window_peep_rides_scroll_mouse_down and over 2014-09-15 20:49:13 +01:00
Duncan Frost 809a21f003 Added window_peep_rides_scroll_get_size and tooltip 2014-09-15 20:49:12 +01:00
Duncan Frost 9cfd0fba19 Added window_peep_rides_resize and update. Added not on use of peep rides been on 2014-09-15 20:49:11 +01:00
Duncan Frost a320e17a26 Finished window_peep_stats_paint. Fixed issue with trailing colon. Fixed incorrect peep.h mapping for time in park. 2014-09-15 20:49:11 +01:00
Duncan Frost b6e4d13139 Started adding peep_stats_paint. 2014-09-15 20:49:10 +01:00
Duncan Frost e23d52b456 Added window_peep_stats_invalidate and resize 2014-09-15 20:49:09 +01:00
Duncan Frost ef73084153 Added window_peep_unknown_05 and stats_resize. Added note about unknown 05 2014-09-15 20:49:09 +01:00
Duncan Frost af9df02311 Added window_peep_not_overview_mouse_up a combination function for all peep pages 2014-09-15 20:49:08 +01:00
Duncan Frost a8ea0c83a2 Added window_peep_abort tool. Fixed bug with pickup 2014-09-15 20:49:07 +01:00
Duncan Frost 7f6d9c9a7e Add flags to gcc assembler 2014-09-15 20:49:06 +01:00
Duncan Frost fc5ff96741 Added window_peep_overview_tool_down. Modified RCT2_CALLPROC_X to return the flags register. 2014-09-15 20:49:06 +01:00
Duncan Frost eff832e339 Added window_peep_overview_tool_update 2014-09-15 20:49:05 +01:00
Duncan Frost 463fe459aa Add notes to game_do_command. Explode magic number into parts 2014-09-15 20:49:04 +01:00
Duncan Frost e8251daad5 Added peep_text_input 2014-09-15 20:49:03 +01:00
Duncan Frost 08e37a0435 Rewrote get_peep_face_sprite. Fixed mistakes in peep update 2014-09-15 20:49:02 +01:00
Duncan Frost efc9c4915b Added comment noting data location 2014-09-15 20:49:02 +01:00
Duncan 9d8caf1e8a Added window_peep_overview_update 
Not tested will not work at present missing two function calls.
 2014-09-15 20:49:01 +01:00
Duncan ca1904084e Added final window_peep tab paint functions 
Not tested.
 2014-09-15 20:49:00 +01:00
Duncan Frost fe6f5a49da Fixed comment for correct address 2014-09-15 20:48:59 +01:00
Duncan Frost 5f31f36f41 Moved get_peep_face_sprite to peep.c added stats_tab paint 2014-09-15 20:48:59 +01:00
Duncan 64c5bcb6cb Added window_peep_overview_tab_paint 
Looks to be used by staff window as well. Not tested.
 2014-09-15 20:48:58 +01:00
King_Hual ec9177123c Changed staff modes to enum 2014-09-15 21:47:54 +03:00
King_Hual 52232ed819 window_staff_peep_overview_dropdown uses sub_6C0C3F 2014-09-15 21:38:32 +03:00
King_Hual 1af884da0d Identified some addresses and structure fields, decompiled most of sub_6C0C3F. 2014-09-15 21:21:38 +03:00
IntelOrca cbbf372b7b Merge branch 'master' into ride-window 
Conflicts:
	src/scenario.c
 2014-09-15 10:45:32 +01:00
Adrian Wielgosik f47ea4fd27 Don't use sizeof() in pointer arithmetic or as indices; use found variables 2014-09-14 21:50:20 +02:00
IntelOrca f4a1eae06d implement dropdowns for window ride colour tab 2014-09-14 18:43:36 +01:00
IntelOrca bdb7b8d0c6 implement ride window colour paint and scroll paint 2014-09-14 01:21:33 +01:00
IntelOrca 2493b8a2f4 Merge branch 'master' into ride-window 2014-09-13 19:31:08 +01: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
zsilencer 2049a80540 0x006BB9FF, 0x006BC2F3, mixer edit, completed 0x6BB76E 2014-09-13 11:51:58 -06:00
Ted John 30c01d4672 Merge pull request #420 from KingHual/master 
Added C code instead of address call
 2014-09-13 14:12:43 +01:00
Ted John 084301a972 Merge pull request #421 from duncanspumpkin/input_state_widget_pressed 
Input state widget pressed
 2014-09-13 14:08:14 +01:00
Ted John f774382522 Merge pull request #417 from Jinxit/swedish-translation 
Swedish translation
 2014-09-13 14:07:22 +01:00
Duncan Frost 919da77478 More cleanup of code. Reverted to old dropdown format 2014-09-13 08:58:46 +01:00
Duncan Frost b282908bbd Fix compile warnings. 2014-09-13 08:33:22 +01:00
Duncan Frost e7d2ec3594 Added new function to window_dropdown. Cleaned up input code 2014-09-13 08:31:13 +01:00
Duncan Frost b3822247a5 Fixed dropdown issues need to add error handler 2014-09-13 08:31:12 +01:00
Duncan Frost 00634e6096 Added state==5 code 2014-09-13 08:31:11 +01:00
Duncan Frost 173083f447 Fixed dropdown bug. Added mouse up code. 2014-09-13 08:31:11 +01:00
Duncan Frost 5b0642535a Fix mistake with dropdown window. Still a mistake in dropdown code 2014-09-13 08:31:09 +01:00
Duncan Frost 5d438ac723 Finished dropdown part. 2014-09-13 08:31:09 +01:00
Duncan Frost 7746ae784d Started adding dropdown control 2014-09-13 08:31:08 +01:00
Duncan Frost 1373db3fe0 Added rough widget_state_pressed function 2014-09-13 08:31:07 +01:00
King_Hual 9648715dbb Added C code instead of address call 
- Temporary address call in window_map.c:window_map_mouseup event is now
replaced by reversed code

Delete Output-Build.txt

Replaced assembly code with macro

Edit a bunch of GCC assembly macros

Remove scope from case

Added C code instead of address call

- Temporary address call in window_map.c:window_map_mouseup event is now
replaced by reversed code
 2014-09-13 03:11:51 +03:00
vahiki 81ba275826 Merge branch 'master' into swedish-translation 2014-09-12 07:34:30 +02:00
King_Hual 11c0849ffc Added minimap window resizing 
- Identified some unknown methods and fields - process_mouse_tool,
bufsize
- Added map window events and methods - window_map_tooltip,
window_map_set_bounds
 2014-09-12 03:59:43 +03:00
IntelOrca fa0e9a1b80 Merge branch 'master' into ride-window 2014-09-11 18:26:15 +01:00
hexdec ac7c204284 Changed place on WC_MUSIC_CREDITS and WC_PUBLISHER_CREDITS. 2014-09-11 18:55:19 +02:00
hexdec e0cb2e6abf Fixed padding for widgets. 2014-09-11 18:50:37 +02:00
hexdec 361e33d3dd Finished decompiling window_music_credits. 2014-09-11 18:48:40 +02:00
hexdec f384b31b65 Initial work on music credits. 2014-09-11 17:44:23 +02:00
vahiki c4c74b81d0 added swedish to language list 2014-09-11 13:05:18 +02:00
IntelOrca 589fc3eaf8 finish ride window colour invalidate 2014-09-11 00:31:00 +01:00
IntelOrca 9c1689a9ef implement more of ride window colour invalidate 2014-09-10 23:05:20 +01:00
IntelOrca 0d8d30f46d Merge branch 'master' into cmdline-scenario 2014-09-10 19:36:16 +01:00
IntelOrca 645b8fbb46 add edit command line function 2014-09-10 19:36:11 +01:00
IntelOrca b40844c634 begin colour tab for ride window 2014-09-10 18:13:07 +01:00
qcz 2f2a03fe1f fix crash of scenery window when selecting the first entry of a given type 2014-09-09 19:38:19 +02:00
IntelOrca 508ce63c75 finish operating tab on ride window 2014-09-09 17:17:08 +01:00
IntelOrca a132b52766 finish invalidate event for ride window 2014-09-09 14:16:09 +01:00
IntelOrca fcc847beb4 start implementing operating tab on ride window 2014-09-09 01:12:32 +01:00
IntelOrca beafbc354c Merge branch 'master' into ride-window 
Conflicts:
	src/string_ids.h
 2014-09-09 00:11:03 +01:00
IntelOrca 31eec46c4d allow scenarios from any location to be started via command line 2014-09-08 19:58:15 +01:00
Ted John df107d3db4 Merge pull request #404 from vanderkleij/master 
Decompilation of move_sprite_to_list (0x0069ED0B)
 2014-09-08 19:38:04 +01:00
Tom van der Kleij 7058756d9c Incorporated suggested change by @qcz and fixed an enum member name and a compiler warning 2014-09-06 23:46:45 +02:00
qcz 7939112adc replace RCT2_GLOBAL calls with macros where possible 2014-09-06 13:31:33 +02:00
qcz 36d2c47706 fix scenery cursor bug, get rid of multiple unneccessary returns 2014-09-06 12:52:30 +02:00
qcz 288afe14b8 fix scenery window not closing after switching to a different tool, clarify name of the helper function 2014-09-06 12:45:00 +02:00
Tom van der Kleij 212849ec6c Merge remote-tracking branch 'upstream/master' 2014-09-06 09:48:54 +02:00
qcz 5be600cf5b Fix double payment in game_do_command 2014-09-06 09:45:23 +02:00
Tom van der Kleij 87667b78d4 Implemented suggestions from comments on pull request 2014-09-06 09:11:04 +02:00
zsilencer 02cacd45c1 cmake build 2014-09-05 20:35:16 -06: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
IntelOrca b4c7723368 fix warnings in window_scenery.c 2014-09-06 01:06:31 +01:00
IntelOrca 13fd5de6ce finish implementing income tab on ride window apart from command events 2014-09-06 00:58:02 +01:00
qcz a70df144ed Merge remote-tracking branch 'upstream/master' into scenery-window 2014-09-06 01:10:06 +02:00
qcz 7b2b9e5859 Finalize scenery window, fix encoding 2014-09-06 01:09:12 +02:00
IntelOrca 651a5a35ea Merge branch 'master' into ride-window 2014-09-05 23:47:19 +01:00
IntelOrca 6b3c39655f fixes #279, WWT_24 no longer shows a checkbox 2014-09-05 23:46:35 +01:00
IntelOrca abdfa95b24 implement most of income tab for ride window 2014-09-05 23:44:02 +01:00
qcz 6abc2327af added constants for frequently used variables, renamed register named variables where the purpose is known 2014-09-06 00:30:08 +02:00
Tom van der Kleij 9de2520a8a Fixing some travis compilation errors due to compiler used there being more strict than visual studio 2013 2014-09-05 23:47:18 +02:00
qcz 01986241de use local variable for scenery tab entries instead of the old location 2014-09-05 23:40:42 +02:00
Tom van der Kleij 185d64e157 Decompilation of move_sprite_to_list (0x0069ED0B) 2014-09-05 23:35:59 +02:00
qcz d4201a7eb7 add rct_scenery_set_entry struct, use it everywhere where referenced, continue to unify code in scenery window 2014-09-05 23:08:51 +02:00
qcz 90b0ec02b3 fix tab ordering, add pressed state for cluster button 2014-09-05 21:32:08 +02:00
IntelOrca 5c1b8a7c3c fix various bugs with ride window 2014-09-05 19:33:51 +01:00
IntelOrca caa7a50ec2 implement measurements tab on ride window 2014-09-05 18:10:30 +01:00
IntelOrca 4d5dd76713 refactor and implement locate mechanic for ride window 2014-09-05 14:24:54 +01:00
IntelOrca 9fe7f7ab2c implement maintenance tab on ride window 2014-09-05 02:37:48 +01:00
IntelOrca f7a5e82ebb Merge branch 'master' into ride-window 2014-09-04 23:27:29 +01:00
IntelOrca 2bb4274f05 fix warnings 2014-09-04 23:27:16 +01:00
IntelOrca 914ff60680 Merge branch 'master' into ride-window 2014-09-04 23:23:55 +01:00