mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity
16,383 Commits 8 Branches 58 Tags
8b1330ec57ffd304063ed7bf69b7442c1251a41f
Commit Graph

16383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Duncan
57471edc47 Merge pull request #8672 from Xkeeper0/i/8662 
Fix for #8662 paint_haunted_house_structure crash
 2019-02-06 07:46:57 +00:00
Duncan
2cf4a9afb5 Merge pull request #8668 from duncanspumpkin/staff_order_action 
Implement Game Action Staff Set Order
 2019-02-06 03:50:11 +00:00
duncanspumpkin
752df2607a Increment network version 2019-02-05 20:39:53 +00:00
Michael Steenbeek
80a9939522 Update names in Xcode project 2019-02-05 20:38:18 +00:00
Tom Lankhorst
35d8b3de7b Added files to xcodeproj (#14) 2019-02-05 20:38:18 +00:00
duncanspumpkin
8a69b89df6 Move Staff Set Orders into game action framework. 
Split up costume and order game commands
 2019-02-05 20:38:18 +00:00
Duncan
c436a656ad Merge pull request #8666 from cgdolan/develop 
Implement game action for sign set style
 2019-02-05 20:35:11 +00:00
duncanspumpkin
50b241d20d Add missing include and rework to use Coords 2019-02-05 19:27:30 +00:00
Tom Lankhorst
94758bccf6 Link with platform libraries 2019-02-05 20:17:14 +01:00
Tom Lankhorst
af25da940b include platform.cmake 2019-02-05 20:16:51 +01:00
Tom Lankhorst
15a6cf4c48 Add platform cmake include 2019-02-05 20:16:38 +01:00
Xkeeper
2828cbb2fc Fix crash in FerrisWheel paint 
[OpenRCT2/OpenRCT2#8662]
 2019-02-05 11:14:17 -08:00
Xkeeper
a22260b56a Fix crash in MapAnimation re: small scenery 
[OpenRCT2/OpenRCT2#8662]
 2019-02-05 11:02:22 -08:00
Xkeeper
2bb8813c41 Fix crash in paint_haunted_house_structure 
[OpenRCT2/OpenRCT2#8662]
 2019-02-05 11:01:23 -08:00
cgdolan
b2a1cb9639 Merge pull request #1 from tomlankhorst/cgdolan-sign 
Added files to xcodeproj
 2019-02-05 07:44:21 -08:00
Michał Janiszewski
4192ffe57e Improve cmake for MSVC (#8581) 
* Improve cmake for MSVC

* Fix mingw builds
 2019-02-05 16:12:58 +01:00
Tom Lankhorst
5b4efde23a Added files to xcodeproj 2019-02-05 11:31:39 +01:00
Christopher G. Dolan
19a58fa5fe Fix format, move validation logic to query, update network version 2019-02-04 17:30:45 -08:00
Michał Janiszewski
8a395e3706 Fix misaligned access (#8665) 
Platforms like ARM are very sensitive to unaligned access. This change
makes sure the addresses obey the C++ standard and are properly aligned.
 2019-02-04 23:15:14 +01:00
Tom Lankhorst
613521f8b8 changelog: change #8647 to 'fix' [ci skip] 2019-02-04 11:31:55 +01:00
Christopher G. Dolan
a8864092c0 fix format and serialize all ivars 2019-02-03 23:02:00 -08:00
Christopher G. Dolan
075983da0f Implement game action for sign set style 2019-02-03 22:20:01 -08:00
Michał Janiszewski
6bdbe248fd Merge pull request #8641 from tomlankhorst/use-lto 
Detect availability of LTO, apply when available
 2019-02-04 00:06:37 +01:00
Tom Lankhorst
ce6e08c633 Introduce SET_CHECK_CXX_FLAGS 2019-02-03 23:32:51 +01:00
Tom Lankhorst
beaeaa94e7 Catch curl transfer.sh failures /w timeout (#8629) 
* Handle transfer.sh upload failures

Add `||` condition on `curl` and add `-m` option set to 300 seconds.

* Missing ; at end of line

* Add --max-time to tagged builds, but do fail

* Rename env var to TRANSFER_MAX_SECONDS

* Explicitly set --connect-timeout on cURL

Because -m caused timeouts still. Also, removed --progress-bar.
Renamed env var to CURL_OPTION_NAME, specified unit in comment.
 2019-02-03 23:32:15 +01:00
Tom Lankhorst
521948139c Chat toggle button (#8648) 
* Add chat_available()

* Add appropriate strings

* Add new Chat icon

* Implement Chat button

* CS

* Fix chat icon

* Make chat icon a bit smaller and less bright

* Update chat icon

* Update changelog
 2019-02-03 23:30:34 +01:00
Michał Janiszewski
604da7ce01 Merge pull request #8661 from tomlankhorst/refactor-random 
Refactor random engine
 2019-02-03 23:29:10 +01:00
Duncan
b657d3bc12 Merge pull request #8664 from tomlankhorst/8647-changelog-update 
Update changelog according to #8647
 2019-02-03 20:36:50 +00:00
Tom Lankhorst
045692993a Make template params adhere to code style 2019-02-03 21:16:09 +01:00
Tom Lankhorst
826c8d297b Update changelog according to #8647 2019-02-03 20:59:18 +01:00
Tom Lankhorst
422d5f2ef1 Replace '_N' by '_num' 2019-02-01 21:54:00 +01:00
Tom Lankhorst
d660c9d45f Merge branch 'refactor-random' of github.com:tomlankhorst/OpenRCT2 into refactor-random 2019-02-01 21:51:28 +01:00
Tom Lankhorst
1e65db371b Use single underscore prefix for template parameters 2019-02-01 21:51:01 +01:00
Tom Lankhorst
ec8caa5636 Drop <sstream> 2019-02-01 21:47:47 +01:00
Tom Lankhorst
dfe7f0614c Consistency 2019-02-01 21:00:19 +01:00
Ted John
381e2c12bc Fix debug builds 2019-02-01 19:25:17 +00:00
Tom Lankhorst
16691b22ba Use state struct 2019-02-01 19:29:43 +01:00
Tom Lankhorst
2ea347f15f MSVC SFINAE compatibility 2019-02-01 15:50:09 +01:00
Tom Lankhorst
1a81d60609 Expose gScenarioRand, add <algorithm> 2019-02-01 14:48:45 +01:00
Tom Lankhorst
6a42a95495 Refactor random engine 
Introduce RotateEngine and Rct2Engine, FixedSeedSequence and Rct2Seed.
Adhere respectively to requirements `RandomNumberEngine` and `SeedSequence`.
Can be used with C++11 adaptors and distributions in <random>.
 2019-02-01 14:32:04 +01:00
Michał Janiszewski
73a9b5d15c Merge pull request #8658 from janisozaur/screenshot-dump 
Attach screenshot to backtrace.io report
 2019-02-01 07:22:18 +01:00
Michał Janiszewski
57897d4cb5 Attach screenshot to backtrace.io report 2019-01-31 23:36:41 +01:00
Michał Janiszewski
7655ba7746 Make screenshot return path to file 2019-01-31 23:36:41 +01:00
OpenRCT2 git bot
accac88e62 Merge Localisation/master into OpenRCT2/develop. 2019-01-31 04:00:25 +00:00
ζeh Matt
ec13e8db09 Merge pull request #8656 from ZehMatt/refactor-constants-1 
Refactor more constants
 2019-01-30 16:00:19 +01:00
Matt
0237eaf498 Refactor number values to SPRITE_INDEX_NULL 2019-01-30 15:02:52 +01:00
Matt
7ad59bbb37 Refactor number values to RIDE_VALUE_UNDEFINED 2019-01-30 14:59:06 +01:00
ζeh Matt
6668a1fa86 Refactor remaining number values to RideStation::NO_TRAIN (#8655) 2019-01-30 13:49:46 +00:00
ζeh Matt
3a9b788835 Merge pull request #8654 from ZehMatt/fix-8653 
Fix #8653: crash when peeps attempt to enter a ride with no vehicles.
 2019-01-30 13:46:54 +01:00
Matt
4026ead774 Fix #8653: crash when peeps attempt to enter a ride with no vehicles. 2019-01-30 13:16:45 +01:00