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

1651 Commits

Author SHA1 Message Date
OpenRCT2 git bot 09bb3b0ae5 Merge Localisation/master into OpenRCT2/develop. 2020-01-06 04:00:18 +00:00
Michael Steenbeek 08ab15ef36
Fix #10313: Path furniture can be placed on level crossings 2020-01-05 17:59:02 +01:00
OpenRCT2 git bot 8d99d37eba Merge Localisation/master into OpenRCT2/develop. 2020-01-05 04:00:19 +00:00
OpenRCT2 git bot dcdd312eb1 Merge Localisation/master into OpenRCT2/develop. 2020-01-01 04:00:17 +00:00
Kevin Strehl 37110f386d Add Keyboard Shortcuts to the Tile Inspector (#10430) 2019-12-31 09:34:38 +01:00
OpenRCT2 git bot e36d87eb07 Merge Localisation/master into OpenRCT2/develop. 2019-12-29 04:00:19 +00:00
OpenRCT2 git bot 7f3c7ea936 Merge Localisation/master into OpenRCT2/develop. 2019-12-22 04:00:18 +00:00
OpenRCT2 git bot fe23df5b48 Merge Localisation/master into OpenRCT2/develop. 2019-12-18 04:00:22 +00:00
OpenRCT2 git bot 0d11f4f150 Merge Localisation/master into OpenRCT2/develop. 2019-12-16 04:00:19 +00:00
Abd Narane 1ace96ccc4 Add shortcuts for changing the scaling value. (#10341) 
Fixes #10305
 2019-12-13 17:31:23 +01:00
OpenRCT2 git bot c0208210e5 Merge Localisation/master into OpenRCT2/develop. 2019-12-11 04:00:20 +00:00
OpenRCT2 git bot 137d47a375 Merge Localisation/master into OpenRCT2/develop. 2019-12-09 04:00:18 +00:00
OpenRCT2 git bot b02729d0ce Merge Localisation/master into OpenRCT2/develop. 2019-12-06 04:00:19 +00:00
Wuzzy b2443d36e8 Change some ride descriptions (#10244) 2019-12-04 14:10:03 +01:00
OpenRCT2 git bot 91df8358a1 Merge Localisation/master into OpenRCT2/develop. 2019-11-29 04:00:19 +00:00
OpenRCT2 git bot 7a31b3c230 Merge Localisation/master into OpenRCT2/develop. 2019-11-21 04:00:19 +00:00
OpenRCT2 git bot 40e22eba8a Merge Localisation/master into OpenRCT2/develop. 2019-11-18 04:00:18 +00:00
OpenRCT2 git bot f959be6b44 Merge Localisation/master into OpenRCT2/develop. 2019-11-16 04:00:16 +00:00
OpenRCT2 git bot ffb1982d5e Merge Localisation/master into OpenRCT2/develop. 2019-11-05 04:00:18 +00:00
Aaron van Geffen 91f91d4388
Merge pull request #10147 from AaronVanGeffen/implement/1164 
Use available translations for shortcut keys
 2019-11-04 13:07:34 +01:00
OpenRCT2 git bot 66b26acf2f Merge Localisation/master into OpenRCT2/develop. 2019-11-02 04:00:17 +00:00
Aaron van Geffen 71699543dd Remove obsolete key label strings; update changelog. 2019-11-01 21:14:01 +01:00
Hielke Morsink 78c550351d Properly fix usage of station index string (#10141) 
This basically reverts the change in en-GB.txt from #10077 and fixes the usage of this string where it was broken.
 2019-10-29 17:35:36 +01:00
OpenRCT2 git bot 673a43b560 Merge Localisation/master into OpenRCT2/develop. 2019-10-27 04:00:22 +00:00
OpenRCT2 git bot e9bcad193a Merge Localisation/master into OpenRCT2/develop. 2019-10-24 04:00:22 +00:00
OpenRCT2 git bot 43cb570aeb Merge Localisation/master into OpenRCT2/develop. 2019-10-22 04:00:15 +00:00
OpenRCT2 git bot 1d8f56ca80 Merge Localisation/master into OpenRCT2/develop. 2019-10-21 04:00:16 +00:00
Matt 0615ebc56a
Revert accident 2019-10-20 00:21:19 +02:00
Matt b6cd566051
Update language/en-GB.txt 2019-10-20 00:21:19 +02:00
Matt 7fa41bb82d
Implement 'Create Ducks' cheat 2019-10-20 00:21:18 +02:00
OpenRCT2 git bot 1f3998909b Merge Localisation/master into OpenRCT2/develop. 2019-10-18 04:00:17 +00:00
OpenRCT2 git bot c8acb15189 Merge Localisation/master into OpenRCT2/develop. 2019-10-12 04:00:16 +00:00
Hielke Morsink 4be85479af Fix #9985: Mistake from #9128 (#10077) 2019-10-11 07:12:49 +01:00
OpenRCT2 git bot 590b2286c1 Merge Localisation/master into OpenRCT2/develop. 2019-10-11 04:00:16 +00:00
OpenRCT2 git bot 7df9344d09 Merge Localisation/master into OpenRCT2/develop. 2019-10-07 04:00:16 +00:00
OpenRCT2 git bot 366c13e8fe Merge Localisation/master into OpenRCT2/develop. 2019-09-20 04:00:16 +00:00
OpenRCT2 git bot 1d6e4d7180 Merge Localisation/master into OpenRCT2/develop. 2019-09-04 04:00:16 +00:00
OpenRCT2 git bot 9d9baaaaac Merge Localisation/master into OpenRCT2/develop. 2019-09-03 04:00:15 +00:00
OpenRCT2 git bot dfdcca51bb Merge Localisation/master into OpenRCT2/develop. 2019-09-02 04:00:16 +00:00
OpenRCT2 git bot c3b9d43058 Merge Localisation/master into OpenRCT2/develop. 2019-09-01 04:00:16 +00:00
OpenRCT2 git bot e5dd6f43d7 Merge Localisation/master into OpenRCT2/develop. 2019-08-28 04:00:15 +00:00
OpenRCT2 git bot e19b3f5680 Merge Localisation/master into OpenRCT2/develop. 2019-08-25 04:00:16 +00:00
OpenRCT2 git bot 1d67f86cc1 Merge Localisation/master into OpenRCT2/develop. 2019-08-17 04:00:28 +00:00
Ted John 8f917a2590 Show the object download source when downloading object files 2019-08-13 18:32:32 +01:00
Ted John 1f9f48e054 Fix flickering banners 2019-07-29 21:41:21 +01:00
OpenRCT2 git bot 4170255296 Merge Localisation/master into OpenRCT2/develop. 2019-07-18 04:00:24 +00:00
OpenRCT2 git bot 0d78826ced Merge Localisation/master into OpenRCT2/develop. 2019-07-17 04:00:22 +00:00
OpenRCT2 git bot 930eb33e1c Merge Localisation/master into OpenRCT2/develop. 2019-07-16 04:00:23 +00:00
OpenRCT2 git bot 5a376b7493 Merge Localisation/master into OpenRCT2/develop. 2019-07-15 04:00:23 +00:00
OpenRCT2 git bot b7b846c0d5 Merge Localisation/master into OpenRCT2/develop. 2019-07-08 04:00:21 +00:00
OpenRCT2 git bot b25c1c8088 Merge Localisation/master into OpenRCT2/develop. 2019-06-26 04:00:35 +00:00
OpenRCT2 git bot a4f6d6b831 Merge Localisation/master into OpenRCT2/develop. 2019-06-25 04:00:23 +00:00
OpenRCT2 git bot 72f605e206 Merge Localisation/master into OpenRCT2/develop. 2019-06-17 04:00:24 +00:00
OpenRCT2 git bot 288921132d Merge Localisation/master into OpenRCT2/develop. 2019-06-11 04:00:22 +00:00
OpenRCT2 git bot 712c2d9b67 Merge Localisation/master into OpenRCT2/develop. 2019-06-10 04:00:22 +00:00
Hielke Morsink 5418eb6e34 Add transparency setting to options window 2019-06-09 11:03:01 +02:00
OpenRCT2 git bot 9bca783fff Merge Localisation/master into OpenRCT2/develop. 2019-06-08 04:00:21 +00:00
OpenRCT2 git bot 6cfe9f373f Merge Localisation/master into OpenRCT2/develop. 2019-06-07 04:00:23 +00:00
OpenRCT2 git bot 7dc0068f6e Merge Localisation/master into OpenRCT2/develop. 2019-06-06 04:00:25 +00:00
Aaron van Geffen f1ac847fce
Merge pull request #9222 from IntelOrca/implement/485-ghost-train-simulation 
Implement #485: ghost train simulation
 2019-06-04 20:24:16 +02:00
OpenRCT2 git bot 4d7c78fa3a Merge Localisation/master into OpenRCT2/develop. 2019-05-29 04:00:23 +00:00
Ted John 62ff1e7534 Prevent breakdown during simulation 2019-05-28 16:50:38 +01:00
Ted John c4e18e570e Add and implement simulation mode for rides 2019-05-28 16:50:08 +01:00
nexgenration 46889b5381 Implement #9231: Add sprite_index to Guest Debug Tab 2019-05-27 22:39:03 +02:00
OpenRCT2 git bot a484102f61 Merge Localisation/master into OpenRCT2/develop. 2019-05-22 04:00:38 +00:00
OpenRCT2 git bot 831d69083e Merge Localisation/master into OpenRCT2/develop. 2019-05-21 04:00:31 +00:00
OpenRCT2 git bot 65f110fad8 Merge Localisation/master into OpenRCT2/develop. 2019-05-20 04:00:22 +00:00
joshtucker132 4dc77bf121 Feature #8791: Improved tile element flag manipulation in Tile Inspector 2019-05-14 21:38:31 +02:00
OpenRCT2 git bot 058475f445 Merge Localisation/master into OpenRCT2/develop. 2019-05-13 04:00:25 +00:00
OpenRCT2 git bot d3b5ac3f07 Merge Localisation/master into OpenRCT2/develop. 2019-05-12 04:00:22 +00:00
ζeh Matt c8f822ea70
Gamestate snapshots (#8819) 
* Add initial interface.

* Implement move operator in MemoryStream

* Add pod array serialisation traits.

* Add push_back with move semantics to CircularBuffer

* Initial implementation of GameStateSnapshots

* Add GameStateSnapshots to Context.

* Add mp_desync console command.

* Compare sprite data and fill change list.

* Minor changes.

* Proof of concept.

* Calculate offset instead of using offsetof

* Implement game state difference detection

* Update mp_desync console command.

* Fix identification of sprite remove/add.

* Fix crash when only one peep in park when using mp_desync

* Output state differences into user directory desync folder.

* Add desync debugging as an option.

* Add information to network status when a desync report was created.

* Cast to proper type for %llu.

* Update xcode project

* Add more information to the diffed data.

* Remove client-only relevant fields.

* Cleanup.

* Add better name output for misc sprites

* Add srand0 and tick information to the output

* Bump up network version

* Cleanup

* Set desync_debugging to false as default

* Apply suggestions
 2019-05-11 21:31:34 +02:00
OpenRCT2 git bot 9af568d97c Merge Localisation/master into OpenRCT2/develop. 2019-05-10 04:00:24 +00:00
OpenRCT2 git bot 8f64bef9c2 Merge Localisation/master into OpenRCT2/develop. 2019-05-09 04:00:22 +00:00
OpenRCT2 git bot 27a119069a Merge Localisation/master into OpenRCT2/develop. 2019-05-08 04:00:26 +00:00
Ted John 0d0479f9b1
Merge pull request #8558 from richard-fine/feature/peep-inspector 
Peep debug tab
 2019-05-06 20:29:29 +01:00
OpenRCT2 git bot 107a93b2e7 Merge Localisation/master into OpenRCT2/develop. 2019-05-05 04:00:24 +00:00
Ted John a22f0a53fb Use localised strings for guest debug tab 2019-05-04 21:48:02 +00:00
Ted John 1d296242b4 Improve text colour 2019-05-04 14:09:15 +00:00
OpenRCT2 git bot c7afad7d49 Merge Localisation/master into OpenRCT2/develop. 2019-05-04 04:00:23 +00:00
OpenRCT2 git bot ddcebc9b4c Merge Localisation/master into OpenRCT2/develop. 2019-05-03 04:00:26 +00:00
Xkeeper bc8ecd8e67 Add "Reconnect" option under the multiplayer button 2019-05-02 00:26:37 +02:00
Xkeeper 877ce58f0b Update sign tooltip to use STR_NO_ENTRY 
Changes the number of the sign tooltip string
and removes the now-duplicate "no entry" string
 2019-05-01 23:58:38 +02:00
Xkeeper c6a4316bd4 Update banner formatting code/strings 
Changes some things to use STR_BANNER_TEXT_FORMAT and removes
instances of " - - " attached to other strings in the
localization files.

This can be used in the future to show the messages on
a sign or banner via a tooltip without having to
duplicate those messages without " - - ".
 2019-05-01 23:57:07 +02:00
Xkeeper a1454be336 Add new localizable strings for sign tooltips 
re: OpenRCT2/OpenRCT2#8593

These strings use high IDs right now and are probably
not entirely suited for direct inclusion. There is also
some duplication in that "No entry" had to be unique,
as the actual no entry string is "No entry - -".
 2019-05-01 23:57:07 +02:00
OpenRCT2 git bot 53bbe68311 Merge Localisation/master into OpenRCT2/develop. 2019-04-29 04:00:22 +00:00
OpenRCT2 git bot 0183fc76db Merge Localisation/master into OpenRCT2/develop. 2019-04-25 04:00:23 +00:00
Hielke Morsink ac7bc97736 Expose colour scheme in the tile inspector (#6116) 2019-04-22 15:49:09 +02:00
Hielke Morsink d8f1933a5b Show dash for station index for non-station elements 2019-04-22 15:25:29 +02:00
OpenRCT2 git bot 69ef23740e Merge Localisation/master into OpenRCT2/develop. 2019-04-15 04:00:29 +00:00
OpenRCT2 git bot 8632eb7297 Merge Localisation/master into OpenRCT2/develop. 2019-04-11 04:00:23 +00:00
OpenRCT2 git bot 27cccce312 Merge Localisation/master into OpenRCT2/develop. 2019-04-10 04:00:21 +00:00
OpenRCT2 git bot 198194fa35 Merge Localisation/master into OpenRCT2/develop. 2019-04-09 04:00:23 +00:00
ζeh Matt 62f163a67d Don't enable multithreading option by default. (#9039) 2019-04-04 12:11:37 +02:00
hokasha2016 1ff1f6d126 Add the Hungarian Forint (HUF) to the list of available currencies. (#9017) 2019-04-03 00:04:22 +02:00
Michał Janiszewski 2fb31910ca
Merge pull request #8481 from ZehMatt/multicore-rendering 
Implement partial multicore rendering
 2019-04-02 22:08:46 +02:00
OpenRCT2 git bot e34e06db4c Merge Localisation/master into OpenRCT2/develop. 2019-04-01 04:00:34 +00:00
Matt 37c3809744 Implement partial multicore rendering 2019-03-31 15:50:55 +02:00
OpenRCT2 git bot 6da2990bf1 Merge Localisation/master into OpenRCT2/develop. 2019-03-31 04:00:40 +00:00
OpenRCT2 git bot ba08997c33 Merge Localisation/master into OpenRCT2/develop. 2019-03-29 04:00:31 +00:00
OpenRCT2 git bot 0902b019d4 Merge Localisation/master into OpenRCT2/develop. 2019-03-28 04:00:23 +00:00