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

11278 Commits

Author SHA1 Message Date
OpenRCT2 git bot 9bb0aab7e7 Merge Localisation/master into OpenRCT2/develop. 2017-04-22 04:00:22 +00:00
OpenRCT2 git bot e72542be68 Merge Localisation/master into OpenRCT2/develop. 2017-04-21 04:00:19 +00:00
Michał Janiszewski 0414ba7f6b Verify access to sprites 2017-04-20 13:20:11 +02:00
Hielke Morsink 9314b8b793 Fix #5375: Use mask for fetching large scenery id, fix picking banner elements 2017-04-19 07:56:46 +02:00
Michał Janiszewski d53f276207 Fix scenery eye dropper interaction with footpaths 2017-04-18 22:49:33 +02:00
Richard Jenkins 8f59b04d32 Fix #5377: Saved game keeps crashing shortly after loading 
Guard against null pointers in banner_paint() (#5379)
 2017-04-17 18:37:37 +01:00
Gymnasiast 34540b6439 Rename edi to something more descriptive 2017-04-17 13:39:44 +02:00
Michael Steenbeek e0764e3ac2 Add booster sprites for the Junior roller coaster 2017-04-17 12:35:38 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
duncanspumpkin 8243501680 Fix #5373. Prevent towers from being shown on car ride special list. 
Mistake made during implementation. Not sure how this one was accidentally done as I expect the original list was computer generated. This bug has been in the game since June 2015.
 2017-04-16 13:41:54 +01:00
duncanspumpkin 8dcf6b43f1 Fix #5371. Custom currency now correctly saves to config. 
Mistake made during refactoring. Failed to account for the custom currency when saving the current currency.
 2017-04-16 13:09:40 +01:00
Michał Janiszewski e9ae5cf356 Merge pull request #5374 from janisozaur/mingw-arch-develop 
ArchLinux-based mingw docker image
 2017-04-16 09:06:20 +02:00
Michał Janiszewski ada2569412 Update Travis configuration to use new mingw docker 2017-04-16 08:50:44 +02:00
Michał Janiszewski 0d4dd5849a Remove workaround for mingw bug, now fixed upstream 2017-04-16 08:44:37 +02:00
Michał Janiszewski da0cadf270 Disable redundant-decls error for mingw 2017-04-16 08:44:37 +02:00
Michał Janiszewski 84a98dc710 Change MinGW docker to use ArchLinux as base 
This is needed to get more up-to-date MinGW releases
 2017-04-16 08:42:46 +02:00
OpenRCT2 git bot 4a97d53c0a Merge Localisation/master into OpenRCT2/develop. 2017-04-15 04:00:17 +00:00
Michael Steenbeek 299e6c8974 Merge pull request #5349 from marcotc/detect-locale 
Auto-detect locale on first run
 2017-04-14 23:44:47 +02:00
Ted John d06208a521 Fix scenery window height and list calculation 2017-04-14 18:59:21 +01:00
Michał Janiszewski b87a8095d1 Make input buffers' sizes consistent 2017-04-14 19:17:38 +02:00
Michał Janiszewski f3ad6de014 Update gTextBoxInput size to be at least CHAT_INPUT_SIZE large 
Fixes #5365
 2017-04-14 17:58:42 +02:00
OpenRCT2 git bot f07fb2dfe1 Merge Localisation/master into OpenRCT2/develop. 2017-04-14 04:00:29 +00:00
Ted John bc3acd4373 Merge pull request #5361 from Broxzier/fix_sprite_commands 
Fix sprite commands
 2017-04-13 23:13:33 +01:00
Ted John 2899cd0298 Fix spelling and remove current release only regressions from changelog 2017-04-13 23:12:21 +01:00
Ted John 43ac5434ca Ensure openrct2.com is a console application 2017-04-13 23:09:25 +01:00
Richard Jenkins adebe85e21 Update changelog with fixes and improvements since v0.0.6 (#5364) 2017-04-13 22:50:45 +01:00
Gymnasiast 264e758ac6 Bump network version 2017-04-13 22:27:46 +02:00
Michael Steenbeek 400a2cc9c7 Merge pull request #5354 from rwjuk/fix5350 
Make boosters on Twister and Giga Coaster more practical (#5350)
 2017-04-13 22:19:25 +02:00
Richard Jenkins 194afc7b49 Halve Junior RC booster values, and update construction window to match 2017-04-13 21:05:52 +01:00
Gymnasiast 18aa462f9a Fix booster speed when right-clicking a part 2017-04-13 21:37:14 +02:00
Richard Jenkins 2ca500ad1e Adjust track build window for Giga Coaster to reflect doubled boost speed 2017-04-13 20:16:36 +01:00
Gymnasiast 9947532103 Multiply Giga Coaster booster values by 2 2017-04-13 20:24:12 +02:00
Ted John ff350f3769 Fix #5338: Scenery eyedropper hides the third colour picker 2017-04-13 17:01:44 +01:00
Broxzier ff765b29cf Add missing sprite commands to the list, sorted 2017-04-13 17:20:53 +02:00
Broxzier 6e36c00eca Fix unability to use of 'sprite exportall' 
This also fixes an issue when the given path does not end with a
separator, in which case it would export to one folder higher.
 2017-04-13 17:14:23 +02:00
Duncan 291b3d98bb Merge pull request #5360 from duncanspumpkin/easter_refactor 
Refactor Easter Eggs Fix #5357
 2017-04-12 20:59:20 +01:00
duncanspumpkin 9257645cb7 Correctly loop. Add typedef for easter egg functions 2017-04-12 20:44:44 +01:00
duncanspumpkin 1b98c0b1cb Increment network 2017-04-12 20:34:57 +01:00
duncanspumpkin 509afe74cd Refactor easter egg peep functions. Fix #5357 2017-04-12 20:34:12 +01:00
Gymnasiast c8ecd98737 Check for both csg1.1 and csg1.dat when looking for RCT1 graphics 2017-04-12 20:08:31 +02:00
OpenRCT2 git bot 8198254b72 Merge Localisation/master into OpenRCT2/develop. 2017-04-12 04:00:20 +00:00
Michael Steenbeek 7aa5cc3cc3 Merge pull request #5356 from Gymnasiast/is-csg1-loaded 
Add method to determine whether CSG1 is loaded, fixes #5353
 2017-04-11 22:38:45 +02:00
Gymnasiast cc92300e3a Load CSG1 booster sprites for the Looping and Corkscrew RC 2017-04-11 22:38:09 +02:00
Gymnasiast 99617de70a Add method to determine if CSG1 is loaded 2017-04-11 22:38:09 +02:00
Richard Jenkins 7b940abeb0 Reduce booster acceleration of Junior RC very slightly 2017-04-11 18:40:39 +01:00
Richard Jenkins c8155e1703 Align acceleration values for Vertical RC with Twister, reduce booster acceleration of Twister, Giga and Vertical by half 2017-04-11 18:18:35 +01:00
Richard Jenkins faceb68338 Increment network version 2017-04-11 17:31:47 +01:00
Richard Jenkins 34e895936c Multiply booster_acceleration value for Twister and Giga Coaster by 8 to replicate RCT1 performance 2017-04-11 16:53:12 +01:00
Richard Jenkins 62eb3176a5 Use booster_acceleration where appropriate 2017-04-11 16:43:14 +01:00
Richard Jenkins 3e3611c6da Core implementation for rct_ride_properties->booster_acceleration (not used yet) 2017-04-11 16:40:54 +01:00