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

7177 Commits

Author SHA1 Message Date
Marijn van der Werf 6231b8672d Fix assertion error in calculation 2016-04-27 23:15:17 +02:00
Marijn van der Werf eb5400ef2e fix assertion errors 2016-04-27 23:15:17 +02:00
Michał Janiszewski bb93ff87f5 Checks to help with decompilation 
Use in debug mode
 2016-04-27 23:15:17 +02:00
Marijn van der Werf 2b15462106 First attempt at water drawing 2016-04-27 23:15:17 +02:00
Marijn van der Werf 8cc2355846 Draw edges 2016-04-27 23:15:17 +02:00
Marijn van der Werf 2393c48508 Smoothen surface 2016-04-27 23:15:17 +02:00
Marijn van der Werf 1337f61f71 Inline only-local used variable 2016-04-27 23:15:17 +02:00
Marijn van der Werf e69d084641 Construction rights 2016-04-27 23:15:17 +02:00
Marijn van der Werf 57cb49ed3b Land ownership 2016-04-27 23:15:17 +02:00
Marijn van der Werf 4920c2fcf4 Draw spawns 2016-04-27 23:15:17 +02:00
Marijn van der Werf 323ebc4f74 Draw coaster holes 2016-04-27 23:15:17 +02:00
Marijn van der Werf 31f7f28981 Set support shapes for surface 2016-04-27 23:15:17 +02:00
Marijn van der Werf 54600d801d Add function structure 2016-04-27 23:15:17 +02:00
Marijn van der Werf 46c0839cb0 Draw patrol areas 2016-04-27 23:15:17 +02:00
Marijn van der Werf 4db349eff1 Progress 2016-04-27 23:15:17 +02:00
Marijn van der Werf 2d613fccec First part 2016-04-27 23:15:17 +02:00
Kradmoa d749848ff6 Fix missing Twister coaster piece. #3361 (#3369) 
Fix missing Twister coaster piece. #3361
 2016-04-27 18:54:07 +01:00
Michael Steenbeek 0bbfdcc7b6 Fix import of rides without vehicles, fix ride availability, fixes #3414 (#3437) 2016-04-27 16:05:35 +01:00
OpenRCT2 git bot 8e59a6c102 Merge Localisation/master into OpenRCT2/develop. 2016-04-27 04:00:16 +00:00
Ted John bde0989975 Merge pull request #3432 from janisozaur/x86-64 
add travis job for x86-64
 2016-04-26 22:29:43 +01:00
Michał Janiszewski a4d2dd5451 Add linux64 job to travis matrix 2016-04-26 22:42:39 +02:00
Michał Janiszewski d145c348fd Modify linker script for x86-64 
For some reason I was not able to replicate linking we have for i386
(yet?), but I need this to test things.
 2016-04-26 22:35:47 +02:00
Michał Janiszewski b30bab65d8 Add experimental build job for x86-64 
This is **build job only**. It does not work yet.
 2016-04-26 22:35:47 +02:00
Ted John 1729061df8 use ISO 639-1 for language filenames, closes #2420 (#3431) 2016-04-26 19:52:42 +01:00
Ted John 8b13a9e80c add warnings for when override string limit is reached 2016-04-26 18:45:51 +01:00
Nubbie 54f11e66cb Normalised tooltip string IDs (#3420) 
* Moving all 'TIP' to the end

Searched for all _TIP_ strings and moved them to the end as it's more efficient to find them that way+ Gymnasiast told me '>We always put TIP at the end'

* Changed the tip strings + fixed the spacings (#23)

* Fixing the comma

* Reverting changes to cheats.c to start over

* Add Re-named strings in Cheats.c + align desc.

This is the second attempt, this time I've just changed the strings to match `src/localisation/string_ids.h`, the only thing aligned is the descriptions with newly added tips that got miss-aligned
 2016-04-26 11:28:12 +01:00
OpenRCT2 git bot 80dc44836a Merge Localisation/master into OpenRCT2/develop. 2016-04-26 04:00:17 +00:00
Ted John 83acafe05a add global macros for research variables 2016-04-25 23:26:26 +01:00
Ted John 7be699adbb fix mistake, wrong enum 2016-04-25 23:20:54 +01:00
Ted John 489ea66cc9 add global macro for gCurrentFontSpriteBase and gCurrentFontFlags 2016-04-25 23:00:58 +01:00
Ted John b1f704dac4 add global macros for more finance variables 2016-04-25 22:38:09 +01:00
Ted John 870a8b55e5 add global macros for viewport variables 2016-04-25 21:53:21 +01:00
Ted John aa77c06c01 Merge pull request #3425 from Gymnasiast/load-sv4-from-dialog 
Enable SV4 files to be loaded from the native load/save dialog
 2016-04-25 20:04:27 +01:00
Gymnasiast 57d2618fb5 Use gFirstTimeSave 2016-04-25 19:16:58 +02:00
Gymnasiast 7521a70ac8 Use get_file_extension_type() 2016-04-25 19:11:51 +02:00
Gymnasiast 8dc7fdcec2 Enable SV4 files to be loaded from the native load/save dialog 2016-04-25 15:38:44 +02:00
marcovmun 4149bcdd30 Fix: #2579 queue lines of 2 rides merge (#3409) 2016-04-25 12:12:12 +01:00
OpenRCT2 git bot 9b5d706bab Merge Localisation/master into OpenRCT2/develop. 2016-04-25 04:00:15 +00:00
Ted John 45843ec1d5 fix sub directory search for Windows 
Fixes a small issue related to #3408
 2016-04-24 23:55:28 +01:00
Ted John 99223d5d04 fix #3407: rides were not removed in editor 2016-04-24 23:48:33 +01:00
Ted John 171c4f20b7 fix tautology bug 2016-04-24 22:25:32 +01:00
Ted John 652b1c83db integrate variables for lightning and toolbar dirty flags 2016-04-24 21:49:09 +01:00
Nubbie 44a92e3f6b Explain what 'Advertise' means, fixes #3382 2016-04-24 21:24:28 +02:00
Ted John cea0f30121 integrate variable: gLandToolSize 2016-04-24 18:02:37 +01:00
Ted John 1fcefcfa7e integrate variables for water tool 2016-04-24 17:58:26 +01:00
Ted John fc938892d8 integrate variables for command position and expenditure 2016-04-24 17:53:39 +01:00
Ted John b9944dd33a integrate land tool variables 2016-04-24 17:28:12 +01:00
Ted John 15031b9511 add global macro: gGrassSceneryTileLoopPosition 2016-04-24 14:33:43 +01:00
Ted John d18ea8570d add global macro: gNextFreeMapElement 2016-04-24 14:30:21 +01:00
Ted John 0f6e64ac76 add global macros for map size and tile loop 2016-04-24 14:00:26 +01:00