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
IntelOrca 28a122ac5c don't show tab image unless tab is shown in new ride window 2015-06-07 14:35:15 +01:00
IntelOrca b79bc68af9 fix #1234 2015-06-07 14:01:32 +01:00
IntelOrca 2eea6bcd4b fix #1229 2015-06-07 13:51:27 +01:00
Ted John 0efd222eac Merge pull request #1252 from Gymnasiast/ownership-editor 
Added cheat to edit land ownership settings in-game
 2015-06-07 13:34:33 +01:00
Ted John ae15039171 Merge pull request #1251 from duncanspumpkin/fix_invis 
Correctly draw invisible entrances
 2015-06-07 13:34:01 +01:00
Gymnasiast 90ac515a9b Fix bug introduced in refactor 2015-06-07 13:34:17 +02:00
Gymnasiast c15da4370a Added cheat to edit land ownership settings in-game 2015-06-07 12:45:55 +02:00
Duncan Frost 169628ddb0 Fix #1243. 
For a lengthy reason as to how this worked before see #1243. New version skips bad map_elements (and the next one).
 2015-06-07 10:53:08 +01:00
Duncan Frost 3977865089 Fix original windows crashing 
Due to the change in WWT_LAST assignment any windows that were not finished would access invalid memory and kick up a fuss causing #1249.
 2015-06-07 08:40:55 +01:00
IntelOrca f3821c4865 finish remaining ride calculations 2015-06-07 02:56:31 +01:00
Ted John 5fb44a443e Merge pull request #1248 from trigger-death/text-box-widget 
Fixed #1247 font issues.
 2015-06-07 02:56:00 +01:00
Robert Jordan 02a9f1b535 Fixed #1247 font issues. 2015-06-06 21:18:20 -04:00
Ted John ad6ccc2553 Merge pull request #1246 from trigger-death/themes-fix 
Fixed themes "editor" tooltip
 2015-06-07 02:09:41 +01:00
Robert Jordan c0df70a9b0 Fixed themes "editor" tooltip 2015-06-06 21:04:14 -04:00
Ted John c295e8bc2d Merge pull request #1241 from trigger-death/text-box-widget 
Textbox Widget
 2015-06-06 22:27:44 +01:00
Robert Jordan 9f9143a5c6 textbox widget 2015-06-06 17:04:53 -04:00
Ted John 076e7142e9 Merge pull request #1240 from duncanspumpkin/fix_1239 
Fix peep placement crash
 2015-06-06 20:29:16 +01:00
Duncan Frost 117526ec77 Fix #1239. Issue caused by sign extension. 2015-06-06 20:12:21 +01:00
IntelOrca dd84ee8340 implement more ride rating calculations 2015-06-06 14:30:43 +01:00
IntelOrca 859e7a3418 implement more ride rating calculations 2015-06-06 12:36:45 +01:00
Robert Jordan 4e43b04524 Fixed english_uk conflicts 2015-06-05 20:19:53 -04:00
Robert Jordan a490284569 Renumbered strings 2015-06-05 20:16:01 -04:00
Robert Jordan c3d36c96ef Now resets scroll properly 2015-06-05 19:02:20 -04:00
Robert Jordan 6179888231 Renamed strings and removed warnings 2015-06-05 18:59:07 -04:00
Robert Jordan c9c3e66289 Object selection search 
Can now search for objects in the object selection window.
 2015-06-05 18:54:47 -04:00
Robert Jordan 83fda8fc56 Clear scenery tool now as options 
Can now choose to clear small scenery, large scenery, and/or footpaths.
 2015-06-05 12:38:52 -04:00
IntelOrca 27484d1a27 implement more ride rating calculations 2015-06-05 16:29:13 +01:00
zsilencer 71ae580483 fixes #1230 and #1212 2015-06-05 01:02:02 -06:00
IntelOrca d51f6ac3c9 add more ride rating calculations and fix bugs 2015-06-05 03:10:42 +01:00
Ted John 1903ab16bb Merge pull request #1223 from zsilencer/volume_control 
add volume control in options
 2015-06-05 00:57:37 +01:00
IntelOrca 5100ed747b refactor rest of ride ratings 2015-06-04 23:52:24 +01:00
zsilencer c6e63d5d25 add volume control in options 2015-06-04 16:31:54 -06:00
IntelOrca 9c4f7b0973 refactor ride ratings and add junior coaster ride calculation 2015-06-04 22:49:02 +01:00
Ted John dfcea20443 Merge pull request #1222 from ThomasdenH/develop 
Change use of gfx_draw_string() to gfx_draw_string_left()
 2015-06-04 20:40:41 +01:00
Thomas e9a33e0de6 Change use of gfx_draw_string() to gfx_draw_string_left() 2015-06-04 21:27:38 +02:00
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
Duncan Frost 8351e56353 Fix small graphical bug on bottom arrow. 
Caused by not setting the font style before using them.
Also the origin was one pixel off.
 2015-06-04 20:15:26 +01:00
Duncan Frost 44d4ff4d03 Fix cross hatching graphical glitch. 
Forgot to Xor the value before clearing it. Fixes #1177
 2015-06-04 20:15:25 +01:00
Duncan Frost 2765f15584 Cheats showing pressed after tab change 
Fixes #1084
 2015-06-04 20:15:24 +01:00
Duncan Frost cd753e13e4 Fix #1213 once and for all. 
Forgot to check that the tool in use was the set land rights tool.
 2015-06-04 20:15:23 +01:00
Ted John b688b1eb5f Merge pull request #1220 from trigger-death/options-window-pages 
Options window now uses paged widgets
 2015-06-04 20:04:11 +01:00
Robert Jordan 319fe2b6a2 Didn't commit one file. 2015-06-04 14:51:54 -04:00
Robert Jordan 4b0d005e0f Options window now uses paged widgets 
Widgets now are defined by page.
Fixed options window flashing text colour when first opened.
Fixed themes window gfx_invalidate happening every step.
 2015-06-04 14:51:39 -04:00
Ted John 3e12e9502f Merge pull request #1218 from ThomasdenH/develop 
Refactor cheat window and fix #1084
 2015-06-04 19:08:46 +01:00
Thomas 9f6f7c8b9e Move cheat tab tips 2015-06-04 19:58:16 +02:00
Thomas 9ddd655b20 Refactor cheat window and fix #1084 2015-06-04 19:52:35 +02:00
danidoedel bcbc05e9a2 fix mapgen background bug 2015-06-04 17:39:07 +02:00
danidoedel c481905d0a fix research label position 2015-06-04 17:34:47 +02:00
danidoedel d9807221b8 fix number of selected items label position 2015-06-04 17:33:29 +02:00
danidoedel a57e4587f1 fix number of designs label position 2015-06-04 17:31:42 +02:00
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