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

15401 Commits

Author SHA1 Message Date
OpenRCT2 git bot 2aa9765c3c Merge Localisation/master into OpenRCT2/develop. 2018-09-20 04:00:36 +00:00
OpenRCT2 git bot 5a3efe974f Merge Localisation/master into OpenRCT2/develop. 2018-09-19 04:00:32 +00:00
Ted John c1d220140c Use latest gtest, fixes MSVC 15.8.1 compiler errors 2018-09-18 20:13:23 +01:00
Ted John 208a689d78
Merge pull request #8005 from IntelOrca/fix-7954 
Fix #7954: Key validation problem because of my name
 2018-09-18 17:45:46 +01:00
Ted John 900465a392 Don't attempt to load server list if file doesn't exist 2018-09-18 12:50:34 +01:00
Ted John bdf5264972 Update changelog 2018-09-18 12:38:09 +01:00
Ted John 2da2aa5622 Fix platform_get_username for unicode on Windows 2018-09-18 12:37:42 +01:00
Ted John 8ce6cde2b7 Fix building sprite file for unicode paths on Windows 2018-09-18 12:37:42 +01:00
Michael Steenbeek c83c30dafb Fix #8003: Crash when placing small scenery (#8004) 2018-09-18 10:05:29 +02:00
OpenRCT2 git bot 856f29aa75 Merge Localisation/master into OpenRCT2/develop. 2018-09-18 04:00:32 +00:00
Michael Steenbeek a6a5e3e315
Merge pull request #8001 from Gymnasiast/elementary-my-dear-watson 
Port Wall elements to new tile element structure; remove some access to ->type
 2018-09-17 21:03:36 +02:00
Aaron van Geffen 4db936d3e1
Fix loading of 4-byte UTF-8 codepoints. (#8002) 2018-09-17 20:16:07 +02:00
Gymnasiast c8063a3c38 Fix scenery doors closing the wrong 2018-09-17 20:03:56 +02:00
Michael Steenbeek f1c98a4475 Make fields private 2018-09-17 16:12:11 +02:00
Michael Steenbeek 6062960390 Port remaining wall stuff to struct methods 2018-09-17 15:42:34 +02:00
Michael Steenbeek 508276b081 Remove lots of direct access to ->type fields 2018-09-17 15:18:07 +02:00
Michael Steenbeek 345e03d41b Move animation frame and rct1 wall functions to methods 2018-09-17 14:48:27 +02:00
Michael Steenbeek dcabdeb805 Move wall colour functions over to the struct methods 2018-09-17 14:22:17 +02:00
Michael Steenbeek 533e937926 Create slope and colour functions for WallElement 2018-09-17 14:10:05 +02:00
Michael Steenbeek c7632f29a0
Merge pull request #7992 from Gymnasiast/more-tile-element-stuff 
More tile element stuff
 2018-09-17 13:56:41 +02:00
Michael Steenbeek 66f9e9d646 Properly reset surface objects 2018-09-17 13:17:47 +02:00
OpenRCT2 git bot b1472c1d76 Merge Localisation/master into OpenRCT2/develop. 2018-09-17 04:00:35 +00:00
Gymnasiast a7eb005501 Fix bug in map_init() 2018-09-16 22:02:03 +02:00
Gymnasiast d1b576b4a5 Fix bugs in park fences 2018-09-16 21:53:12 +02:00
Gymnasiast 0235137010 Fix typo in SetSlope() 2018-09-16 21:34:51 +02:00
Gymnasiast f7a03895f6 Put some stuff into temporary variables 2018-09-16 21:34:51 +02:00
Gymnasiast 74578fcc08 Use constants for map_height_from_slope() 2018-09-16 21:34:51 +02:00
Gymnasiast e20ba5d4a3 Add missing stuff to TestPaint 2018-09-16 21:34:51 +02:00
Gymnasiast 737b73d30c Fix refactor bug in set_water_height() 2018-09-16 21:34:51 +02:00
Gymnasiast 75877e82f8 Fix access to path element 2018-09-16 21:34:51 +02:00
Gymnasiast 9fb58a3453 Fix constants in map_height_from_slope() 2018-09-16 21:34:51 +02:00
Gymnasiast e6dd093218 Remove unused function from Testpaint compat 2018-09-16 21:34:51 +02:00
Gymnasiast 0f08128657 Fix formatting 2018-09-16 21:34:51 +02:00
Gymnasiast 09ea209c48 Fix sign mismatch 2018-09-16 21:34:51 +02:00
Michael Steenbeek 74ccf010e6 Port surface elements to new structure 2018-09-16 21:34:51 +02:00
Michael Steenbeek d186a04e4f Remove case of direct access to direction 2018-09-16 21:34:51 +02:00
Michael Steenbeek 35b4724626 Port large scenery to new structure 2018-09-16 21:34:50 +02:00
Michael Steenbeek 1d3baef9b7 Remove some C-style tile element functions 2018-09-16 21:34:04 +02:00
Gymnasiast 2d8b93e514 Fix #7995: Crash when interacting with large scenery 2018-09-16 20:21:54 +02:00
Gymnasiast c46155bbda Use constant instead of raw number 2018-09-16 15:07:32 +02:00
OpenRCT2 git bot 008c926633 Merge Localisation/master into OpenRCT2/develop. 2018-09-16 04:00:27 +00:00
Michał Janiszewski 92b556352b
Allow compilation of testpaint on non-x86 targets (#7989) 
This will enable compilation of testpaint on targets different than x86.
It won't function the way it does on x86, but it should provide a way of
tackling various compilation errors that can only be seen in the very
specific environment required by testpaint proper.
 2018-09-15 23:37:45 +02:00
Aaron van Geffen 47eea292b5 Allow assigning a keyboard shortcut for opening the tile inspector (#7994) 
* Allow assigning a keyboard shortcut for opening the tile inspector.

* Only open when debug tools are enabled.

* Add changelog entry
 2018-09-15 08:57:50 +02:00
OpenRCT2 git bot 3e97b20025 Merge Localisation/master into OpenRCT2/develop. 2018-09-15 04:00:23 +00:00
Michael Steenbeek 0e998c2d78
Merge pull request #7988 from Gymnasiast/tile-element-makeover 
Change tile elements to use the OpenLoco structure
 2018-09-14 10:56:19 +02:00
Michael Steenbeek 1a825a4045 Small fixes 2018-09-14 10:18:46 +02:00
Aaron van Geffen a5ad9a3729
Merge pull request #7971 from Osmodium/7930-part2-Add-open-folder-button 
#7930 part2 add open folder button
 2018-09-14 00:03:58 +02:00
Aaron van Geffen d6769fafe2 Move title menu buttons up to compensate for new item. 2018-09-13 23:20:17 +02:00
Aaron van Geffen e1d6585423 Simplify EscapePathForShell by using std functions. 2018-09-13 23:20:17 +02:00
Aaron van Geffen cf6f8a356f
Merge pull request #7920 from ZehMatt/sprite-structs 
Simplify sprite structs
 2018-09-13 23:04:02 +02:00