mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,380 Commits 8 Branches 39 Tags 360 MiB
Commit Graph

1865 Commits

Author SHA1 Message Date
OpenRCT2 git bot 8b9129d9f3 Merge Localisation/master into OpenRCT2/develop 2021-07-21 04:07:43 +00:00
OpenRCT2 git bot 707d4156bc Merge Localisation/master into OpenRCT2/develop 2021-07-07 04:07:54 +00:00
OpenRCT2 git bot 2650828f08 Merge Localisation/master into OpenRCT2/develop 2021-06-28 04:07:26 +00:00
Hielke Morsink acd45e6f75
Redesign About window (#14841) 2021-06-26 10:54:38 +02:00
OpenRCT2 git bot 9383fcef41 Merge Localisation/master into OpenRCT2/develop 2021-06-16 04:07:56 +00:00
OpenRCT2 git bot c1c9353dd2 Merge Localisation/master into OpenRCT2/develop 2021-06-06 05:00:05 +00:00
OpenRCT2 git bot 5b5aa0771e Merge Localisation/master into OpenRCT2/develop 2021-05-29 05:52:24 +00:00
OpenRCT2 git bot 4c1ab8d934 Merge Localisation/master into OpenRCT2/develop 2021-05-28 05:22:13 +00:00
Gymnasiast b214a9fd97
Show what a stall sells in Object Selection 2021-05-27 19:54:44 +02:00
Gymnasiast f2ac658935
Show tracks list of music styles in Object Selection 2021-05-27 19:53:52 +02:00
Michael Steenbeek 4be838a9b8
Reserve strings for the new-save-format branch 
Avoiding constant merge conflicts
 2021-05-27 19:52:11 +02:00
OpenRCT2 git bot 1b11e691c9 Merge Localisation/master into OpenRCT2/develop 2021-05-26 04:43:40 +00:00
OpenRCT2 git bot 15bb5f53f8 Merge Localisation/master into OpenRCT2/develop 2021-05-25 04:28:28 +00:00
Gymnasiast 8f6713a4f1
Reverse option, add shortcut 2021-05-24 16:54:30 +02:00
Gymnasiast 89eae5198b
Add option to make water opaque 2021-05-24 16:39:39 +02:00
OpenRCT2 git bot 217b5a5c48 Merge Localisation/master into OpenRCT2/develop 2021-05-12 04:13:26 +00:00
OpenRCT2 git bot c20bb2b8aa Merge Localisation/master into OpenRCT2/develop 2021-05-02 04:11:56 +00:00
Michał Janiszewski 10bc3da9b9
Improve shader compatibility with GLES (#14489) 2021-04-20 08:10:23 +02:00
OpenRCT2 git bot 0bb5d453a4 Merge Localisation/master into OpenRCT2/develop 2021-04-02 04:05:31 +00:00
OpenRCT2 git bot 7c33a31d3a Merge Localisation/master into OpenRCT2/develop 2021-04-01 04:02:31 +00:00
Gymnasiast 69f7ad35fc
en-GB: Use real multiplication sign instead of x 2021-03-31 14:37:35 +02:00
OpenRCT2 git bot 6bff0fb1a1 Merge Localisation/master into OpenRCT2/develop 2021-03-30 04:02:43 +00:00
OpenRCT2 git bot dd7258eb33 Merge Localisation/master into OpenRCT2/develop 2021-03-29 04:04:12 +00:00
OpenRCT2 git bot 7c78a2b8c3 Merge Localisation/master into OpenRCT2/develop 2021-03-28 04:03:42 +00:00
Geoff B 6c8493cb69
Close #14253: Replace font size tokens with adjusted DrawText calls 2021-03-27 14:40:17 +01:00
Michael Steenbeek 713410ab6c
Apply changed strings from the new-save-format branch 2021-03-27 14:31:13 +01:00
OpenRCT2 git bot e8e30e9c6a Merge Localisation/master into OpenRCT2/develop 2021-03-27 04:02:43 +00:00
OpenRCT2 git bot 4631c22a3c Merge Localisation/master into OpenRCT2/develop 2021-03-21 04:05:54 +00:00
OpenRCT2 git bot cc68b8bf4d Merge Localisation/master into OpenRCT2/develop 2021-03-15 04:06:00 +00:00
manatails 4fe5b1dc79
Add "Vandals stopped" stat for security guards (#14071) 
* Add a stat for security guards: Vandals stopped

* Update src/openrct2-ui/windows/Staff.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* Update src/openrct2/peep/Guest.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* No need to update screenCoords at the last line

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Add changelog entry and bump network version

* Update to new UI code

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-03-14 09:18:35 -03:00
OpenRCT2 git bot 72b6160b65 Merge Localisation/master into OpenRCT2/develop 2021-03-14 04:05:51 +00:00
OpenRCT2 git bot 32ce6c9b4b Merge Localisation/master into OpenRCT2/develop 2021-03-13 04:06:03 +00:00
OpenRCT2 git bot cffb467a77 Merge Localisation/master into OpenRCT2/develop 2021-03-11 04:06:01 +00:00
OpenRCT2 git bot 245c9679e3 Merge Localisation/master into OpenRCT2/develop 2021-03-09 04:05:56 +00:00
OpenRCT2 git bot de7e378216 Merge Localisation/master into OpenRCT2/develop 2021-03-07 04:05:55 +00:00
Ted John 966129dd7c
Remove network traffic window 
Now available in the DevTools plugin.
 2021-03-06 14:47:06 +01:00
Ted John b179f6e597
Merge pull request #13965 from telk5093/footpath_hotkeys 
Make ride construction shortcuts work for footpath too
 2021-03-06 01:27:18 +00:00
TELK 57a9b0f85e Change Ride construction strings into "Construction" 2021-03-04 18:06:49 +09:00
OpenRCT2 git bot 723aa9b654 Merge Localisation/master into OpenRCT2/develop 2021-03-01 04:06:01 +00:00
OpenRCT2 git bot 03d6771cce Merge Localisation/master into OpenRCT2/develop 2021-02-26 04:05:52 +00:00
OpenRCT2 git bot 2733447387 Merge Localisation/master into OpenRCT2/develop 2021-02-25 04:05:56 +00:00
Ted John faf7f5706f
Merge pull request #14158 from IntelOrca/fix/14149-shortcuts-save 
Fix #14149: Numpad shortcut keys are not loaded correctly
Fix #14160: Game crashs when registering shortcuts
Fix #14161: ShortcutDesc.bindings does not work
 2021-02-24 22:19:30 +00:00
OpenRCT2 git bot 9e4553c5b6 Merge Localisation/master into OpenRCT2/develop 2021-02-24 04:04:59 +00:00
Ted John aedd93ef33 Add remove button to clear a shortcut 2021-02-23 21:34:32 +00:00
Michael Steenbeek 0cdbc99984
Merge pull request #13848 from IntelOrca/refactor/shortcut-engine 
Introduce new shortcut engine
 2021-02-21 14:01:39 +01:00
OpenRCT2 git bot 12ffca22a7 Merge Localisation/master into OpenRCT2/develop 2021-02-21 04:05:36 +00:00
Ted John 2b14fe9d7f Update shortcut listings 2021-02-21 03:14:19 +00:00
Ted John 550766698d Make shortcut strings title case 2021-02-21 03:14:19 +00:00
Ted John ff86ebbfe5 Localise shortcut strings 2021-02-21 03:14:19 +00:00
OpenRCT2 git bot c0839e1b88 Merge Localisation/master into OpenRCT2/develop 2021-02-12 04:05:48 +00:00