mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,456 Commits 8 Branches 40 Tags 334 MiB
Commit Graph

2641 Commits

Author SHA1 Message Date
danidoedel c736face55 fix status label position 2015-06-04 17:29:47 +02:00
danidoedel 89e4b1c824 fix status label position 2015-06-04 17:27:56 +02:00
Thomas 70edd18a36 Fix #1214 2015-06-04 15:13:18 +02:00
IntelOrca 67c6e899c1 fix motion simulator ride rating calculation 2015-06-04 12:56:24 +01:00
IntelOrca bb309f34c6 refactor test project and add ride ratings test 2015-06-04 12:46:17 +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 43f54cd729 implement more ride rating calculations 2015-06-04 02:08:52 +01:00
IntelOrca efcfbf9a26 implement more ride rating calculations and fix bugs 2015-06-03 22:36:47 +01:00
Ted John 3e08ada75e Merge pull request #1210 from duncanspumpkin/fix_bugs 
Fix bugs
 2015-06-03 21:13:50 +01:00
Duncan Frost c9543005de Fix small issues with scrolling. 
I've found the cause of the cursors not correctly changing. It would appear ebx is popped to its previous value as the call function returns. This causes the cursor value to never change. This can be solved when all windows are complete. Fixes points i, ii, iii, iv of #1127 (Fixed by reseting scroll positions when the height is 0. And actually passing the scroll index to the calling function)
 2015-06-03 20:54:28 +01:00
Ted John 0cc54ca1f1 Merge pull request #1209 from danidoedel/patch-2 
Scenario Editor: fix entry price label position
 2015-06-03 19:19:19 +01:00
IntelOrca ab2e6a867f refactor ride names and show ride type/s on object selection window 2015-06-03 19:14:45 +01:00
Duncan Frost 21b57e90a3 Stop plain clothes handymen. 
Accidentally was not reseting the image offset whenever a peep changed sprite.
 2015-06-03 19:14:07 +01:00
Duncan Frost 9dfa9b1461 Fix #1161 
In the editor map window the string displaying the current tool size was not checking to make sure the tool was active before displaying the size.
 2015-06-03 19:04:13 +01:00
Duncan Frost 17abada57e Fix invalid locations breaking viewports 
Fixes #1183. Note this isn't the same fix that rct2 uses. But I feel it solves the main issue
 2015-06-03 19:00:16 +01:00
danidoedel 578d676b7f fix entry price label position 2015-06-03 19:25:16 +02:00
Ted John 0910f97fdf Merge pull request #1208 from trigger-death/object-selection-filter 
Object Selection Filters
 2015-06-03 18:13:25 +01:00
Duncan Frost fb1c8c4e42 Check against invalid tiles correctly 2015-06-03 18:02:41 +01:00
Robert Jordan ee00962ac9 Object Selection Filters 
Can now filter objects in the selection window by source. (RCT2, WW, TT,
Custom)
Object selection window now displays source above dat name.
 2015-06-03 12:37:07 -04:00
IntelOrca 463131117c fix edit command line function 2015-06-03 17:11:52 +01:00
IntelOrca 899c563d35 improve sprite compiler 2015-06-03 03:11:54 +01:00
Ted John 3e9e17e679 Merge pull request #1203 from trigger-death/MOM-saftey-checks 
Added some M.O.M. safety checks.
 2015-06-02 22:41:57 +01:00
Robert Jordan d1bc98e121 Added some M.O.M. safety checks. 
Parks using M.O.M. and other hackish features should be less likely to
crash now.
 2015-06-02 17:31:45 -04:00
Ted John 5cae4da1b6 Merge pull request #1201 from trigger-death/remove-clear-scenery-function-usage 
Removed unecissary usage of clear scenery tool
 2015-06-02 22:22:06 +01:00
Robert Jordan 44e5af5fe0 Removed unecissary usage of clear scenery tool 2015-06-02 16:43:21 -04:00
IntelOrca caa6155259 fix HTTP request URL bug 2015-06-02 21:09:52 +01:00
IntelOrca e42333df05 add go karts ride rating calculation and fix rating bugs 2015-06-02 21:07:46 +01:00
IntelOrca 1d622ed3e2 add more ride rating calculations and refactor ride operation mode 2015-06-02 19:59:55 +01:00
Ted John 6a39115941 Merge pull request #1199 from ThomasdenH/map_generator_improvements 
Add new map generation icons and make description wider
 2015-06-02 16:01:20 +01:00
Thomas 857e104153 Add new map generation icons and make description wider 2015-06-02 16:52:00 +02:00
Ted John 9144080ef7 Merge pull request #1197 from ThomasdenH/develop 
Sprite tool now can export all sprites in a file
 2015-06-02 14:45:04 +01:00
IntelOrca 137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01:00
Thomas den Hollander 2f6bff4def #include fix 2015-06-02 13:37:18 +02:00
Thomas df25e7a15a Add command 'exportall' to sprite tool 2015-06-02 12:50:16 +02:00
zsilencer 14b9445d8a make texture screen blit faster 2015-06-02 02:21:07 -06: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 f827234dc8 fix sprite compile issue, entry offsets were not updated when data was reallocated. 2015-06-02 00:53:51 +01:00
Ted John 954db85e8c Merge pull request #1193 from zsilencer/bugfix 
#1192
 2015-06-01 21:36:54 +01:00
Ted John a63b7906c8 Merge pull request #1191 from ThomasdenH/develop 
Add dithering to sprite importer
 2015-06-01 21:36:14 +01:00
zsilencer 603233a583 #1192 2015-06-01 13:07:18 -06:00
Robert Jordan c0ea64b83d Minor visual improvements 2015-06-01 11:38:27 -04:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Thomas a3368c4a54 Fix issue 2015-06-01 15:14:15 +02:00
Thomas f262ef977d Fix warning and remove debugging 2015-06-01 14:04:35 +02:00
Thomas c266c21c9c Fix overflow issue 2015-06-01 13:19:40 +02:00
Thomas 55456559bb Added dithering and closest pixel conversion for sprite tool 2015-05-31 20:35:40 +02:00
rd3k 9d7dc3bacc Use uint16 for park size 2015-05-31 13:00:39 +01:00
rd3k 395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
IntelOrca 1fdf1f57f7 add zoom button images to viewport window 2015-05-31 00:20:42 +01:00
Robert Jordan 3fae3c2017 Resolved more conflicts 2015-05-30 16:03:39 -04:00
Robert Jordan 41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
rd3k 3bd079a9f4 Add handy input windows to mapgen first tab 2015-05-30 20:10:10 +01:00
Robert Jordan eb19ae7995 Final changes 2015-05-30 12:43:24 -04:00
Robert Jordan 53a241d197 Finished ini file loading and removed warnings 2015-05-30 11:52:08 -04:00
IntelOrca 4bb4b197dd make small change to screenshot command line 2015-05-30 13:06:36 +01:00
IntelOrca 85bf7c77d0 Merge branch 'cmdline-screenshot' into develop 2015-05-30 13:03:16 +01:00
Ted John e9f7ec0a6a Merge pull request #1172 from duncanspumpkin/cmdline-screenshot 
Fix rotation issue
 2015-05-30 13:02:38 +01:00
Ted John b7d293f4dd Merge pull request #1171 from duncanspumpkin/toolbar_funcs 
Toolbar Update Functions
 2015-05-30 13:00:25 +01:00
Ted John ba48b474b9 Merge pull request #1170 from zsilencer/bugfixes 
#1165
 2015-05-30 12:59:45 +01:00
IntelOrca 8bc877ad27 Merge branch 'cmdline-screenshot' into develop 2015-05-30 12:54:45 +01:00
IntelOrca 0b058cfab0 finish giant screenshots and bugs 2015-05-30 12:54:10 +01:00
Duncan Frost 3bd3fccb57 Fix rotation disapearing sprites 
This was caused by the sprite quadrant assignment not being reset when a new rotation was assigned
 2015-05-30 10:15:29 +01:00
Duncan Frost 0954687973 Refactor ofviewport code slightly 
Fix potential water height bug
 2015-05-30 10:00:33 +01:00
Duncan Frost 2532e9aad2 Added try_place_ghost_scenery. 
Ghost scenery placement is now performed by OpenRCT2 game commands.
 2015-05-30 07:04:15 +01:00
Duncan Frost e04f649d2a Added scenery_large_update 
From quick test seems to be working
 2015-05-30 06:27:55 +01:00
Duncan Frost eef779378e Added more of update_scenery 
Only large scenery missing
 2015-05-30 06:27:54 +01:00
Duncan Frost 5578a16663 Started update_scenery 2015-05-30 06:27:54 +01:00
Duncan Frost b2caeaf531 Refactor of code slightly 
Since get_map_coordinates_from_pos returns sint16 values I changed it so that it didn't use sint32 values.
 2015-05-30 06:27:52 +01:00
Duncan Frost a59fd26b3d Added update_water 
Refactored up/down water commands so that it used more standard layout.
Not tested.
 2015-05-30 06:27:51 +01:00
Duncan Frost 24f9898ce6 Fixed bug with land direction 
This would cause the cursor to highlight the opposite tile when hovering over bottom left and bottom right
 2015-05-30 06:27:50 +01:00
Duncan Frost 5fa982f08b Added tool_update_land 
Not tested
 2015-05-30 06:27:49 +01:00
Duncan Frost 573a632e43 Fix bugs in scenery_clear update 
Note make a new version of land update to fix cost issue
 2015-05-30 06:27:48 +01:00
Duncan Frost 54a37edb44 Implemented clear scenery update 
Not tested.
 2015-05-30 06:27:47 +01:00
zsilencer 5c7dc6bb9a #1165 2015-05-29 21:50:32 -06:00
rd3k 257d3b8469 proper cheat and Twitch window tooltips, fix #1167 2015-05-30 02:51:20 +01:00
Robert Jordan dbc1df308f Issues with Dropdown text 2015-05-29 16:42:57 -04:00
rd3k 3a55c060f7 fix #1163 2015-05-29 20:59:16 +01:00
IntelOrca c6aa17f053 add headless game support 2015-05-29 20:45:21 +01:00
Robert Jordan dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
IntelOrca 31e0bdd76f add partial working screenshot by command line 2015-05-28 23:04:02 +01:00
Duncan Frost 8c27be2357 OpenRCT2 no longer crashes after station abuse. 
Certain 8cars functions would move station track pieces that would cause the game to crash as they would not be at the correct location. OpenRCT2 will just skip trying to update the tiles of station track that has been modified this way
 2015-05-28 19:46:59 +01:00
Graham Edgecombe 8da01a1bf7 Fix building with -DDISABLE_TWITCH. 
The gTwitchEnable variable was used in some places without being
wrapped around an #ifndef DISABLE_TWITCH block.
 2015-05-28 11:52:40 +01:00
IntelOrca 6f1cd77f3c implement textinput_cancel and refactor textinput event calls 2015-05-28 01:15:58 +01:00
IntelOrca 101fed0dd9 refactor g1Elements pointer and implement sub_68371D 2015-05-28 00:17:22 +01:00
Jackson Davis e394c1d0d3 Fix compile error for non-windows 2015-05-26 18:29:31 -07:00
Robert Jordan 16105af1e7 Progress on window colour schemes 2015-05-26 16:59:25 -04:00
IntelOrca 6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +01:00
Miso Zmiric (Mike Squinter) c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00
IntelOrca 1ac93e44c9 add twitch integration, part 1 2015-05-25 20:36:40 +01:00
Ted John b488693a0b Merge pull request #1147 from trigger-death/fixed-whizzed-images 
Fixed "whizzed" images #1070
 2015-05-25 02:39:57 +01:00
Robert Jordan 7121c8c097 Fixed "whizzed" images #1070 
In reset_type_to_ride_entry_index_map() we were simply reseting every
up-to but excluding LIM launched (the last ride type)
 2015-05-24 16:48:56 -04:00
Robert Jordan 6bc081edca Added date format to culture options menu 2015-05-24 12:38:07 -04:00
Ted John ad4436ea4f Merge pull request #1142 from trigger-death/in-game-object-selection 
Added in-game object selection
 2015-05-24 03:52:53 +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
Gymnasiast 81272f5ab7 Resolved merge conflict 2015-05-23 14:22:24 +02:00
Michael Steenbeek 89b0f81bfc Forgot the change string number 2015-05-23 02:43:38 +02:00
Gymnasiast 0a093be3b1 Resolve merge conflict 2015-05-23 02:24:07 +02:00
Gymnasiast 7868d19522 Add option to exit Openrct2 2015-05-23 02:21:05 +02:00
Robert Jordan 37221f0aae Testing Improvements 
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
 2015-05-22 14:18:48 -04:00
IntelOrca d0a50c43f4 fix #1129 2015-05-22 13:49:18 +01:00
Gymnasiast 121052b807 Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window 2015-05-22 12:41:22 +02:00
IntelOrca 0013310f0d add hardware display 2015-05-22 03:17:46 +01:00
Ted John 25c5c8cbaa Merge pull request #1124 from jcdavis/69A3A2 
69A3A2: ride_update_satisfaction
 2015-05-21 21:22:31 +01:00
Ted John 3f71502718 Merge pull request #1107 from zsilencer/decompiling 
game_command_place_scenery
 2015-05-21 21:20:22 +01:00
Michael Steenbeek 2a7926915c Declare window_invalidate_all() 2015-05-21 19:44:10 +02:00
Jackson Davis 095fbfa21d 69A3A2: ride_update_satisfaction 2015-05-21 10:00:04 -07:00
Ted John 2ed1963d96 Merge pull request #1123 from Gymnasiast/powered-launch-availability 
Allow both types of powered launch on every RC that supported one of them
 2015-05-21 16:45:10 +01:00
Gymnasiast 4a4e6a3b4f Allow both types of powered launch on every RC that supported one of them. 2015-05-21 14:58:17 +02:00
Gymnasiast 36ccfe77e0 Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows 2015-05-21 12:28:51 +02:00
IntelOrca 6135b9204d fix #1118 2015-05-21 03:11:53 +01:00
IntelOrca bdd712bc4b fix config parsing bug 2015-05-21 02:52:32 +01:00
zsilencer 28c2451d97 move data into code, cleanup 2015-05-20 19:21:13 -06:00
zsilencer 9ee4b64fa1 game_command_place_scenery 2015-05-20 19:21:13 -06:00
IntelOrca 22212df32a fix user error 2015-05-21 01:51:48 +01:00
Ted John a27a516e30 Merge pull request #1112 from trigger-death/sprite-build-command 
Sprite build command
 2015-05-21 01:45:30 +01:00
Ted John 18e1a53e42 Merge pull request #1117 from zsilencer/stuff 
fix #1101 and reorganize the tune lists
 2015-05-21 01:36:53 +01:00
IntelOrca c0079919b4 implement user_string_allocate 2015-05-21 01:35:24 +01:00
zsilencer 86ce94f8e9 fix #1101 and reorganize the tune lists 2015-05-20 18:25:26 -06:00
Ted John e2b53ddca6 Merge pull request #1115 from duncanspumpkin/fix_bugs 
Fix #1103 and #483
 2015-05-20 21:23:54 +01:00
IntelOrca 776c85db74 allow localisation of digit seperator and decimal point 2015-05-20 20:11:50 +01:00
Robert Jordan ac17b52139 g2.dat is now updated every build. 
data/g2.dat is now ignored.
 2015-05-20 14:20:24 -04:00
Duncan Frost d3587c2fc5 Fix #1103 and #483 
Measurement close is now correctly called when the ride measurement window is closed.
When quiting a scenario tool_cancel is called to also reset the scnery selection mode
 2015-05-20 19:18:54 +01:00
Robert Jordan 0a3d2b949c sprite build now uses parameters 
Added batch file to build g2.dat
 2015-05-20 13:17:08 -04:00
Ted John 56c3647215 Merge pull request #1114 from trigger-death/fix-tooltips 
Fixed tooltip issue #1053
 2015-05-20 17:54:29 +01:00
Robert Jordan dc38087f07 Fixed tooltip issue #1053 
Tooltips should now behave more like RCT2.
 2015-05-20 12:53:02 -04:00
Robert Jordan 06449648b3 Possibly fixed issue #1056 
Only resizes GUI and windows if not minimized.
 2015-05-20 11:58:43 -04:00
Robert Jordan c7e3639663 Sprite build command 
build uses ../../data/g2.dat and all numbered images in
../../resources/g2/.
No other parameters needed.
Also changed speed button hyper arrows to support game speeds inbetween
4 and 8.
 2015-05-20 11:52:40 -04:00
IntelOrca 1339c9b493 fix console caret typo and invalidate screen on variable change 2015-05-20 02:37:44 +01:00
IntelOrca 1fd7bd255f Merge branch 'develop' of https://github.com/trigger-death/OpenRCT2 into trigger-death-develop 2015-05-20 02:31:17 +01:00
Robert Jordan 0fbeb9214e Finished improvements to console 
Added commands: variables, get, and set
Added console scrolling
set console_small_font 1 will change the console font
Fixed issue with textinput incrementing the length twice in shared.c
 2015-05-19 21:12:09 -04:00
IntelOrca d6e27c8241 fix #1097 2015-05-20 01:10:53 +01:00
Duncan Frost ebcb4ba480 Refactor and bug fix of scenery removal. 
Looks like I might have introduced a bug during my last refactor due to using the same name for multiple variables.
 2015-05-19 22:08:51 +01:00
Duncan Frost 5e1ec9134d Fix #1102 
Fixed tracks from failing to save due to mistake in reversing.
 2015-05-19 21:22:09 +01:00
Robert Jordan 61474ecd9a Progress on console 2015-05-19 13:46:05 -04:00
Duncan Frost 2d956d2fc6 Fix rides been on displaying incorrectly 2015-05-19 18:35:02 +01:00
Duncan Frost b681c98505 Fix #1099. 
The middle news item was not being reset to empty as news update is not called when there is no news. Added in a reset when opening the bottom toolbar.
 2015-05-19 18:04:58 +01:00
Duncan Frost 3008d56851 Fix #1098. 
Forgot to increment the mapElement after during loop.
 2015-05-19 17:41:32 +01:00
Robert Jordan 0a71b633c7 Added game speed button sprites 
Also added empty.png to resources to fill in g2 sprites reserved by
other contributors.
 2015-05-19 11:51:59 -04:00
Ted John 20057ef46c Merge pull request #1095 from noitatum/decompile_0x0069DEAD 
First decompilation, criticism welcome.
 2015-05-19 14:20:11 +01:00
Ted John 8f19ecbdef Merge pull request #1094 from trigger-death/new-title-logo 
Changed Title Logo
 2015-05-19 14:18:22 +01:00
Ted John 8ab5fec68a Merge pull request #1096 from Gymnasiast/increase-num-laps 
Increase max circuits to 20 and max number of people in maze to 64
 2015-05-19 14:17:50 +01:00
Gymnasiast 257e330503 Increase maximum number of laps to 20 and maximum number of people in maze to 64. 2015-05-19 11:18:08 +02:00
Robert Jordan c48645a67a Changed Title Logo 
Started placing g2.dat sprites in resources/g2
 2015-05-18 23:33:21 -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
IntelOrca 8772cdd7aa add in game console 2015-05-19 03:54:09 +01:00
IntelOrca c1260fc11f add command line sprite editor and additional custom graphics (g2.dat) 2015-05-19 00:26:31 +01:00
Ted John 27737cc086 Merge pull request #1092 from trigger-death/game-speed-button 
Added game speed button and other changes
 2015-05-19 00:01:02 +01:00
Robert Jordan 77767a6bc5 Didn't update top_toolbar 2015-05-18 18:16:43 -04:00
Robert Jordan 6faaca53aa Added game speed button and other changes 
Game speed button with up to 4/5 speeds.
Debugging tools option to enable non-playable changes.
Cheat window is now a setting.
Game speeds 5-7 are removed.
Game speed 8 added with enabling debugging tools.
Windows and news ticker update once per tick instead of based on game
speed.
 2015-05-18 18:15:43 -04: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