mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,810 Commits 8 Branches 40 Tags 376 MiB
Commit Graph

143 Commits

Author SHA1 Message Date
Maciek Baron aaef0e5e64 Labelling addresses, adding initial happiness calculation 2014-05-25 19:15:41 +01:00
IntelOrca 6d7b4b1808 add park update and guest generation 2014-05-25 13:59:31 +01:00
IntelOrca aba9a10f6a Merge branch 'map-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-map-window 2014-05-24 14:34:31 +01:00
IntelOrca 36e2cce045 add object list load 2014-05-24 01:34:17 +01:00
IntelOrca 98b01edaaa clean up scenario list 2014-05-23 23:52:13 +01:00
ddevrien 1249a09373 some more work on map window 2014-05-24 00:00:08 +02:00
anyc 7811497e8c rudimentary save prompt 2014-05-23 11:31:54 +02:00
anyc d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02:00
Maciek Baron 9e0c310320 Labelling path construction related addresses 2014-05-17 15:21:34 +01:00
Jørn Lomax 3fb61984f2 removed unwanted spaces 2014-05-14 12:28:03 +02:00
Jørn Lomax a104b4dd55 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/addresses.h
	src/config.c
 2014-05-14 12:19:39 +02:00
Jørn Lomax d1cec342f8 intermidiate commit 2014-05-14 11:54:56 +02:00
adrian17 31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. 2014-05-13 23:37:45 +02:00
Duncan Frost eb2682fbd4 Fix merge error 2014-05-13 19:03:23 +01:00
ddevrien e71170334f options window mouseup code 2014-05-13 00:13:23 +02:00
ddevrien 4550a1de68 More work on options window 
dropdown function
 2014-05-12 21:18:27 +02:00
Jørn Lomax fcfe5f271d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/config.c
 2014-05-12 17:31:25 +02:00
Jørn Lomax 3382be1430 intermidiate comit 2014-05-12 17:29:16 +02:00
ddevrien df97c22dae some strings added 2014-05-12 16:56:28 +02:00
ddevrien 85a1e4aa6d config addresses 
test
 2014-05-12 16:50:13 +02:00
IntelOrca 01fb20e397 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 19:23:57 +01:00
ddevrien 0ba23fe886 Some work on options window 2014-05-11 17:24:52 +02:00
IntelOrca 70e7660d0b add park_reset_awards_and_history 2014-05-11 01:18:56 +01:00
IntelOrca f8363e098b add park_init 2014-05-11 00:35:45 +01:00
Duncan Frost 26f4b35e61 Cleaned up code so that it makes more sense. 2014-05-10 12:26:19 +01:00
IntelOrca 61ceee26a7 remove extra scenario name address macro 2014-05-10 00:40:47 +01:00
Maciek Baron 0c34c3791c Cleaning up files and code related to windows 2014-05-08 21:48:31 +01:00
IntelOrca 9e6d19a672 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 22:42:01 +01:00
IntelOrca 3792b2b72e Merge branch 'scenario_update' of https://github.com/lnz/OpenRCT2 into lnz-scenario_update 2014-05-07 22:40:23 +01:00
Maciek Baron c70865457c Adding window_ride_init_vars and various enums 
Adding window_ride_init_vars and various enums, also decompiled one
unknown function.
 2014-05-07 21:17:26 +01:00
lnz 169a3b6b72 Implement Peep problem warnings update. 2014-05-07 16:24:36 +02:00
Maciek Baron aef83362bc Cleaning up small shared functions 
Cleaning up small shared functions and moving them to appropriate files
 2014-05-06 22:04:09 +01:00
IntelOrca d74bae8023 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-05 23:30:04 +01:00
Maciek Baron 1f00ad9110 Implemented a few functions in editor.c 2014-05-05 23:10:47 +01:00
lnz 589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00
IntelOrca a35a9f29a4 add guest list window 2014-05-05 03:27:17 +01:00
Maciek Baron 61238c70f3 Removing dupe address, adding OS hour and minute 2014-05-04 16:16:03 +01:00
ZedThree b3ea71c080 Replace more addresses with their named constants 
Also named window.var_4B2/4 as saved_view_x/y
 2014-05-04 13:11:31 +02:00
ddevrien 9cf6f8f98a Added some GAME_FLAGS 
Also renamed them to PARK_FLAGS and moved them to park.h, since they
have to do with each park, and are probably saved somewhere in the sv6
file.
 2014-05-03 13:39:36 +02:00
IntelOrca 74041396a1 fix scenario name string bug 2014-05-03 12:21:12 +01:00
IntelOrca d49cd5648d Merge branch 'master' into path-window 2014-05-02 02:14:39 +01:00
IntelOrca 34a1863291 add game_do_command 2014-05-02 02:12:14 +01:00
IntelOrca 9a95e73e3d add more info. to scenario_load_and_play 2014-05-02 00:18:49 +01:00
IntelOrca 2e5788c0ff reorganise addresses 2014-05-01 21:44:38 +01:00
Matthias Lanzinger 363f7c4c64 Identified monthly ride income location. 2014-05-01 22:32:14 +02:00
IntelOrca 90d38bf744 Merge branch 'master' into path-window 2014-05-01 17:02:37 +01:00
IntelOrca 7de26e9931 rename current day to current month ticks 2014-05-01 16:55:42 +01:00
IntelOrca b41ea1c141 add path removal 2014-04-30 19:35:37 +01:00
IntelOrca 46308abfe3 add cancel and set tool along with path refactor 2014-04-30 16:57:27 +01:00
IntelOrca 8632b76271 add provisional and placement of paths 2014-04-30 01:59:11 +01:00
Ben Pye 7c79d25c97 Add the logo window paint function and move some constants to addresses 2014-04-29 20:34:53 +01:00
Matthias Lanzinger 573929fee9 Identified full weather data table. 
Restructured weather data properly and made window_game_bottom_toolbar use
our table.
Used determine_future_weather in climate_reset.
 2014-04-28 19:59:40 +02:00
Matthias Lanzinger b3c279d9b5 Implement determining future weather. 2014-04-28 02:24:57 +02:00
Matthias Lanzinger b557f5bf1c Identified more climate related values. 2014-04-28 01:05:00 +02:00
Matthias Lanzinger 035fa16fc3 Crude start of a decompiled update_climate() 2014-04-27 23:46:18 +02:00
IntelOrca b8f5385050 add additional authors in source code headers 2014-04-27 20:21:55 +01:00
Matthias Lanzinger 0760dab657 decompile get_system_info() 2014-04-27 13:04:45 +02:00
Matthias Lanzinger d9f0225ee7 Fix RCT2_CALLFUNC 2014-04-27 04:22:50 +02:00
IntelOrca 2afb4e12eb add screenshot and error window base functions 2014-04-25 18:25:34 +01:00
IntelOrca ea4ea99212 add more input logic and tooltip window 2014-04-24 18:53:42 +01:00
Kevin Burke f82c2582c0 add address for ride properties 2014-04-22 23:13:53 +05:30
Kevin Burke e5a925e26c Add newlines to the end of every file (sed/unix do this) 2014-04-21 14:57:48 +05:30
IntelOrca 131673ab0d add graph drawing to park window 2014-04-18 22:47:25 +01:00
IntelOrca 3002c5dbe2 add land and image dropdown window 2014-04-18 19:00:27 +01:00
IntelOrca 8aed834665 add random title script 2014-04-18 16:26:45 +01:00
IntelOrca b366594a9c allow resizable park window with price added 2014-04-17 19:33:31 +01:00
IntelOrca 7ea9866efb get park window buttons working 2014-04-17 15:12:41 +01:00
IntelOrca eba4b6da9d add other pages to park window 2014-04-16 02:05:49 +01:00
IntelOrca 3f59b7ad9e add park objective window 2014-04-14 21:25:20 +01:00
IntelOrca c8f3c0ac2e add viewport drag 2014-04-14 14:32:05 +01:00
IntelOrca b98ca0e45b add land window 2014-04-13 22:23:56 +01:00
IntelOrca 8cbe0e7aa1 add more drawing of bottom toolbar 2014-04-11 17:38:15 +01:00
IntelOrca 5cb1600417 add bottom toolbar 2014-04-11 03:58:17 +01:00
IntelOrca ceb8f8113a add top toolbar and ride types 2014-04-11 02:42:39 +01:00
IntelOrca ee2b89a1b4 optimise drawing 2014-04-10 18:41:35 +01:00
IntelOrca b23c12d435 add scenario loading and title script 2014-04-10 15:14:47 +01:00
IntelOrca 5f74540a0f add drawing of some widgets 2014-04-09 22:35:29 +01:00
IntelOrca 481b8e23c0 add editor loading 2014-04-09 17:06:47 +01:00
IntelOrca c8d2b0bf1e add climate and date 2014-04-09 11:16:35 +01:00
IntelOrca 535e62f3aa add map initialisation 2014-04-09 03:09:30 +01:00
IntelOrca f5917e71f5 add ride initialisation 2014-04-09 02:39:28 +01:00
IntelOrca 286b43355a start work on window drawing 2014-04-08 17:52:39 +01:00
IntelOrca 1b92d895a2 add some park functions 2014-04-08 00:41:35 +01:00
IntelOrca 880e741341 add config load 2014-04-08 00:05:05 +01:00
IntelOrca 882c3fa9ae add scenario list loading 2014-04-06 17:45:09 +01:00
IntelOrca 5909a17dbc add some news item functions 2014-04-04 21:46:26 +01:00
IntelOrca 88f517f907 add loading of g1.dat 2014-04-04 19:59:32 +01:00
IntelOrca 7a83a8b1a8 fix window problems and add scenario select 2014-04-03 19:49:00 +01:00
IntelOrca 3a6a55147f add window functions and title screen windows 2014-04-03 03:08:06 +01:00
IntelOrca 0a12f15a25 add peep updating 2014-04-03 00:22:33 +01:00
IntelOrca 182db27ab3 add intro screen code 2014-04-02 16:46:58 +01:00
IntelOrca bfd3ad8b28 add window definitions and update all subroutine 2014-04-02 04:56:26 +01:00
IntelOrca 643db7ae01 initial commit 
Working game in SDL2 window but with various bugs and incomplete input
logic.
 2014-04-02 00:31:55 +01:00