Commit graph

1979 commits

Author SHA1 Message Date
Ted John
4943fe13ab Merge pull request #520 from IntelOrca/viewport-window
Viewport window
2014-10-14 01:20:56 +01:00
Ted John
6a8713573c Merge pull request #523 from mzmiric5/master
fix the /bin issue in the install script
2014-10-14 01:14:38 +01:00
Miso Zmiric (Mike Squinter)
fc7bf4da36 fix the /bin issue in the install script 2014-10-14 01:07:16 +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
Ted John
98b9f8ae91 Merge pull request #519 from duncanspumpkin/window_staff_peep
Window Staff
2014-10-12 15:13:07 +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
101ad48bc5 Merge branch 'ride-ratings' 2014-10-12 01:07:20 +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
Ted John
d7d13be6ab Merge pull request #518 from RollingStar/patch-5
New cheats screenshot, clearer download link
2014-10-11 19:22:55 +01:00
IntelOrca
77e3c7a65d implement ride_ratings_calculate_elevator and related functions 2014-10-11 18:55:56 +01:00
RollingStar
cadc608c7f New cheats screenshot, clearer download link 2014-10-11 13:46:01 -04: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
Ted John
608a09fdf0 Merge pull request #517 from nean/pickup-patch
Changed wrong assignment
2014-10-09 18:39:32 +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
faaba5addb Merge branch 'cmdline-scenario' 2014-10-09 01:40:47 +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
99d2b1a325 Merge branch 'research-update' 2014-10-08 22:12:28 +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