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

1927 Commits

Author SHA1 Message Date
duncanspumpkin 35fdcdb256 Merge branch 'develop' into HEAD 2021-06-08 13:02:16 +01:00
OpenRCT2 git bot c1c9353dd2 Merge Localisation/master into OpenRCT2/develop 2021-06-06 05:00:05 +00:00
duncanspumpkin 5bac7821c9 Merge develop 2021-06-04 13:11:47 +01: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 3e357e6148
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-27 22:40:34 +02: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
Gymnasiast 8bc8a0df14
Remove Music Acknowledgements window 
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
 2021-05-26 17:56:02 +02:00
Gymnasiast 7feb3802fb
Show what a stall sells in Object Selection 2021-05-26 17:46:04 +02:00
Gymnasiast 5fcb1f7273
Show tracks list of music styles in Object Selection 2021-05-26 17:46:03 +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
Ted John de6c4b7b76 Fix park value objective string for currency 64 2021-05-24 20:04:54 +01:00
Gymnasiast 080343c99d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-24 19:30:05 +02: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
Ted John 2b2159976d Merge branch 'develop' into new-save-format 2021-05-17 21:33:29 +01:00
Gymnasiast 971c7fa26b
Update footpath railings tab icon; update some descriptions 2021-05-16 14:15:41 +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
Ted John dbd1f0aa46 Show error message if JSON object selected on td select 2021-04-26 20:51:18 +01:00
Ted John 6db0c01fdc Merge branch 'develop' into new-save-format 2021-04-25 15:03:45 +01:00
Ted John 8b40162871 Update title inspector for footpaths 2021-04-24 17:25:52 +01:00
Ted John 627735da72 Add tooltips for new footpath objects 2021-04-24 16:57:02 +01:00
Ted John dff8d443f6 Ensure one footpath surface and railing is selected 2021-04-24 16:23:34 +01:00
Michał Janiszewski 10bc3da9b9
Improve shader compatibility with GLES (#14489) 2021-04-20 08:10:23 +02:00
Gymnasiast 4437e692e2 Replace remnants of corrupted elements 2021-04-03 00:21:43 +01:00
Gymnasiast 87422c2806 Replace corrupt elements with invisibility bit 2021-04-03 00:21:43 +01: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
OpenRCT2 git bot 6e5b4726a3 Merge Localisation/master into OpenRCT2/develop 2021-02-09 04:05:23 +00:00
OpenRCT2 git bot c35b1cf423 Merge Localisation/master into OpenRCT2/develop 2021-02-03 04:07:13 +00:00
OpenRCT2 git bot 6eb0d3cc28 Merge Localisation/master into OpenRCT2/develop 2021-02-02 04:11:12 +00:00
Umdlye 2c408342d9
Create toggle for zoom toolbar button 2021-02-01 17:27:40 +01:00
OpenRCT2 git bot 4218766729 Merge Localisation/master into OpenRCT2/develop 2021-02-01 04:10:33 +00:00
OpenRCT2 git bot 418b6f9a54 Merge Localisation/master into OpenRCT2/develop 2021-01-30 04:09:25 +00:00
OpenRCT2 git bot a49a2fdd85 Merge Localisation/master into OpenRCT2/develop 2021-01-27 04:08:46 +00:00
OpenRCT2 git bot 7d90df1baa Merge Localisation/master into OpenRCT2/develop 2021-01-24 04:35:00 +00:00
OpenRCT2 git bot cf83752ce4 Merge Localisation/master into OpenRCT2/develop 2021-01-21 04:33:38 +00:00
OpenRCT2 git bot bd27046142 Merge Localisation/master into OpenRCT2/develop 2021-01-18 04:30:01 +00:00
OpenRCT2 git bot fb4d14e843 Merge Localisation/master into OpenRCT2/develop 2021-01-16 04:28:43 +00:00
OpenRCT2 git bot baaf686eef Merge Localisation/master into OpenRCT2/develop 2021-01-14 04:31:10 +00:00
OpenRCT2 git bot 5c33773807 Merge Localisation/master into OpenRCT2/develop 2021-01-13 04:31:57 +00:00
OpenRCT2 git bot e51a048add Merge Localisation/master into OpenRCT2/develop 2021-01-12 04:28:33 +00:00
OpenRCT2 git bot e2021fcbce Merge Localisation/master into OpenRCT2/develop 2021-01-11 04:29:22 +00:00
OpenRCT2 git bot ef6a80982a Merge Localisation/master into OpenRCT2/develop 2021-01-10 04:29:24 +00:00
OpenRCT2 git bot 005bc3c360 Merge Localisation/master into OpenRCT2/develop 2021-01-07 04:23:49 +00:00
X123M3-256 deca5a3881
Add "Single Rail Roller Coaster" ride type 2021-01-06 21:10:15 +01:00
OpenRCT2 git bot 017f7ef9e4 Merge Localisation/master into OpenRCT2/develop 2021-01-06 04:21:33 +00:00
OpenRCT2 git bot fd37700433 Merge Localisation/master into OpenRCT2/develop 2021-01-05 04:20:44 +00:00
OpenRCT2 git bot f8c0aea9e2 Merge Localisation/master into OpenRCT2/develop 2021-01-04 04:20:10 +00:00
Gymnasiast 52bc650abf
Improve feedback when selecting the wrong file 2021-01-03 18:40:02 +01:00
Gymnasiast 07c3a930e4
Apply review requests 2021-01-03 17:53:38 +01:00
Keith Stellyes 268e39d12a
GOG installer extraction for POSIX 2021-01-03 17:53:14 +01:00
Michael Steenbeek 44d595835a
Fix #13653: Incorrect colours in Inventions List 2021-01-03 14:06:52 +01:00
OpenRCT2 git bot 920dd756f3 Merge Localisation/master into OpenRCT2/develop 2021-01-03 04:18:46 +00:00
OpenRCT2 git bot b5aaab58fc Merge Localisation/master into OpenRCT2/develop 2020-12-24 04:16:47 +00:00
Gymnasiast 17fe4bd7ea
en-GB: Replace typewriter quotes with typographical ones 2020-12-23 21:03:12 +01:00
OpenRCT2 git bot baf1924b25 Merge Localisation/master into OpenRCT2/develop 2020-12-21 04:09:34 +00:00
OpenRCT2 git bot 150f243a9f Merge Localisation/master into OpenRCT2/develop 2020-12-20 04:06:03 +00:00
Łukasz Pękalski 9ec61fa5d2
Close #12993: Remove hardcoded {SMALLFONT}{BLACK} from tooltips 2020-12-19 20:53:57 +01:00
OpenRCT2 git bot 4ee47b18a0 Merge Localisation/master into OpenRCT2/develop 2020-12-19 04:07:36 +00:00
OpenRCT2 git bot 24f2a12e53 Merge Localisation/master into OpenRCT2/develop 2020-12-18 04:08:07 +00:00
OpenRCT2 git bot dea4792509 Merge Localisation/master into OpenRCT2/develop 2020-12-17 04:06:09 +00:00
OpenRCT2 git bot f1e19edb78 Merge Localisation/master into OpenRCT2/develop 2020-12-16 04:06:07 +00:00
OpenRCT2 git bot b60d418601 Merge Localisation/master into OpenRCT2/develop 2020-12-15 04:05:46 +00:00
OpenRCT2 git bot d246e4a9c9 Merge Localisation/master into OpenRCT2/develop 2020-12-14 04:05:58 +00:00
OpenRCT2 git bot 9cefafd117 Merge Localisation/master into OpenRCT2/develop 2020-12-08 04:06:02 +00:00