1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Commit Graph

50 Commits

Author SHA1 Message Date
Duncan Frost
47e41b5d82 Fix bug introduced in previous bug fixing!
Accidently switched two functions. Small refactor as well.
2015-06-04 20:15:27 +01:00
IntelOrca
f6eec3725c Merge branch 'develop' of https://github.com/marcotc/OpenRCT2 into marcotc-develop
Conflicts:
	src/openrct2.c
2015-06-04 11:54:27 +01:00
IntelOrca
ab2e6a867f refactor ride names and show ride type/s on object selection window 2015-06-03 19:14:45 +01:00
Marco Costa
f05d851811 Create simple test framework
* Run all tests by passing "test" as a command line argument to
'openrct2'
* Using CuTest 1.5 as a test framework
2015-06-01 21:45:12 -04:00
IntelOrca
6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +01:00
IntelOrca
1ac93e44c9 add twitch integration, part 1 2015-05-25 20:36:40 +01:00
Robert Jordan
ab942236d7 Added in-game object selection
New console commands:
- open (opens a window)
- windows (lists windows usable with open)
- load_object (loads the specified obj with the given filename)
- object_count (lists the number of objects in the scenary)
Console commands now have a usage variable.

Use: "open object_selection" for the object selection window.
Once the object selection window is closed, all objects will
automatically be researched whether or not they were already in the base
scenario.
The object selection window will close any other windows when selecting
an object to prevent a crash.
2015-05-23 14:56:54 -04:00
noitatum
3b9a5bd2f4 Decompiled 0x0069DEAD, it's now called finance_shift_expenditure_table.
Added some defines for the expenditure table size, the expenditure table saves the history up to 16 months but only shows 5 ingame.
Fixed an inconsitency with the assembler code in finance_init(), it only initializes the first month, not four.
2015-05-19 00:12:06 -03:00
Duncan Frost
5180c247d6 Fix scenario bugs.
Number of guests and currency were accidentaly being truncated to bytes. This was causing display issues when creating custom scenarios in OpenRCT2.
There was a small bug in research loading that was causing a crash due to exiting of a loop to early. As this was after a call to random this would only occur occasionally.
2015-05-18 22:21:12 +01:00
zsilencer
08a5bea762 game_command_demolish_ride 2015-04-25 09:20:14 -06:00
Timmy Weerwag
becd5454f5 Fix most confusing layout award
Wrong parentheses
2015-04-13 19:19:18 +02:00
Timmy Weerwag
930a9d61dd Fixes for a couple of warnings 2015-04-12 23:26:15 +02:00
Jackson Davis
4143574243 Rename and clean up 2015-04-05 07:55:04 -07:00
Jackson Davis
1a4ca6e19d Fix missing increment 2015-04-04 18:58:14 -07:00
Jackson Davis
f3f2e6c18b 66E407: news_item_peep_removed 2015-04-04 18:45:52 -07:00
IntelOrca
5c6a69b48f fix small bug in research_insert_researched 2015-04-01 18:33:30 +01:00
IntelOrca
32cbbb1e35 implement editor_fix_rct1_terrain 2015-03-31 18:24:49 +01:00
IntelOrca
509b2a1c6d implement research_populate_list_random 2015-03-31 17:09:16 +01:00
IntelOrca
4d11def81d implement editor_fix_rct1_scenery, editor_rct1_reset_research and research_remove_non_separate_vehicle_types 2015-03-31 15:17:43 +01:00
IntelOrca
1c1445d14f implement editor_load_rct1_default_objects 2015-03-31 13:06:34 +01:00
Duncan Frost
ac23ef2787 Research now resets funding when all rides finished. New string to indicate reasearch complete 2015-03-28 12:42:09 +00:00
Duncan Frost
b593dfbcd0 Fix #909. Ride name arguments incorrectly acessed 2015-03-25 18:30:59 +00:00
Kevin Burke
23bfd13ba9 replace ride_window_invalidate flags with constants 2015-03-23 08:33:07 -07:00
Kevin Burke
09431278e4 Name the ride window-invalidate flag 2015-03-23 08:33:07 -07:00
Kevin Burke
3862a85666 Name reliability variables
- Rename var_146 to fair_value (it is not reliability)
- Add a helper method get_age_penalty which computes the age penalty for
  a ride.
- Adds a constant for a ride's initial reliability
- Names a subroutine
2015-03-22 08:21:13 -07:00
IntelOrca
488282d653 name some of the ride type flags 2015-03-07 19:56:30 +00:00
IntelOrca
6ae0c10350 refactor ride type flag checks 2015-03-07 19:15:47 +00:00
Adrian Wielgosik
7f10024b8e Decompiled window_guest_list_open_with_filter 2015-03-05 21:02:14 +01:00
Duncan Frost
67b82b1065 Fix negative money due to cheat detection. 2015-02-20 19:45:23 +00:00
IntelOrca
dfc723573c fix expenditure table issues, fixes #762 2015-02-08 14:31:57 +00:00
Duncan Frost
43550e2a7b Fix small offset bugs. Label ride offsets 2015-01-24 19:48:26 +00:00
IntelOrca
dfb1f055b9 implement game_command_set_current_loan 2015-01-24 19:07:35 +00:00
IntelOrca
475c98c540 implement game_command_set_research_funding 2015-01-24 18:41:55 +00:00
IntelOrca
eec7e2e458 implement marketing_start_campaign 2015-01-24 18:22:06 +00:00
Duncan Frost
1fed6ac32c Added missing btm toolbar functions. Added dirty enum 2015-01-07 20:25:48 +00:00
Duncan Frost
4da2521967 Fix dirty money flag. 2015-01-05 18:48:55 +00:00
IntelOrca
d7212c1b14 implement inventions list window, fixes #630 2014-12-16 01:24:13 +00:00
IntelOrca
726fd9ef1d add RIDE_LIFECYCLE_18 to enum 2014-12-09 19:46:42 +00:00
Duncan Frost
cbd7e0c096 Reversed 684ac3 2014-11-30 22:00:41 +00:00
IntelOrca
d00001fed2 remove unnecessary header includes 2014-11-30 20:27:14 +00:00
IntelOrca
88b425f6a7 implement ride open station and ride open vehicle, partial fix for #601 2014-11-29 15:55:44 +00:00
IntelOrca
ece2522273 refactor window search functions 2014-10-16 02:02:43 +01:00
IntelOrca
6fe1bace20 refactor input (flags in particular) and add sub_6EA73F 2014-10-15 22:59:26 +01:00
IntelOrca
93c5bddd4e fix various research issues and improve 2014-10-08 22:11:50 +01:00
IntelOrca
daeb4d8c6d implement research_finish_item 2014-10-08 00:42:11 +01:00
IntelOrca
141f33acf8 implement research_next_design 2014-10-07 23:42:17 +01:00
IntelOrca
1d92e3d7ab Merge branch 'master' into reorganise-src
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	src/audio/audio.c
	src/audio/mixer.h
	src/game.c
	src/ride/vehicle.c
	src/windows/finances.c
	src/windows/research.c
2014-10-07 19:10:16 +01:00
IntelOrca
daf231a2e9 organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
IntelOrca
c8df6174b8 organisation: fix includes 2014-10-06 17:36:58 +01:00
IntelOrca
554e1fe70e organisation: move files and update project 2014-10-06 10:21:07 +01:00