Jacob Wallraff
eb706fbdf5
Adding string ids
2016-02-25 17:59:31 +00:00
Ted John
74973a4a97
Merge pull request #2950 from janisozaur/ride-names
...
Rename ride_entry functions and provide better logging
2016-02-25 12:43:19 +00:00
OpenRCT2 git bot
10dbcfe447
Merge Localisation/master into OpenRCT2/develop.
2016-02-25 04:00:14 +00:00
IntelOrca
b0887f174b
split sound and music mixing correctly, closes #1270
2016-02-24 22:42:50 +00:00
Michał Janiszewski
d19fe0e334
Make sure null ride type gets handled properly
2016-02-24 23:16:25 +01:00
OpenRCT2 git bot
2e81dfa29e
Merge Localisation/master into OpenRCT2/develop.
2016-02-24 04:00:13 +00:00
OpenRCT2 git bot
fe7c99e256
Merge Localisation/master into OpenRCT2/develop.
2016-02-23 04:00:20 +00:00
OpenRCT2 git bot
196d3d8dcc
Merge Localisation/master into OpenRCT2/develop.
2016-02-22 04:00:14 +00:00
Gymnasiast
21cb7a948b
Make 'All files' translatable
2016-02-21 18:42:55 +01:00
OpenRCT2 git bot
9c08d03b0d
Merge Localisation/master into OpenRCT2/develop.
2016-02-21 04:00:14 +00:00
Gymnasiast
d32b7286f5
Adjust string ids
2016-02-21 00:21:14 +01:00
Ted John
5182441768
Merge pull request #2968 from octaroot/add_multiplayer_strings
...
Fix #2802 - extract hardcoded network-related strings
2016-02-20 15:07:53 +00:00
OpenRCT2 git bot
05d66fac25
Merge Localisation/master into OpenRCT2/develop.
2016-02-20 04:00:14 +00:00
Martin Černáč
830b897dc6
Refactor conditional buffers and string_ids
2016-02-19 17:17:10 +01:00
Martin Černáč
62672af35e
Refactor sprintf and string_formater usages
2016-02-18 17:43:47 +01:00
Martin Černáč
361d30c6f5
Fix #2802 - extract hardcoded network-related strings
...
I extracted all of the hardcoded network-related strings. In addition to that, I also refactored the way last_disconnect_reason was being accessed/modified.
2016-02-18 14:52:02 +01:00
OpenRCT2 git bot
b13af3c8f5
Merge Localisation/master into OpenRCT2/develop.
2016-02-18 04:00:15 +00:00
Martin Černáč
fdfb4f7bd3
Add "neverending marketing" cheat
...
This cheat allows the player to have never-ending marketing campaigns
2016-02-17 09:35:56 +01:00
OpenRCT2 git bot
ab04ece601
Merge Localisation/master into OpenRCT2/develop.
2016-02-14 04:00:17 +00:00
Ted John
6d384fa2e5
Merge pull request #2911 from Overv/show-peeps-in-closed-ride
...
Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708 )
2016-02-13 11:19:40 +00:00
Alexander Overvoorde
d07b7159c8
Add amount of customers currently on ride to customers tab
2016-02-13 04:23:59 +01:00
OpenRCT2 git bot
6d47bf19d3
Merge Localisation/master into OpenRCT2/develop.
2016-02-12 04:00:14 +00:00
OpenRCT2 git bot
d87bb01801
Merge Localisation/master into OpenRCT2/develop.
2016-02-11 04:00:17 +00:00
Alexander Overvoorde
5ee7d1bbae
Show amount of peeps still on ride in tooltip when ride is closed ( resolves #2708 )
2016-02-10 22:29:19 +01:00
OpenRCT2 git bot
629bb93e3e
Merge Localisation/master into OpenRCT2/develop.
2016-02-10 04:00:14 +00:00