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

203 Commits

Author SHA1 Message Date
IntelOrca 3d40c7e3ee add various ride mechanic functions 2014-11-02 01:41:00 +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
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 ae85fc265e implement window_map_tooltip 2014-10-17 02:01:58 +01:00
IntelOrca 6fe1bace20 refactor input (flags in particular) and add sub_6EA73F 2014-10-15 22:59:26 +01:00
IntelOrca 141f33acf8 implement research_next_design 2014-10-07 23:42:17 +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 95a9b1ca2e implement research_update 2014-10-05 15:23:52 +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
IntelOrca ac5985eaa0 refactor ride entries for ride window 2014-09-20 16:02:21 +01:00
zsilencer 961e151232 0x0069A5A0, 0x006AC988, couple fixes 2014-09-18 20:48:04 -06: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
King_Hual ec9177123c Changed staff modes to enum 2014-09-15 21:47:54 +03:00
King_Hual 1af884da0d Identified some addresses and structure fields, decompiled most of sub_6C0C3F. 2014-09-15 21:21:38 +03: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
qcz 10c2f10a24 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-09-03 21:20:43 +02:00
zsilencer a284d446ee Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	src/addresses.h
 2014-09-01 20:20:03 -06:00
zsilencer 6dd4110b89 useless functions decompiled 2014-09-01 19:59:39 -06:00
zsilencer 6de4fa1fcf low-hanging fruit 2014-09-01 15:42:56 -06:00
qcz 3408872a28 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-08-31 13:26:03 +02:00
qcz 3d7496c7c9 Started to work on init_scenery, added structs for different scenery entries 2014-08-31 13:24:20 +02:00
Patrick Wijnings b832a7235b More PARK_FLAGS_NO_MONEY updates. Implement finance_update_daily_profit(). 2014-08-31 13:01:50 +02:00
adrian17 f5841c24f4 Move input functions and add an address 2014-08-29 10:25:07 +02:00
Jackson Davis 57a2bc02fe Add structs/addresses for mouse buffer functions 2014-08-29 08:45:32 +01:00
qcz 0c0b3a752f window_scenery_paint and window_scenery invalidate is done 2014-08-27 22:50:33 +02:00
zsilencer fba1a81e07 audio_remove_timer, audio_create_timer, map_file, audio_timer_callback 2014-08-26 20:23:32 -06:00
zsilencer 08ab2cdfe8 some directsound decompilation 2014-08-26 16:34:34 -06:00
zsilencer f6fde582bf audio work 2014-08-25 23:11:57 -06:00
Ted John 4ddb26fc21 Merge pull request #364 from zsilencer/master 
Additional sound decompilation and fixes
 2014-08-25 19:14:45 +01:00
Marco Costa bb81bfd5d0 Created named address RCT2_ADDRESS_SCENARIO_TICKS 
* 0x00F663AC is now named RCT2_ADDRESS_SCENARIO_TICKS. This variable
starts at an arbitrary value, defined by the current scenario, and
increments by 1 on every game tick.
* Also, added meaningful name to some variables in draw_light_rain and
draw_heavy_rain.
 2014-08-24 21:27:56 -04:00
zsilencer 178a2fe3d0 Merge remote-tracking branch 'remotes/remote/master' 2014-08-24 14:50:11 -06:00
zsilencer 362082980f Audio things 2014-08-24 14:30:48 -06:00
Duncan Frost d095dce810 Finished viewport_update_position. 2014-08-24 17:39:34 +01:00
zsilencer 2b04c64e9c More decompiled sound functions 2014-08-24 04:45:59 -06:00
zsilencer 04e5a028d9 Fixed sound_remove, renamed variables, removed compiler warnings 2014-08-24 01:56:54 -06:00
zsilencer 31e2e4919a Decompiled audio functions 2014-08-23 23:50:50 -06: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
IntelOrca b13f31f73e implement finance research tab 2014-08-12 22:22:16 +01:00
Duncan Frost 57f17f62e5 Moved function to gfx.c added new addresses 2014-08-08 17:19:08 +01:00
Dániel Tar fa931e1ff0 Decompiling window_staff 2014-08-05 19:15:28 +02:00
Duncan Frost 425ab513a4 Started cleanup of process mouse over 2014-07-28 17:45:50 +01:00
Duncan Frost 2622df3777 Implemented LoadCursor function. 2014-07-28 17:45:43 +01:00
Duncan Frost 34e422fabe Rewrite. Potential mistake 2014-07-27 16:29:36 +01:00
Duncan Frost ede66261ef Added known addressess 2014-07-27 16:29:35 +01:00
Duncan Frost 00381d9313 Deleted twice reversed function added note to prevent this happening. Labled global vars where noticed. 2014-07-19 11:22:45 +01:00
Ted John 94bb349d24 Merge pull request #144 from MaciekBaron/master 
Labelling addresses, adding initial happiness calculation
 2014-07-19 11:11:16 +01:00
Duncan Frost 61a30b16fb Tidied up gfx_string. Deleted control char enum. Now uses string_ids enum to prevent multiple defs. 2014-06-15 10:09:28 +01:00
Maciek Baron 8a39d9d026 Merge with upstream 2014-06-14 15:55:07 +01:00
Duncan Frost b0475b3f15 Labeled global vars, removed obselete comments and changed to local text_palette. 2014-06-14 09:46:04 +01:00
anyc 2e7261e9cf fix GCC compilation 2014-06-13 16:43:52 +02:00
ZedThree 4fdba86b01 Add address for common string format buffer 2014-05-31 16:40:40 +02:00
ZedThree 6e778006a5 First pass for gfx_draw_string() 2014-05-31 16:40:37 +02:00
IntelOrca ccc9843633 Merge branch 'master' into gfx_unstable 2014-05-30 08:24:44 +01:00
IntelOrca 423db67148 add climate_update_sound 2014-05-28 22:53:28 +01:00
IntelOrca e489b999f3 fix picked-up staff and rain drawing 2014-05-28 18:11:33 +01:00
IntelOrca 74f5db4ebd Merge branch 'master' into gfx_unstable 2014-05-27 22:28:45 +01:00
IntelOrca a8182b945b improve guest generation with comments 2014-05-27 00:09:33 +01:00
IntelOrca 1b3c46c17d implement park_calculate_guest_generation_probability 2014-05-26 23:44:47 +01:00
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