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

3614 Commits

Author SHA1 Message Date
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
Ted John f0c97c0fa8 Merge Localisation/master into OpenRCT2/develop. 2015-06-03 04:00:12 +01:00
Ted John baf9a416de Merge pull request #1206 from mzmiric5/g2-mingw 
build g2.dat as part of mingw build
 2015-06-03 03:16:45 +01:00
Miso Zmiric (Mike Squinter) 4c06ffa2a0 build g2.dat as part of mingw build 2015-06-03 03:13:35 +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
Ted John 24f349b3f2 Merge pull request #1196 from zsilencer/optimize 
make hardware mode much faster
 2015-06-02 12:21:17 +01:00
Thomas den Hollander 5b8919480b Add name to contributors 2015-06-02 12:54:37 +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
Ted John bf39fc36b1 Merge Localisation/master into OpenRCT2/develop. 2015-06-02 04:00:13 +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 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
Ted John cea0f77c03 Merge pull request #1190 from trigger-death/themes-rename 
Renamed Colour Schemes to Themes
 2015-06-01 21:35:23 +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 80aaae3c8d Changed preset to theme 2015-06-01 11:06:07 -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
Ted John 0a5236be1c Merge Localisation/master into OpenRCT2/develop. 2015-06-01 04:00:13 +01:00
Thomas 55456559bb Added dithering and closest pixel conversion for sprite tool 2015-05-31 20:35:40 +02:00
Ted John 15791a2921 Merge pull request #1186 from rd3k/fix-parksize 
Use uint16 for park size, fix #1162
 2015-05-31 13:08:49 +01:00
rd3k 9d7dc3bacc Use uint16 for park size 2015-05-31 13:00:39 +01:00
Ted John da532dd7f0 Merge Localisation/master into OpenRCT2/develop. 2015-05-31 04:00:13 +01:00
Ted John 505216e82f Merge pull request #1182 from rd3k/peep-sick-cheat 
Add cheat to make all guests feel nauseous
 2015-05-31 02:13:11 +01:00
rd3k 395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
Ted John 4cd81766f5 Merge pull request #1180 from jcdavis/build_g2_sh 
build_g2 for OS X/Linux
 2015-05-31 00:26:25 +01:00