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

19557 Commits

Author SHA1 Message Date
Michał Janiszewski 66a9c9afc6
Generate position-independent code for amd64 builds for Linux 
This is standard on some distributions, a good practice to play along
with ASLR and changes a bit what compiler knows about possible null
values, for which it complained in Launchpad builds in the past.
 2020-07-27 17:20:00 +02:00
OpenRCT2 git bot c0a1370df9 Merge Localisation/master into OpenRCT2/develop. 2020-07-27 04:03:39 +00:00
Michael Steenbeek 41162cc22f
Fix: bad kerning on lowercase 'j' character (original bug) 2020-07-26 23:19:16 +02:00
ζeh Matt 8217acd86f
Merge pull request #12487 from IntelOrca/fix/12297-opengl-resizeatlas 
Fix #12297: OpenGL renderer causing artifacts
 2020-07-26 20:24:35 +02:00
Ted John cf9e8022a0 Fix #12297: OpenGL renderer causing artifacts 
Do not re-allocate texture memory if we don't need to and aren't going to restore the old pixels.
 2020-07-26 18:46:23 +01:00
Duncan 8a378ad236
Remove uses of GET_PEEP macro and replace with GetEntity (#12467) 
* Use TryGetEntity and GetEntity instead of macro

* Use GetEntity for ui guest window

* Remove final GET_PEEP macro uses

* Fix remaining issues
 2020-07-26 17:42:02 +01:00
Michael Steenbeek ba10b84789
Fix #12478: Crash in track_block_get_next() 2020-07-26 17:16:27 +02:00
Michael Steenbeek 9db2aac3bf
Merge pull request #12482 from frutiemax/Fix12457 
Close #12457: Refactor INTRO_STATE to use strong enum
 2020-07-26 15:40:22 +02:00
frutiemax 6598ae14aa Close #12457: Rename INTRO_STATE to use PascalCase 2020-07-26 09:32:53 -04:00
frutiemax 0f1788d273 Part of #12457: Refactor INTRO_STATE to use strong enum 2020-07-26 09:25:29 -04:00
Michał Janiszewski f1fa016400
Reset window pointer when cleaning up after dropdown 2020-07-26 10:09:56 +02:00
frutiemax 96a75f8c2c
Amend #12470: Make zooming at pointer take tile height into account 2020-07-26 01:28:29 +02:00
ζeh Matt b7e469cf33
Fix #11623: Erratic zoom behavior when pointing outside of the map 2020-07-26 00:27:40 +02:00
ζeh Matt 28d3b51c72
Merge pull request #12385 from ZehMatt/disable-vcpkg 
Disable vcpkg for all projects
 2020-07-25 20:52:46 +02:00
Michael Steenbeek 649757b77d
Merge pull request #12373 from ZehMatt/network/connect-update 
Improve connecting to servers
 2020-07-25 20:45:25 +02:00
Matt f604b41d14 Disable vcpkg for all projects 2020-07-25 20:02:57 +02:00
Duncan 3de2de9814
Reduce use of get_sprite (#12382) 
* Reduce use of get_sprite

* Update src/openrct2/world/Sprite.cpp

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

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-07-25 18:03:14 +01:00
Michael Steenbeek b70716d5f6
Fix #11804: Some RCT1 fences are imported at the wrong height 2020-07-25 16:58:22 +02:00
Matt 4b587e3989 Minor cleanup 2020-07-25 16:02:26 +02:00
Matt ab48c00a89 Fix client being stuck on empty object list 2020-07-25 15:23:26 +02:00
Matt 241ff111dd Address reviews 2020-07-25 14:10:01 +02:00
ζeh Matt b53da7d8d4
Merge pull request #12386 from ZehMatt/strong-enum-1 
Refactor PeepType to use strong enum
 2020-07-25 12:55:46 +02:00
Matt fa2bd4cad6 Refactor PeepType to use strong enum 2020-07-25 11:54:37 +02:00
Michał Janiszewski 3b60740128
Add int64_t support to INI parser (#12374) 2020-07-25 09:37:35 +02:00
Michael Steenbeek 6ba6184602
Merge pull request #12362 from Gymnasiast/refactor/object-entry-index-null-to-0xFFFF 
Change ObjectEntryIndex null value to 0xFFFF
 2020-07-25 09:25:04 +02:00
Michał Janiszewski 13842198fa
Disable HTTP for targets that don't need it (#12375) 2020-07-25 09:09:15 +02:00
duncanspumpkin 9f4990e886 Update replays for change 2020-07-25 08:03:07 +01:00
chaitanyathengdi 33a88fbdbd
Fix #10946: On-ride photo profit assumes every guest buys one (#12285) 
* Use stored values of customers to adjust income from on-ride photos

Use stored values of photos sold and total customers to calculate ratio
and use that to predict income per hour for rides that include
on-ride-photo sections.

* Get rid of float

* Fix formatting

* Fix formatting - again

* Review changes

* Fix formatting

* Use new method of checking on-ride photo

* Use constants

* Add a changelog and contributors entry
 2020-07-25 07:19:51 +01:00
frutiemax f549698e96
Close #12338: Remove goto from Tick128UpdateGuest (#12367) 2020-07-25 07:16:40 +01:00
Matt 6c40d9f3d5 Fix formatting 2020-07-24 23:11:28 +02:00
Matt e31317e025 Rename function to be consistent 2020-07-24 23:11:28 +02:00
Matt d230bc8914 Bump up network version 2020-07-24 23:11:28 +02:00
Matt 908090104a Send client heartbeats to keep connection alive 2020-07-24 23:11:28 +02:00
Matt 1eedaf32dd Refactor sending the object list including status reporting 2020-07-24 23:11:28 +02:00
Matt 0f31b82af0 Add missing network command 2020-07-24 23:11:28 +02:00
Matt 8ef5d0e838 Rename some things to clarify purpose, add constant for map requests 2020-07-24 23:11:12 +02:00
ζeh Matt 76b7c4e676
Merge pull request #12372 from ZehMatt/path-underflow-warnings 
Fix GetAdditionEntry trying obtain the object when no additions exist
 2020-07-24 19:20:30 +02:00
Aaron van Geffen 4d0d41dfbe
Restore spinner decrease button width (#12370) 2020-07-24 19:12:11 +02:00
Matt 4b17b2ea76 Fix GetAdditionEntry trying obtain the object when no additions exist 2020-07-24 15:58:17 +02:00
OpenRCT2 git bot 6b5f51b3c0 Merge Localisation/master into OpenRCT2/develop. 2020-07-24 04:03:30 +00:00
Gymnasiast 682add27dd
Change ObjectEntryIndex null value to 0xFFFF 2020-07-23 12:45:42 +02:00
Gymnasiast 3060c2d8cb
Add const to conversion functions 2020-07-23 12:05:00 +02:00
Aaron van Geffen 37a1a1c0a2
Fix #12356: Opening SC4 or SV4 centres viewport on void (#12361) 2020-07-23 11:41:34 +02:00
Michael Steenbeek f567da04eb
Fix #12353: Research window shows wrong ride type 2020-07-22 23:21:08 +02:00
Duncan 4a235e3bb6
Refactor ResearchItem Type to an enum class (#12346) 
* Change type of ResearchItem.type to enum class

This is to prevent any future issues caused by confusion as to what the type is and further improves the codebase.

* Specifiy a size for the type

Also remove the static cast where not required

* Apply review comments
 2020-07-22 14:25:05 +01:00
0ro8lu 4416565e47
Close #12269: remove goto from x8_drawing_engine (#12274) 
Refactored the function into a separate get dirty rows function.
 2020-07-22 11:51:41 +01:00
Duncan 2d1a6bd13b
Fix research import/export (#12345) 
Old version incorrectly tried to convert the research type not the base ride type causing crashes when new saves were used on older versions of OpenRCT2 or vanilla.
 2020-07-22 09:42:16 +01:00
Aaron van Geffen 205fc3332b
Refactor more widget definitions 
* Increase height for changelog button in about window
* Tackle banner window
* Tackle changelog window
* Tackle custom currency window
* Tackle finance summary
* Tackle quit prompt widgets
* Tackle debug paint widgets
* Tackle demolish and refurbish prompt widgets
 2020-07-21 17:38:57 +02:00
Aaron van Geffen 7b5087f057
Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Aaron van Geffen 8f57c22bfe
Refactor options window widget definitions into new format (#12316) 2020-07-21 14:14:44 +02:00