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

279 Commits

Author SHA1 Message Date
Duncan Frost 67b82b1065 Fix negative money due to cheat detection. 2015-02-20 19:45:23 +00:00
IntelOrca 647d9a42a5 Merge branch 'develop' into random-map 
Conflicts:
	projects/openrct2.vcxproj.user
 2015-02-09 14:30:41 +00:00
IntelOrca 4a9dfcc849 implement scenario_create_ducks 2015-02-08 15:37:33 +00:00
IntelOrca 1298031fd2 Merge branch 'develop' into random-map 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	projects/openrct2.vcxproj.user
	src/editor.c
	src/input.c
	src/platform/osinterface.c
	src/rct2.c
	src/scenario.c
	src/world/map.h
 2015-02-08 03:05:07 +00:00
Duncan Frost 0f6dd51736 Added load_palette. Labelled offset for paused and palette effect frame. Fixed fast moving water. 2015-02-07 17:40:20 +00:00
IntelOrca 36971b29cb implement game_command_set_park_name and game_command_remove_park_entrance 2015-01-27 21:18:41 +00:00
IntelOrca 8774731f03 refactor map element iteration 2015-01-22 00:19:05 +00:00
IntelOrca 0ff125b9b3 move across useful map functions and other bits from footpath branch to develop 2015-01-14 23:38:48 +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 bfafc0e149 fix warnings and only allow cheats in play mode 2014-12-09 19:55:17 +00:00
IntelOrca 325c5243e8 change plugin.dat to be saved in user directory and stop repeated load of title screen when failed 2014-11-30 22:16: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 31ebf03c30 implement enter name on scenario complete, closes #605 2014-11-30 02:17:01 +00:00
IntelOrca 35145f897b optimise writing of checksum on save scenario 2014-11-28 18:00:18 +00:00
IntelOrca 4b897ae1a3 implement saving of games and scenarios 2014-11-26 00:51:26 +00:00
IntelOrca e6fc8cacf8 implement scenario_prepare_rides_for_save 2014-11-25 22:38:47 +00:00
IntelOrca d9e0f8ff6a implement save scenario and fix various load / save dialog issues, fixes #433 2014-11-25 02:06:26 +00:00
IntelOrca adb5f84f55 implement editor_convert_save_to_scenario 2014-11-23 23:03:59 +00:00
Duncan Frost 913adaffa0 Added error messages to loading objects 2014-11-21 19:09:20 +00:00
IntelOrca 335774dc08 add log level check so that --verbose option works 2014-11-21 18:39:56 +00:00
Duncan Frost 7252667a25 Implemented the same changes to scenario load. Error messages now copied onto cmd prompt 2014-11-20 19:02:27 +00:00
IntelOrca 3d40c7e3ee add various ride mechanic functions 2014-11-02 01:41:00 +00:00
IntelOrca 217ae84c62 add cross platform interface for enumerating files 2014-10-17 03:22:45 +01:00
IntelOrca ece2522273 refactor window search functions 2014-10-16 02:02:43 +01:00
IntelOrca 71e508c416 refactor various platform functions and includes 2014-10-09 14:03:54 +01:00
IntelOrca a35ebea72a improve command line parsing 2014-10-09 01:36:59 +01:00
IntelOrca dcb7fde625 Merge branch 'master' into cmdline-scenario 2014-10-08 23:32:51 +01:00
IntelOrca c8df6174b8 organisation: fix includes 2014-10-06 17:36:58 +01:00
Duncan Frost 335aca4164 Cso now partially working. 2014-10-01 18:52:53 +01:00
IntelOrca f026f92d1e start implementation of track list window 2014-09-27 00:41:24 +01:00
IntelOrca 03048edfed begin simple map generator 2014-09-25 02:39:17 +01:00
IntelOrca f708a70976 Merge branch 'cmdline-scenario' into random-map 2014-09-25 01:44:49 +01:00
IntelOrca 31eec46c4d allow scenarios from any location to be started via command line 2014-09-08 19:58:15 +01:00
IntelOrca caa7a50ec2 implement measurements tab on ride window 2014-09-05 18:10:30 +01:00
IntelOrca 76fda20859 implement ride window drawing 2014-09-03 19:13:37 +01:00
Patrick Wijnings b832a7235b More PARK_FLAGS_NO_MONEY updates. Implement finance_update_daily_profit(). 2014-08-31 13:01:50 +02:00
Patrick Wijnings 81163506e9 Merge remote-tracking branch 'IntelOrca/master' 
Conflicts:
	src/game.c
	src/park.h
 2014-08-30 15:18:31 +02:00
Patrick Wijnings 5e96da6634 Fix definition of PARK_FLAGS_NO_MONEY flag and clean up related code. 2014-08-30 15:11:19 +02:00
adrian17 b6f98167c4 Use macros from addresses.h 2014-08-28 17:27:48 +02: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
IntelOrca 16b552270b add rct_ride_type structure 2014-08-24 23:02:19 +01:00
IntelOrca 96aaa87543 make both game commands use same call and rename / use more commands in enum 2014-08-07 22:25:51 +01:00
adrian17 c6e94ebd79 Change some comparisons in scenario_objectives_check() 2014-07-27 16:11:13 +02:00
Duncan Frost d68e716cd8 Removed compile errors. Implemented changes to window.h 2014-07-23 18:07:38 +01:00
adrian17 843c45aafc Use address names from addresses.h 2014-07-18 22:28:15 +02:00
Duncan Frost 3a3cbbc7c4 Fixed another small window bug and changed to using global window list var 2014-07-10 21:22:32 +01:00
Duncan Frost 32624b912c Tried swaping to a global variable for ride_list 2014-06-29 14:38:38 +01:00
Duncan Frost 1aaa88afae Added 0x69E9A7 2014-06-21 15:50:13 +01:00
Duncan Frost 9c4f06a04b Added another reset function 2014-06-21 13:31:28 +01:00
lnz 35b38f3c16 Remove debug statements and add string_ids for ride connected functions. 2014-05-30 00:12:29 +02:00
lnz 978bc39d25 Name various ride variables, clear a warning in map.c, add a note in 
scenario
 2014-05-29 23:42:24 +02:00
lnz 5e104477d3 Cleanup and refactoring of ride reachability stuff 2014-05-29 23:07:19 +02:00
lnz 64bece0246 Initial implementation of ride reachability checks 2014-05-29 23:07:19 +02:00
IntelOrca d8a61d9792 fix award window bug and clean reset history 2014-05-28 01:50:50 +01:00
IntelOrca 65e579045c show full date in bottom right panel 2014-05-27 21:28:16 +01:00
IntelOrca 72b2272b1f apply loop macros and implement more awards 2014-05-27 18:03:25 +01:00
IntelOrca 30e6358fd4 implement more awards WIP 2014-05-27 15:14:45 +01:00
IntelOrca 88ffb17a4a add initial update awards implementation 2014-05-27 14:00:13 +01:00
IntelOrca 6d824fd3a8 fix compile error and add update history placeholder 2014-05-27 00:35:14 +01:00
IntelOrca 1b3c46c17d implement park_calculate_guest_generation_probability 2014-05-26 23:44:47 +01:00
IntelOrca 7190e4c3f6 implement object_get_scenario_text 2014-05-26 17:59:42 +01:00
IntelOrca 092764ea6b separate marketing and add finances window 2014-05-25 23:17:55 +01:00
IntelOrca 5b568f376c add peep_applause 2014-05-25 19:47:11 +01:00
IntelOrca 6d7b4b1808 add park update and guest generation 2014-05-25 13:59:31 +01:00
IntelOrca d5ad84a7d1 clean up scenario loading some more 2014-05-24 22:14:42 +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
IntelOrca 01da128c14 add money types 2014-05-23 12:15:08 +01:00
anyc d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02:00
anyc e6c90c6ebb fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
anyc 82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
Maciek Baron d5d352cd41 Implementing small loan & cheat detection related routine 2014-05-17 16:04:19 +01:00
adrian17 31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. 2014-05-13 23:37:45 +02:00
IntelOrca 7c6a193b42 remove all remaining warnings 2014-05-12 02:18:08 +01:00
IntelOrca 8dcca91092 mass clean up and reduce warnings 2014-05-12 01:45:45 +01:00
lnz bb12fc1a42 Implement update for ride favourited numbers 2014-05-11 23:21:26 +02:00
lnz 19a475f05a Implement ride upkeep payments 2014-05-11 23:17:20 +02:00
IntelOrca 70e7660d0b add park_reset_awards_and_history 2014-05-11 01:18:56 +01:00
Maciek Baron d3382e3a38 Renaming ride construction content 2014-05-09 23:43:10 +01:00
Maciek Baron 73d06418b6 Adding ride build date, reset function 2014-05-09 23:40:38 +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
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 840c76b68e Fix month not changing bug and wage cost bug. 2014-05-07 16:28:42 +02:00
lnz 169a3b6b72 Implement Peep problem warnings update. 2014-05-07 16:24:36 +02:00
lnz 589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00
lnz 48caec8b58 Label unimplemented functions in scenario_update 2014-05-05 22:14:17 +02:00
IntelOrca 9b6873f09e add checksum validation for load sc6 and sv6 2014-05-04 17:34:13 +01:00
IntelOrca a0976e2f40 add load saved game 2014-05-04 16:21:15 +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
IntelOrca 038dbe9668 fix call for scenario_entrance_fee_too_high_check 2014-05-03 14:43:56 +01:00
IntelOrca 973872558c fix scenario_entrance_fee_too_high_check 2014-05-03 14:38:03 +01:00
Matthias Lanzinger 72adb4d8bf Documentation and copyright. 2014-05-03 14:57:50 +02:00
Matthias Lanzinger 97cab96ea6 Renamed some ride values and some fixups from the merge. 2014-05-03 14:51:35 +02:00
Matthias Lanzinger 02ae959a85 Implemented check for objective 8 (10 rollercoasters, min excitement, min 
length)
 2014-05-03 14:36:36 +02:00
Matthias Lanzinger 15fc63eecb Refactoring 2014-05-03 14:36:35 +02:00
Matthias Lanzinger 6c2a7a0a29 Implement news_item_add_to_queue and some bugfixes. 2014-05-03 14:36:34 +02:00
Matthias Lanzinger b3d36869ef Leftover debug call 2014-05-03 14:35:12 +02:00
Matthias Lanzinger 68ab137571 Rename marketing_finished to marketing_update. 2014-05-03 14:35:12 +02:00
Matthias Lanzinger 935284f53d Implement marketing campaign updating. 2014-05-03 14:35:11 +02:00
Matthias Lanzinger bf03c21de9 Implement entrance fee too high check. Some refactoring. 2014-05-03 14:35:11 +02:00
Matthias Lanzinger ddce193f4a Implement "Finish 5 rollercoaster..:" objective check and some fixups 2014-05-03 14:35:11 +02:00
Matthias Lanzinger efc4095d85 Added check for 10 rollercoaster objective 2014-05-03 14:35:10 +02:00
Matthias Lanzinger e1f5c62fcc Implement scenario success and failure procedures. 2014-05-03 14:35:10 +02:00
Matthias Lanzinger fc02eef2a9 Implement simple objective checks 2014-05-03 14:35:09 +02:00
Matthias Lanzinger c2965a4f9e Make scenario update timeframes clearer 2014-05-03 14:35:08 +02:00
Matthias Lanzinger ad0d77a49c Start implementation of scenario_update. 2014-05-03 14:35:08 +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 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 00dcb2941e finish scenario start and add park size calculate 2014-05-01 19:35:47 +01:00
ZedThree 6f756bb458 Replace variable addresses with named constants 
Done automatically with sed/unix
 2014-04-28 22:00:54 +02:00
Kevin Burke 41358c734a Replace address references with named constant 2014-04-21 15:00:18 +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 03db7f5bc0 anchor bottom toolbar to window width 2014-04-15 02:36:58 +01:00
IntelOrca 3f59b7ad9e add park objective window 2014-04-14 21:25:20 +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 32dec4ab52 add some object loading 2014-04-10 17:08:41 +01:00
IntelOrca b23c12d435 add scenario loading and title script 2014-04-10 15:14:47 +01:00
IntelOrca ea83736d5a improve scenario structures 2014-04-10 03:23:12 +01:00
IntelOrca 3ae8971340 add scenario / saved game decoding 2014-04-10 00:22:57 +01:00
IntelOrca d86799e8fc finish scenario select 2014-04-09 18:38:04 +01:00
IntelOrca 286b43355a start work on window drawing 2014-04-08 17:52:39 +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