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

17054 Commits

Author SHA1 Message Date
Duncan 75e0757ee9
Merge pull request #9632 from ZehMatt/fix-9625 
Fix #9625: Show correct cost in scenery selection
 2019-07-26 07:12:57 +01:00
Ted John 5c07c53faf Refactor get banner 2019-07-25 22:21:19 +01:00
Ted John 85543bd1c8 Separate RCT2 and OpenRCT2 banner struct 2019-07-25 22:21:19 +01:00
Duncan 9b4f8a6b4b
Merge pull request #9451 from ZehMatt/refactor/sprite-create-untangle 
Refactor create_sprite
 2019-07-25 06:50:57 +01:00
Michael Steenbeek e5ed5568a8
Remove conversion from UTF-8 to widechar and back again (#9637) 2019-07-24 21:56:49 +02:00
Matt f3638ca858
Address code review 2019-07-24 18:12:25 +02:00
Matt 3395079737
Remove NUM_SPRITE_LISTS macro and replace with SPRITE_LIST_COUNT for consistency 2019-07-24 17:53:54 +02:00
Matt 98a17fe8d9
Refactor create_sprite and remove unnecessary move_sprite_to_list 2019-07-24 17:53:51 +02:00
Michał Janiszewski 837879018f
Make socket status atomic (#9636) 
* Make socket status atomic

`TcpSocket::ConnectAsync` will call `Connect` and modify `_status` from
a different thread and must ensure it doesn't introduce a data race.

* Update src/openrct2/network/Socket.cpp

Co-Authored-By: ζeh Matt <m.moninger.h@gmail.com>
 2019-07-24 15:05:26 +02:00
Ted John 83b1d1f72e
Merge pull request #9629 from IntelOrca/fix/utf8-support-windows 
Fix UTF-8 support on Windows
 2019-07-23 22:15:56 +01:00
Ted John 7a2a5a7924 Fix #9626: Crash when navigating to price tab on park window (#9634) 
The park name argument was being overwritten by the price argument in the argument buffer. Draw price text in paint event instead.
 2019-07-23 21:47:53 +02:00
Matt 126226dbe3
Fix #9625: Show correct cost in scenery selection 2019-07-23 18:03:26 +02:00
Ted John a1d9e52046 Rename ToUtf16 to ToWideChar 
This is more correct as wchar_t size can differ, for example Linux typically uses 32 bits for wchar_t where as Windows uses 16 bits.
 2019-07-22 23:44:03 +01:00
Ted John 6f61c94dbd Remove old widechar <-> utf-8 conversion function 2019-07-22 23:44:03 +01:00
Ted John 3e28073981 Log path when loading / saving park 2019-07-22 22:15:01 +01:00
Ted John 8cd684924e Set console encoding to UTF-8 for Windows 2019-07-22 22:13:38 +01:00
Duncan ab5f5b20cd
Use enum class for RCT2_SOUND (#9618) 
* Use enum class for RCT2_SOUND

* Fix formatting. Fix mistaken declaration.

* Change name of enum to SoundId

* Fix clang format
 2019-07-22 19:02:45 +01:00
ζeh Matt 5a6f573f6b
Merge pull request #9466 from ZehMatt/opengl/rain 
Fix #6515: Add rain rendering to OpenGL renderer
 2019-07-21 19:29:03 +02:00
Hielke Morsink 2792ddfe80 Tile Inspector: Use correct names for up/down buttons 
This little mistake has been around for years and is most likely caused
by reordering the buttons. They used to be side-to-side, but their names
were never changed, and since the order of tile elements is reversed I
never noticed it was wrong.
 2019-07-21 11:34:50 +02:00
Ted John 5733d666b3 Do not store park name as a user string 2019-07-21 11:33:15 +02:00
Cody Brittain 5342a6d9a9 Renamed sound enums for accuracy and organization 2019-07-20 12:41:36 +02:00
Matt 5e79c65d47
[ci skip] Update changelog.txt 2019-07-18 20:55:23 +02:00
Matt 2cf4a42cbe
Add rain rendering to OpenGL renderer 2019-07-18 20:54:47 +02:00
OpenRCT2 git bot 4170255296 Merge Localisation/master into OpenRCT2/develop. 2019-07-18 04:00:24 +00:00
duncanspumpkin 39b1a9568f Adjust makefile 2019-07-17 20:19:43 +01:00
FredFucks d44e89d9a4 Fix Chinese fonts on Linux with "WenQuanYi Micro Hei" (#9584) 2019-07-17 11:22:38 +02:00
OpenRCT2 git bot 0d78826ced Merge Localisation/master into OpenRCT2/develop. 2019-07-17 04:00:22 +00:00
Ferdinand Thiessen 7b317e312c Fix Werror=maybe-uninitialized issue of struct, found by gcc 9.1.1. (#9578) 2019-07-16 10:20:15 +02:00
OpenRCT2 git bot 930eb33e1c Merge Localisation/master into OpenRCT2/develop. 2019-07-16 04:00:23 +00:00
duncanspumpkin c9ac156973 Actually use the correct hash and url 2019-07-15 18:59:00 +01:00
duncanspumpkin 38d97a6ee3 Add cmake download replays. fix win download 2019-07-15 18:50:52 +01:00
duncanspumpkin 870f931a44 Add download of replays to win builds 2019-07-15 18:42:43 +01:00
OpenRCT2 git bot 5a376b7493 Merge Localisation/master into OpenRCT2/develop. 2019-07-15 04:00:23 +00:00
Duncan b32f799e21
Merge pull request #9546 from aaruel/vector-locations 
Refactor #9110: Use a vector for station locations list in sub_6CB945
 2019-07-14 17:46:29 +01:00
Matt 17918d2f6b
Remove replays 2019-07-14 16:45:55 +02:00
Matt 73d7591f40
Serialise all cheats 2019-07-14 16:42:24 +02:00
Matt e267be785b
Remove obsolete code 2019-07-14 16:42:08 +02:00
Michael Steenbeek 3706581073
Add support for drawing en-dash and multiplication sign (#9570) 2019-07-14 15:58:33 +02:00
Michael Steenbeek aff3e42408
Merge pull request #9453 from duncanspumpkin/remove_gc 
Remove Networked Game Commands
 2019-07-14 14:46:46 +02:00
Cody Brittain 238a10034e Remove sloped curves from Spinning Wild Mouse 2019-07-14 14:05:27 +02:00
Duncan 4e44818a04
Merge pull request #9449 from ZehMatt/refactor/sprite-list-pow2 
Remove unnecessary multiplication and division for sprite lists
 2019-07-13 09:37:35 +01:00
duncanspumpkin fc657e2571 Revert name change in RCT12 struct to reflect its use. 
The new linked_list_index is only for the internal sprite base struct. When importing we are referring to the old linked_list_type_offset. If the names were the same it would not provide any information as to why one was a factor of two different.
 2019-07-13 07:20:15 +01:00
Aaron van Geffen f3c45de38d Change version number for Travis builds. [ci skip] 2019-07-12 10:34:47 +02:00
Duncan 6eda04943d
Merge pull request #9458 from Spongeloaf/feature/9285_scenario_group_tab 
Fix #9285 Add feature to remember scernario tab
 2019-07-11 20:47:39 +01:00
Jim Armstrong 9c976daa51 Refactor #9474: Refactor jumping fountain code (#9475) 
* Refactor jumping_fountain_update to Update

* Refactor jumping_fountain_get_type to GetType

* Refactor jumping_fountain_continue to Continue

Fix typos and misc refactoring

* Refactor begin and create functions into static member functions

Move jumping_fountain_begin and jumping_fountain_create into the rct_jumping_fountain struct and make them static

* Refactor remaining fountain functionality into member functions

* Rename JumpingFountain struct and move to proper header file

JumpingFountain code was refactored to conform to variable naming conventions and moved into the Fountain.h file.

rct_sprite_generic struct was moved to SpriteBase.h - this was done to get around a circular header dependency between Fountain.h and Sprite.h

* Set access modifier for private functions

* Change JumpingFountain variable names to TitleCase

* Refactor #9474: Clarify where auto is being used with pointers

* Refactor #9474: Change function names for clarity

* Refactor #9474: Fix incorrect function names
 2019-07-11 20:38:30 +01:00
Duncan d7586e9b76
Merge pull request #9459 from 41northstudios/refactor-9291 
Refactor #9291: Move easter egg code to Guest
 2019-07-11 20:37:25 +01:00
Michael Steenbeek 3f8f55973c
Merge pull request #9550 from AaronVanGeffen/xcode/fixes 
Update Xcode project
 2019-07-11 18:55:01 +02:00
Aaron van Geffen cfd863ef12 Prevent making unnecessary copies in certain tile loops (#9549) 2019-07-11 18:43:33 +02:00
Aaron van Geffen f6c002afd9 Xcode: enable hardened runtime for all targets. 2019-07-11 12:18:28 +02:00
Aaron van Geffen 647b75a8bf Add missing game action headers to Xcode project. 2019-07-11 11:46:55 +02:00