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

1109 Commits

Author SHA1 Message Date
Ted John 5c01091043 Merge pull request #344 from duncanspumpkin/window_peep_functions 
Window peep functions
 2014-08-23 14:10:52 +01:00
Duncan Frost 4dd7a7dbc6 Add in address 
's
 2014-08-23 13:35:55 +01:00
Ted John 6a405aa905 Merge pull request #348 from zsilencer/master 
Decompiled function 0x006AF561
 2014-08-23 12:32:08 +01:00
Duncan Frost 19e72c54c7 Started peep_overview_paint 2014-08-23 12:06:25 +01:00
Duncan Frost 7d29081331 Fix remaining issues. Viewport init working 2014-08-23 11:56:20 +01:00
Duncan Frost 0b20bb79b8 Added window_peep_viewport_init 2014-08-23 10:39:15 +01:00
zsilencer 5ff2d9e6b3 remove test 2014-08-23 02:49:50 -06:00
zsilencer 84d4747a60 Decompiled function 0x006AF561 2014-08-23 02:44:06 -06:00
Duncan Frost 810590e754 Changed struct for last time 2014-08-23 08:30:31 +01:00
Duncan Frost 5795165ced Fix missing variables. Labeled even more vars 2014-08-23 08:08:26 +01:00
Duncan Frost 0c3844787b Fix compile issues. Add new structs 2014-08-23 08:08:25 +01:00
Duncan f700e560ca Added missing enabled widgets 
1 widx is missing
 2014-08-23 08:08:25 +01:00
Duncan 7500fccc79 Now uses new viewport_scroll function 2014-08-23 08:08:24 +01:00
Duncan 16cddec597 Fixed slight mistake with order. 
not tested.
 2014-08-23 08:08:23 +01:00
Duncan c2557be14d Fixed slight mistake with order. 2014-08-23 08:08:22 +01:00
Duncan 967af50f4d Added window_scroll_to_viewport based off previous function 2014-08-23 08:08:21 +01:00
Duncan 8379262ea4 Added viewport focus struct. 
Definitely breaks build
 2014-08-23 08:08:20 +01:00
Duncan 52d69be031 added locate function 
not tested.
 2014-08-23 08:08:19 +01:00
Duncan ba76d6e4e5 added window_close mouse down 2014-08-23 08:08:19 +01:00
Duncan ca5e60639e Added set_page 
Not tested.
 2014-08-23 08:08:18 +01:00
Duncan 4db53e2bfb Added start of window_peep_overview_mouse_down 
Not tested.
 2014-08-23 08:08:17 +01:00
Duncan ed753875d6 Finish peep_resize 
not tested.
 2014-08-23 08:08:15 +01:00
Duncan 6524f27706 Started addition of window_peep_resize 
Not tested.
 2014-08-23 08:08:14 +01:00
Duncan 581114b1e5 Added window_peep_close 
Not tested. Cancels any tool that was in use by the window.
 2014-08-23 08:08:14 +01:00
IntelOrca 1158a8876b Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master 
Conflicts:
	src/window_research.c
 2014-08-22 23:55:19 +01:00
zsilencer 0992a6adcd window_research_development_paint() ride names fix 
stringId from typeId was not working right, this fixes it and gives
correct research ride names
 2014-08-22 15:37:18 -06:00
zsilencer 6414d44306 window_research_development_paint() crash fix 
When the Currently in development Type: is "Ride" the game will crash,
looks like the wrong value is ANDed.
 2014-08-22 14:05:41 -06:00
IntelOrca 306ff79bc7 fix merge error 2014-08-21 22:54:27 +01:00
IntelOrca e9fab52db2 Merge branch 'new-ride-window' 
Conflicts:
	src/language.c
 2014-08-21 22:51:47 +01:00
IntelOrca 76ca655b0e finish window_new_ride 2014-08-21 22:50:06 +01:00
IntelOrca 25a31b9875 clear up window_new_ride a bit 2014-08-21 22:33:36 +01:00
IntelOrca b4e72cf960 add window_new_ride_paint_ride_information 2014-08-21 21:48:23 +01:00
Balletie 8d75552cf4 Fix build on OSX (missing include) 2014-08-21 11:57:54 +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 3a55af7403 Fix new file encodings 2014-08-20 23:53:51 +02:00
qcz fa6caa856a Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
IntelOrca 8644ed5b57 implement scroll mouse events for new ride window 2014-08-20 22:06:47 +01:00
IntelOrca 6ab6c5d9a6 add spanish language entry, #338 2014-08-20 20:32:25 +01:00
IntelOrca 8e4cc238cc fix window_new_ride_populate_list and add window_new_ride_scroll_to_focused_ride 2014-08-20 20:18:17 +01:00
qcz 250acea957 Rename tabIndex to staff_type, move staff max count constant to #define 2014-08-20 17:48:47 +02:00
qcz 12f6d57876 Fix pointer type 2014-08-20 17:39:41 +02:00
qcz f142cddbd6 Add return type to remove Travis warnings 2014-08-20 16:04:10 +02:00
qcz 1007e79baa Fix Travis error 2014-08-20 16:00:47 +02:00
qcz 92f0139b5a Move typedef to header file 2014-08-20 15:48:53 +02:00
qcz cb169952ac Remove unused variable, add indices to new_game_command_table 2014-08-20 15:38:21 +02:00
qcz 1b3f98362f Finalize hire-staff-command 2014-08-20 15:32:39 +02:00
qcz 6112668bcc Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-20 14:30:46 +02:00
qcz be1505c007 Fix missing comma 2014-08-20 09:37:28 +02:00
IntelOrca 01e32c301d improve new ride window populate docs 2014-08-20 07:50:01 +01:00
qcz 0e48e92949 Entertainers don't crash the game anymore 2014-08-20 07:23:02 +02:00
IntelOrca 9b08db7020 add window_new_ride_populate_list 2014-08-20 00:05:40 +01:00
qcz 4959bdd55d Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 23:52:23 +02:00
IntelOrca 16106c7569 Merge branch 'master' into new-ride-window 
Conflicts:
	src/window_new_ride.c
	src/window_research.c
 2014-08-19 21:43:25 +01:00
hexdec 540c8efd23 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-19 22:41:13 +02:00
hexdec de01827de9 Decompiled game shortcuts for viewport flags. 2014-08-19 22:39:22 +02:00
IntelOrca c7986d140c add widgets, sizing and basic events for new ride window 2014-08-19 21:33:05 +01:00
Ted John 654e40aaa5 Merge pull request #333 from qcz/hulang 
Add Hungarian language
 2014-08-19 21:31:57 +01:00
Ted John 9065837c9b Merge pull request #334 from qcz/316-fix 
Fix #316
 2014-08-19 21:31:18 +01:00
Ted John c7edafc627 Merge pull request #332 from duncanspumpkin/update_viewport_left 
Update viewport left and fix #318
 2014-08-19 21:30:32 +01:00
qcz 8f33388d37 Typo in variable name 2014-08-19 22:19:32 +02:00
qcz 06114c2116 Fix #316 2014-08-19 22:16:05 +02:00
Duncan Frost 71b6389ec7 Fix 1 pixel width ride_window 2014-08-19 20:54:58 +01:00
Duncan Frost 5f68d4b2a0 Fix #318. Issue caused by checking progressivly more incorrect coordinates for connection 2014-08-19 20:41:46 +01:00
Ted John 2a09b03c43 Merge pull request #331 from duncanspumpkin/fix_317 
Fix #317 crash on viewing news items
 2014-08-19 20:31:06 +01:00
qcz a4bab7cd0d Add Hungarian language 2014-08-19 21:17:20 +02:00
Duncan Frost 3307560a74 Merge branch 'upadate_viewport_left' of https://github.com/duncanspumpkin/OpenRCT2 into update_viewport_left 2014-08-19 19:56:41 +01:00
Ted John 274c2dc36f Merge pull request #330 from qcz/window-staff-registers 
Clean up most of the inline assembly from windows
 2014-08-19 19:35:06 +01:00
Duncan Frost 3df3ff4d1c Fix #317 crash on viewing news items caused by double pointer de ref and reuse of same pointers. 2014-08-19 19:34:31 +01:00
IntelOrca 37258b4710 add polish language entry, #329 2014-08-19 19:31:51 +01:00
qcz 6473fd2b97 Maybe this will statisfy Travis 2014-08-19 20:22:13 +02:00
qcz 5c22530965 Fix coordinate type to avoid invalid cast 2014-08-19 20:08:09 +02:00
qcz bd06c7caee Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
Duncan 56e6028a56 Rewrote to use map_elements 
not tested
 2014-08-19 12:48:00 +01:00
qcz 2bbba4672b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 09:46:25 +02:00
qcz c88a786399 Fix peep struct member name 2014-08-19 09:46:04 +02:00
IntelOrca e222b88581 start work on new ride window 2014-08-17 23:57:41 +01:00
Ted John b5d796b48e Merge pull request #322 from hexdec/master 
Fixed resize gripper not showing up on guest and staff windows.
 2014-08-17 22:23:37 +01:00
hexdec 2f5f65d607 Fixed resize gripper not showing up on guest and staff windows. 2014-08-17 22:40:34 +02:00
Ted John e36836366d Merge pull request #312 from hexdec/master 
Initial window_staff_peep_open create window
 2014-08-17 20:17:30 +01:00
hexdec ea43709c27 Fixed using wrong class & flag. 2014-08-17 21:11:26 +02:00
IntelOrca 92b74a8deb handle utf8 characters in languages, convert appropriately for #319 2014-08-17 19:20:45 +01:00
hexdec 7071f68670 Merge branch 'window_staff_peep' of https://github.com/duncanspumpkin/OpenRCT2 
Conflicts:
	src/window_peep.c
 2014-08-17 16:30:01 +02:00
Ted John 83c047e632 Merge pull request #315 from duncanspumpkin/fix_303 
Fix crash on right click of flat rides
 2014-08-17 12:46:33 +01:00
Ted John 4262366cf5 Merge pull request #314 from duncanspumpkin/fix_graph 
Fixes upside down graph
 2014-08-17 12:46:24 +01:00
Duncan Frost ca49b7ca09 Fix crash on right click of flat rides 2014-08-17 11:57:50 +01:00
Duncan Frost b0d39bbf0e Added sepearte file for staff_peep_window 2014-08-17 11:45:43 +01:00
Duncan Frost aa0709c439 Fixed clicking on peep causing hybrid 2014-08-17 11:01:34 +01:00
Duncan Frost 6258a76b96 Fixes upside down graph 2014-08-17 10:52:12 +01:00
Duncan Frost 1943682153 Fixed bug in toolbar widget drawing. Added pause and zoom out disable. 2014-08-17 10:11:19 +01:00
hexdec d3a55efd30 Added window_peep_staff_events. 2014-08-17 01:37:28 +02:00
hexdec 7285dbc339 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-17 01:08:41 +02:00
IntelOrca 2dcdb09d05 partial fix to #305 2014-08-16 19:07:13 +01:00
IntelOrca 9b64c576c4 fixes #293, closes #301 (min/max) and fixes #304 (research window bug) 2014-08-16 18:15:27 +01:00
Ted John e3c407d5b5 Merge pull request #302 from duncanspumpkin/viewport_left_down 
Viewport left down
 2014-08-16 15:30:10 +01:00
IntelOrca 8b503a4722 change options window to tab interface 
To better group the options together and allow the window to be scalable with additional OpenRCT2 options, I have changed the window to a tab interface similar to the options window seen in Locomotion.
 2014-08-16 15:29:15 +01:00
Duncan Frost 9e5412579a Moved old function comment to top of func 2014-08-16 14:40:07 +01:00
Duncan Frost ad8a96c196 Added remaining left click on viewport functions 2014-08-16 14:38:45 +01:00
Duncan Frost 1adeb35e69 Decompiled first part of left down 2014-08-16 00:43:19 +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 d8ab81c456 Fixed Zoom bug. No longer uses undefined behaviour. 2014-08-15 15:07:35 +01:00