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

658 Commits

Author SHA1 Message Date
OpenRCT2 git bot b6c8917b3a Merge Localisation/master into OpenRCT2/develop. 2016-03-07 04:00:18 +00:00
OpenRCT2 git bot 25e536bb1c Merge Localisation/master into OpenRCT2/develop. 2016-03-06 04:00:13 +00:00
OpenRCT2 git bot dcf248a1d4 Merge Localisation/master into OpenRCT2/develop. 2016-03-05 04:00:14 +00:00
danidoedel 57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
OpenRCT2 git bot 9ef4af548b Merge Localisation/master into OpenRCT2/develop. 2016-03-04 04:00:15 +00:00
OpenRCT2 git bot da631e9009 Merge Localisation/master into OpenRCT2/develop. 2016-03-03 04:00:16 +00:00
IntelOrca c60e05fc99 add default ride inspection interval option, closes #1455 2016-03-02 19:27:54 +00:00
OpenRCT2 git bot 9cc930ebac Merge Localisation/master into OpenRCT2/develop. 2016-03-02 04:00:17 +00:00
IntelOrca dcf09c5d4b show total number of players online on server list 2016-03-01 18:45:30 +00:00
OpenRCT2 git bot e94d2a9d8b Merge Localisation/master into OpenRCT2/develop. 2016-03-01 04:00:23 +00:00
IntelOrca e57f27e1a1 improve group renaming 2016-02-29 22:34:37 +00:00
IntelOrca a634aacfab show information about locked scenarios, closes #2660 2016-02-29 21:28:01 +00:00
Michael Steenbeek ad37bd0496 UK: Typo 2016-02-29 11:11:51 +01:00
IntelOrca 5ee023c86e reinstate string id: 5664 2016-02-28 10:37:44 +00:00
OpenRCT2 git bot 9e732095ec Merge Localisation/master into OpenRCT2/develop. 2016-02-28 04:00:13 +00:00
OpenRCT2 git bot af72a537af Merge Localisation/master into OpenRCT2/develop. 2016-02-27 04:00:19 +00:00
Michał Janiszewski e232358608 Display message with chat shortcut keys upon connection 
Works for server as well.
 2016-02-26 10:26:30 +01:00
OpenRCT2 git bot adde88ca92 Merge Localisation/master into OpenRCT2/develop. 2016-02-26 04:00:23 +00:00
IntelOrca 1dde20a8f5 remove unused string ID 2016-02-25 20:21:22 +00:00
IntelOrca 6484326892 use built ago label for ride list instead of age 2016-02-25 17:59:32 +00:00
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
OpenRCT2 git bot 03b34459dd Merge Localisation/master into OpenRCT2/develop. 2016-02-09 04:00:15 +00:00
OpenRCT2 git bot 4ae8d450e0 Merge Localisation/master into OpenRCT2/develop. 2016-02-07 04:00:12 +00:00
OpenRCT2 git bot 3a3b731db6 Merge Localisation/master into OpenRCT2/develop. 2016-02-05 04:00:11 +00:00
OpenRCT2 git bot 45cf56167b Merge Localisation/master into OpenRCT2/develop. 2016-02-04 04:00:15 +00:00
IntelOrca 72bed4f677 fix theme window strings 2016-02-03 18:28:25 +00:00