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

1675 Commits

Author SHA1 Message Date
Aaron van Geffen aef748af14
Merge pull request #10901 from Gymnasiast/refactor/guest-window-many-pages 
Prepare guest window for more than 5 pages
 2020-03-10 20:05:19 +01:00
OpenRCT2 git bot 5a274da959 Merge Localisation/master into OpenRCT2/develop. 2020-03-10 04:02:29 +00:00
Gymnasiast a0e14a66d9
Prepare guest window for more than 5 pages 2020-03-09 11:54:49 +01:00
OpenRCT2 git bot bb6e09f785 Merge Localisation/master into OpenRCT2/develop. 2020-03-05 04:02:13 +00:00
Daan de Heij 88fcba35ec
Fix #10662: Improve duck cheat tooltips 
Co-authored-by: Thijs Versfelt <40113382+thversfelt@users.noreply.github.com>
 2020-03-03 23:25:22 +01:00
OpenRCT2 git bot 52d5995240 Merge Localisation/master into OpenRCT2/develop. 2020-02-25 04:02:29 +00:00
OpenRCT2 git bot c6df40bf69 Merge Localisation/master into OpenRCT2/develop. 2020-02-24 04:02:23 +00:00
OpenRCT2 git bot 630ff6ce2b Merge Localisation/master into OpenRCT2/develop. 2020-02-23 04:02:14 +00:00
Aaron van Geffen 2528e94b48 Introduce low, medium, and high density buttons to the scatter tool. 
Change window lay-out to more closely resemble others by introducing
density buttons, along with new sprites.

The amount of elements varies by density as follows:
* Low: number of elements equal to tool size
* Medium: twice as many elements as the tool size
* High: three times as many elements as the tool size.

Remove extraneous 'retry' clause.
 2020-02-22 17:25:19 +01:00
Aaron van Geffen 6f029055a3 Make scatter window themeable; default to scenario window style. 2020-02-22 16:18:35 +01:00
Anton Scharnowski e6e48363de Introduce Scenery-Scatter Tool Window. 2020-02-22 16:18:19 +01:00
OpenRCT2 git bot 3b18f66c9e Merge Localisation/master into OpenRCT2/develop. 2020-02-11 04:02:19 +00:00
OpenRCT2 git bot 3f837f561c Merge Localisation/master into OpenRCT2/develop. 2020-01-30 04:01:35 +00:00
OpenRCT2 git bot 550da84ad6 Merge Localisation/master into OpenRCT2/develop. 2020-01-28 04:01:19 +00:00
OpenRCT2 git bot 775add1edb Merge Localisation/master into OpenRCT2/develop. 2020-01-26 04:01:51 +00:00
OpenRCT2 git bot 027c5ce112 Merge Localisation/master into OpenRCT2/develop. 2020-01-25 04:01:30 +00:00
OpenRCT2 git bot 5be2604f27 Merge Localisation/master into OpenRCT2/develop. 2020-01-24 04:01:26 +00:00
OpenRCT2 git bot 06fbfe46ac Merge Localisation/master into OpenRCT2/develop. 2020-01-23 04:01:52 +00:00
Michael Berk 914c07a711 Added Random Title Sequence 2020-01-22 11:41:34 +01:00
OpenRCT2 git bot cccf4b7e94 Merge Localisation/master into OpenRCT2/develop. 2020-01-13 04:01:42 +00:00
Michael Steenbeek d7f23bc5bf
Close #6898: Remove LOADMM and LOADRCT1 commands (#10546) 2020-01-12 14:26:33 +01:00
OpenRCT2 git bot dd36200889 Merge Localisation/master into OpenRCT2/develop. 2020-01-12 04:01:34 +00:00
OpenRCT2 git bot 868a2793e5 Merge Localisation/master into OpenRCT2/develop. 2020-01-09 04:01:45 +00:00
OpenRCT2 git bot 26d6155a95 Merge Localisation/master into OpenRCT2/develop. 2020-01-07 04:00:19 +00:00
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