mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,993 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

6993 Commits

Author SHA1 Message Date
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
Ted John 5ccbf08ac9 add global macros for staff colours 2016-04-24 11:12:24 +01:00
Ted John 0ffca3a4fc use gPeepSpawns for remaining non-refactored usages 2016-04-24 11:01:19 +01:00
Ted John 6c25c85363 add variable pointers for park entrance position 2016-04-24 10:53:04 +01:00
Ted John bac5538178 add global macro: gTotalRideValue 2016-04-24 10:36:56 +01:00
Ted John 0a80e7a737 integrate pickup peep variables 2016-04-24 10:28:08 +01:00
Ted John e7f62bf014 integrate game palette variables 2016-04-24 02:02:56 +01:00
Ted John a97533228c integrate window DPI variable 2016-04-24 01:40:55 +01:00
Ted John 19662a091c integrate rain drawing variables 2016-04-24 01:39:33 +01:00
Ted John 98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John a1150d31cf add global macros for more scenario variables 2016-04-23 18:07:07 +01:00
Ted John ef7dd83735 add pointer variables for scenario name and details 2016-04-23 17:53:25 +01:00
Ted John 6453bcbc46 Merge pull request #3406 from janisozaur/warnings 
Fix warnings in clang, gcc
 2016-04-23 14:08:27 +01:00
Michał Janiszewski d23cbe5722 Fix invalid left-shift 
Suffers from the same problems as #3381
 2016-04-23 14:58:24 +02:00
Michał Janiszewski 4f72b82ea0 Fix warnings in clang, gcc 2016-04-23 14:58:24 +02:00
Ted John ee509caf35 integrate game paused variable and refactor 2016-04-23 13:34:55 +01:00
Ted John 28aa9fe707 fix tautology bug in Twitch logic 2016-04-23 13:05:09 +01:00
Yaroslav Tretyakov 3f76d09f38 Decompile vehicle_visual_roto_drop function (#3363) 2016-04-23 12:17:15 +01:00
Ted John 4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Ted John 1950fad315 add global macros for date 2016-04-23 11:03:34 +01:00
Duncan d408cf4eea Metal a support (#3405) 
* Implement start of metal a supports

* Finish implementing metal a supports

* Fix bugs.
 2016-04-23 10:58:23 +01:00
Ted John 3bd21240ed add global macros for climate variables 2016-04-23 10:53:48 +01:00
Steven Vascellaro aee9a34511 readme.md: Minor formatting (#3397) 
[ci skip]
 2016-04-23 10:29:14 +01:00
Duncan ffcb01da91 Merge pull request #3381 from Wirlie/develop 
Revert uint assignment from 7eb3a90, Fixes #3367
 2016-04-23 07:47:51 +01:00
Duncan 377bef726c Merge pull request #3402 from PeteyPii/3401_vs_app_start_fail 
Fix Visual Studio "Start Debugging" failing immediately
 2016-04-23 06:14:43 +01:00
Patrick Wrobel 05b8180014 revert user specific changes in openrct2.vcxproj.user from convert command-line feature addition 2016-04-23 01:00:15 -04:00