mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity
Files
bd2ff2db05a6162b2505573e6fd10f698f46f8b2
OpenRCT2/src
History
IntelOrca bd2ff2db05 Merge branch 'master' into ride-window 
Conflicts:
	src/peep.c
	src/peep.h
2014-09-15 21:40:14 +01:00
..
addresses.h
Add flags to gcc assembler
2014-09-15 20:49:06 +01:00
audio.c
Added minimap window resizing
2014-09-12 03:59:43 +03:00
audio.h
Added minimap window resizing
2014-09-12 03:59:43 +03:00
award.c
implement more of ride window colour invalidate
2014-09-10 23:05:20 +01:00
award.h
…
climate.c
More decompiled sound functions
2014-08-24 04:45:59 -06:00
climate.h
…
config.c
add ability to change language
2014-08-14 23:46:36 +01:00
config.h
add ability to change language
2014-08-14 23:46:36 +01:00
currency.c
…
currency.h
…
cursors.h
…
date.c
…
date.h
…
editor.c
Changed staff modes to enum
2014-09-15 21:47:54 +03:00
editor.h
…
finance.c
finish implementing income tab on ride window apart from command events
2014-09-06 00:58:02 +01:00
finance.h
Fix definition of PARK_FLAGS_NO_MONEY flag and clean up related code.
2014-08-30 15:11:19 +02:00
game.c
Add notes to game_do_command. Explode magic number into parts
2014-09-15 20:49:04 +01:00
game.h
Merge branch 'master' into ride-window
2014-09-03 14:01:42 +01:00
gfx.c
Fix graphical bug when drawing inline sprites caused by using strlen instead of get_string_length
2014-09-15 20:49:18 +01:00
gfx.h
Update gfx_draw_rain declaration to match definition
2014-08-24 21:33:09 -04:00
graph.c
Fixes upside down graph
2014-08-17 10:52:12 +01:00
graph.h
…
input.c
More cleanup of code. Reverted to old dropdown format
2014-09-13 08:58:46 +01:00
input.h
Move input functions and add an address
2014-08-29 10:25:07 +02:00
intro.c
More decompiled sound functions
2014-08-24 04:45:59 -06:00
intro.h
…
language.c
added swedish to language list
2014-09-11 13:05:18 +02:00
language.h
added swedish to language list
2014-09-11 13:05:18 +02:00
map.c
Decompile window_rotate_camera, change sub_689174 to use z parameter
2014-09-04 22:53:40 +02:00
map.h
Added window_peep_overview_tool_down. Modified RCT2_CALLPROC_X to return the flags register.
2014-09-15 20:49:06 +01:00
marketing.c
Identified some addresses and structure fields, decompiled most of sub_6C0C3F.
2014-09-15 21:21:38 +03:00
marketing.h
…
news_item.c
Merge branch 'master' into ride-window
2014-09-15 10:45:32 +01:00
news_item.h
…
object_list.c
…
object.c
Removed warnings. Only reads 4 characters for string id
2014-08-14 23:08:46 +01:00
object.h
…
osinterface.c
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-09-01 20:20:03 -06:00
osinterface.h
useless functions decompiled
2014-09-01 19:59:39 -06:00
park.c
implement measurements tab on ride window
2014-09-05 18:10:30 +01:00
park.h
More PARK_FLAGS_NO_MONEY updates. Implement finance_update_daily_profit().
2014-08-31 13:01:50 +02:00
peep.c
Merge branch 'master' into ride-window
2014-09-15 21:40:14 +01:00
peep.h
Merge branch 'master' into ride-window
2014-09-15 21:40:14 +01:00
rct2.c
some directsound decompilation
2014-08-26 16:34:34 -06:00
rct2.h
implement measurements tab on ride window
2014-09-05 18:10:30 +01:00
ride_data.c
Merge branch 'master' into ride-window
2014-09-15 21:40:14 +01:00
ride_data.h
finish operating tab on ride window
2014-09-09 17:17:08 +01:00
ride_ratings.c
finish invalidate event for ride window
2014-09-09 14:16:09 +01:00
ride_ratings.h
…
ride.c
implement more of ride window colour invalidate
2014-09-10 23:05:20 +01:00
ride.h
implement dropdowns for window ride colour tab
2014-09-14 18:43:36 +01:00
sawyercoding.c
…
sawyercoding.h
…
scenario_list.c
…
scenario.c
Don't use sizeof() in pointer arithmetic or as indices; use found variables
2014-09-14 21:50:20 +02:00
scenario.h
Identified some addresses and structure fields, decompiled most of sub_6C0C3F.
2014-09-15 21:21:38 +03:00
scenery.h
Finalize scenery window, fix encoding
2014-09-06 01:09:12 +02:00
screenshot.c
…
screenshot.h
…
sprite.c
Incorporated suggested change by @qcz and fixed an enum member name and a compiler warning
2014-09-06 23:46:45 +02:00
sprite.h
Incorporated suggested change by @qcz and fixed an enum member name and a compiler warning
2014-09-06 23:46:45 +02:00
sprites.h
start implementing the first page for ride window
2014-08-25 18:29:04 +01:00
staff.c
Changed staff modes to enum
2014-09-15 21:47:54 +03:00
staff.h
Changed staff modes to enum
2014-09-15 21:47:54 +03:00
string_ids.c
Fix graphical bug when drawing inline sprites caused by using strlen instead of get_string_length
2014-09-15 20:49:18 +01:00
string_ids.h
Merge branch 'master' into ride-window
2014-09-15 21:40:14 +01:00
title.c
few basic functions decompiled and small bug fix
2014-09-01 00:12:46 -06:00
title.h
…
track.c
…
track.h
…
tutorial.c
…
tutorial.h
…
util.c
…
util.h
…
vehicle.c
…
vehicle.h
Merge branch 'master' into ride-window
2014-09-09 00:11:03 +01:00
viewport.c
Fix off-by-one error in center_2d_coordinates
2014-09-04 22:53:54 +02:00
viewport.h
Decompile window_rotate_camera, change sub_689174 to use z parameter
2014-09-04 22:53:40 +02:00
widget.c
fixes #279, WWT_24 no longer shows a checkbox
2014-09-05 23:46:35 +01:00
widget.h
…
window_about.c
Initial work on music credits.
2014-09-11 17:44:23 +02:00
window_banner.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_cheats.c
Maybe this will statisfy Travis
2014-08-19 20:22:13 +02:00
window_clear_scenery.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_credits.c
Changed place on WC_MUSIC_CREDITS and WC_PUBLISHER_CREDITS.
2014-09-11 18:55:19 +02:00
window_dropdown.c
implement dropdowns for window ride colour tab
2014-09-14 18:43:36 +01:00
window_dropdown.h
implement dropdowns for window ride colour tab
2014-09-14 18:43:36 +01:00
window_error.c
…
window_error.h
…
window_finances.c
refactor ride structure
2014-09-03 23:17:31 +01:00
window_footpath.c
Move to viewport.c
2014-09-02 19:10:49 +02:00
window_game_bottom_toolbar.c
Merge remote-tracking branch 'IntelOrca/master'
2014-08-30 15:18:31 +02:00
window_game_top_toolbar.c
Merge remote-tracking branch 'upstream/master' into scenery-window
2014-08-31 13:26:03 +02:00
window_guest_list.c
Moved get_peep_face_sprite to peep.c added stats_tab paint
2014-09-15 20:48:59 +01:00
window_land.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_main.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_map.c
Added C code instead of address call
2014-09-13 03:11:51 +03:00
window_new_campaign.c
refactor ride structure
2014-09-03 23:17:31 +01:00
window_new_ride.c
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
window_news.c
Changed struct for last time
2014-08-23 08:30:31 +01:00
window_options.c
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-09-01 20:20:03 -06:00
window_park.c
implement ride rename for ride window
2014-09-02 14:05:44 +01:00
window_peep.c
Merge branch 'master' into ride-window
2014-09-15 21:40:14 +01:00
window_research.c
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
window_ride_list.c
Merge branch 'master' into ride-window
2014-09-03 23:18:53 +01:00
window_ride.c
implement dropdowns for window ride colour tab
2014-09-14 18:43:36 +01:00
window_save_prompt.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_scenery.c
fix crash of scenery window when selecting the first entry of a given type
2014-09-09 19:38:19 +02:00
window_scenery.h
replace RCT2_GLOBAL calls with macros where possible
2014-09-06 13:31:33 +02:00
window_staff_peep.c
Added window_peep_overview_tool_update
2014-09-15 20:49:05 +01:00
window_staff.c
Identified some addresses and structure fields, decompiled most of sub_6C0C3F.
2014-09-15 21:21:38 +03:00
window_title_exit.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_title_logo.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_title_menu.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_title_scenarioselect.c
Moved get_peep_face_sprite to peep.c added stats_tab paint
2014-09-15 20:48:59 +01:00
window_tooltip.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window_tooltip.h
…
window_water.c
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
window.c
Merge branch 'master' into ride-window
2014-09-15 10:45:32 +01:00
window.h
Merge branch 'master' into ride-window
2014-09-15 21:40:14 +01:00