mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenRCT2/src
History
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
..
addresses.h add research window 2014-08-15 22:05:35 +01:00
audio.c Improvements for a9091b41b6 2014-07-21 14:05:43 +02:00
audio.h Improvements for a9091b41b6 2014-07-21 14:05:43 +02:00
award.c Used defined flags macros. (and fixed indentation) 2014-07-25 17:56:43 +02:00
award.h fix award window bug and clean reset history 2014-05-28 01:50:50 +01:00
climate.c Merge pull request #221 from marcotc/rain 2014-07-22 07:29:42 +01:00
climate.h Improvements for a9091b41b6 2014-07-21 14:05:43 +02:00
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 refactor currency 2014-08-07 21:53:22 +01:00
currency.h refactor currency 2014-08-07 21:53:22 +01:00
cursors.h Added license 2014-07-28 17:45:49 +01:00
date.c Merge remote-tracking branch 'upstream/master' 2014-05-01 22:30:44 +02:00
date.h add string format and SDL get audio devices 2014-05-23 20:04:42 +01:00
editor.c make both game commands use same call and rename / use more commands in enum 2014-08-07 22:25:51 +01:00
editor.h Adding window_ride_init_vars and various enums 2014-05-07 21:17:26 +01:00
finance.c Fixes #286. Issue was caused by a typo. 2014-08-14 22:18:12 +01:00
finance.h implement finance research tab 2014-08-12 22:22:16 +01:00
game.c Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
game.h Move typedef to header file 2014-08-20 15:48:53 +02:00
gfx.c Fix build on OSX (missing include) 2014-08-21 11:57:54 +02:00
gfx.h Remove duplicate function. Change comment to prevent repeat 2014-08-14 07:22:47 +01:00
graph.c Fixes upside down graph 2014-08-17 10:52:12 +01:00
graph.h implement finances graph tabs and marketing 2014-08-11 01:09:17 +01:00
intro.c Viewport integrated into gfx_draw_sprite. 2014-08-10 11:11:43 +01:00
intro.h Add newlines to the end of every file (sed/unix do this) 2014-04-21 14:57:48 +05:30
language.c fix merge error 2014-08-21 22:54:27 +01:00
language.h add spanish language entry, #338 2014-08-20 20:32:25 +01:00
map.c fix comment typo and unclear abbreviation 2014-06-07 21:14:55 -07:00
map.h Cleanup and refactoring of ride reachability stuff 2014-05-29 23:07:19 +02:00
marketing.c implement finances graph tabs and marketing 2014-08-11 01:09:17 +01:00
marketing.h implement finances graph tabs and marketing 2014-08-11 01:09:17 +01:00
news_item.c Swapped sprite list to use global var 2014-06-29 14:51:18 +01:00
news_item.h renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
object.c Removed warnings. Only reads 4 characters for string id 2014-08-14 23:08:46 +01:00
object.h implement object_get_scenario_text 2014-05-26 17:59:42 +01:00
object_list.c implement object_get_scenario_text 2014-05-26 17:59:42 +01:00
osinterface.c Save screenshots when PrintScreen is pressed 2014-08-03 18:13:15 +02:00
osinterface.h Add the fullscreen mode to .ini config 2014-07-30 14:55:36 +02:00
park.c add research window 2014-08-15 22:05:35 +01:00
park.h add widgets, sizing and basic events for new ride window 2014-08-19 21:33:05 +01:00
peep.c Decompiling window_staff 2014-08-05 19:15:28 +02:00
peep.h Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
rct2.c add ability to change language 2014-08-14 23:46:36 +01:00
rct2.h fixes #293, closes #301 (min/max) and fixes #304 (research window bug) 2014-08-16 18:15:27 +01:00
ride.c Fix #318. Issue caused by checking progressivly more incorrect coordinates for connection 2014-08-19 20:41:46 +01:00
ride.h add window_new_ride_populate_list 2014-08-20 00:05:40 +01:00
ride_data.c add ride_rating type and fix new ride headers 2014-05-24 14:31:42 +01:00
ride_data.h add ride_rating type and fix new ride headers 2014-05-24 14:31:42 +01:00
ride_ratings.c add ride_rating type and fix new ride headers 2014-05-24 14:31:42 +01:00
ride_ratings.h implement park_calculate_guest_generation_probability 2014-05-26 23:44:47 +01:00
sawyercoding.c fixed RCT2_ERROR with GCC; added missing include 2014-05-25 11:47:22 +02:00
sawyercoding.h clean up scenario loading some more 2014-05-24 22:14:42 +01:00
scenario.c make both game commands use same call and rename / use more commands in enum 2014-08-07 22:25:51 +01:00
scenario.h add initial s6 structure 2014-05-28 00:05:11 +01:00
scenario_list.c fixed RCT2_ERROR with GCC; added missing include 2014-05-25 11:47:22 +02:00
screenshot.c Make RCT2 know if LodePNG failed 2014-08-03 17:45:19 +02:00
screenshot.h move settings to config and improve 2014-05-03 14:04:40 +01:00
sprite.c Swapped sprite list to use global var 2014-06-29 14:51:18 +01:00
sprite.h Started decompiling litter paint prep function 2014-08-10 11:11:37 +01:00
sprites.h finish finances summary page 2014-08-09 14:47:58 +01:00
staff.c Fix new file encodings 2014-08-20 23:53:51 +02:00
staff.h Fix new file encodings 2014-08-20 23:53:51 +02:00
string_ids.c add ability to change language 2014-08-14 23:46:36 +01:00
string_ids.h Merge branch 'new-ride-window' 2014-08-21 22:51:47 +01:00
title.c Removed compile errors. Implemented changes to window.h 2014-07-23 18:07:38 +01:00
title.h Add newlines to the end of every file (sed/unix do this) 2014-04-21 14:57:48 +05:30
track.c add additional authors in source code headers 2014-04-27 20:21:55 +01:00
track.h add track definitions 2014-04-23 01:50:40 +01:00
tutorial.c fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
tutorial.h implement keyboard shortcuts 2014-04-26 01:16:32 +01:00
util.c add string format and SDL get audio devices 2014-05-23 20:04:42 +01:00
util.h add string format and SDL get audio devices 2014-05-23 20:04:42 +01:00
vehicle.c Swapped sprite list to use global var 2014-06-29 14:51:18 +01:00
vehicle.h Added sprite list reset function. Identified more fields. 2014-06-20 15:31:28 +01:00
viewport.c Fix coordinate type to avoid invalid cast 2014-08-19 20:08:09 +02:00
viewport.h Fix coordinate type to avoid invalid cast 2014-08-19 20:08:09 +02:00
widget.c Fixed bug in toolbar widget drawing. Added pause and zoom out disable. 2014-08-17 10:11:19 +01:00
widget.h Deleted twice reversed function added note to prevent this happening. Labled global vars where noticed. 2014-07-19 11:22:45 +01:00
window.c Remove duplicate function. Change comment to prevent repeat 2014-08-14 07:22:47 +01:00
window.h Merge branch 'master' into new-ride-window 2014-08-19 21:43:25 +01:00
window_about.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +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_dropdown.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_dropdown.h fix dropdown argument arrays 2014-05-11 16:50:29 +01:00
window_error.c add screenshot and error window base functions 2014-04-25 18:25:34 +01:00
window_error.h add screenshot and error window base functions 2014-04-25 18:25:34 +01:00
window_finances.c Merge branch 'master' into new-ride-window 2014-08-19 21:43:25 +01:00
window_footpath.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_game_bottom_toolbar.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_game_top_toolbar.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_guest_list.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02: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 Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_new_campaign.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_new_ride.c finish window_new_ride 2014-08-21 22:50:06 +01:00
window_news.c Merge pull request #331 from duncanspumpkin/fix_317 2014-08-19 20:31:06 +01:00
window_options.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_park.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_peep.c Fixed resize gripper not showing up on guest and staff windows. 2014-08-17 22:40:34 +02:00
window_research.c Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master 2014-08-22 23:55:19 +01:00
window_ride_list.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_save_prompt.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_staff.c Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
window_staff_peep.c Fixed resize gripper not showing up on guest and staff windows. 2014-08-17 22:40:34 +02: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 Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_tooltip.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
window_tooltip.h add more input logic and tooltip window 2014-04-24 18:53:42 +01:00
window_water.c Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00