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

15951 Commits

Author SHA1 Message Date
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
ζeh Matt 3aad9a4b2e Refactor footpath_update_path_wide_flags 2019-01-29 19:07:00 +01:00
Tom Lankhorst 3ab73018ec Quiet CMake find package 'benchmark' (#8628) 
`benchmark` is an optional package. CMake can be quiet about not finding it.
 2019-01-28 21:44:50 +01:00
Tom Lankhorst 0233795add Fix #8642: Likely mistake in entrance fee check 2019-01-28 11:15:49 +01:00
Tom Lankhorst 4c015edaf6 Templatise `rorN` and `rolN` with `N` in {8, 16, 32, 64} 2019-01-28 10:55:24 +01:00
OpenRCT2 git bot fd12b012e6 Merge Localisation/master into OpenRCT2/develop. 2019-01-28 04:00:25 +00:00
Tom Lankhorst 367b496d6b Exclude typical cmake build dirs (#8646) 2019-01-27 12:08:03 +01:00
Michael Steenbeek 3d9702dfd4
Fix #8141: Attempting to build entrance/exit on station 2 does not work 2019-01-27 10:38:47 +01:00
Michael Steenbeek 3b176cd6eb
Fix #8585: Part of track missing on air powered vertical coaster (#8635) 2019-01-25 22:09:12 +01:00
Gymnasiast 66c571370e Fix #8572: Steel Twister track pieces ID 64 and 65 drawn incorrectly 2019-01-24 20:25:01 +01:00
Tom Lankhorst 01a52d236c Use vector<string> in InteractiveConsole 
Issue #8597 shows Valgrind result indicating a memory leak in
InteractiveConsole. This is fixed in #8619 by ensuring that free() is
called appropriately.
This commit takes that a step further by removing all manual memory
management in favour of using vector<string>.

- argc is now gone in favour of argv.empty()/argv.size()
- argv_t is a vector of strings of utf8's
- console_command_func's signature is changed accordingly
 2019-01-24 16:12:49 +01:00
Michael Steenbeek 247e89eb53
Revert duck fix 2019-01-24 10:40:04 +01:00
Tom Lankhorst 22fac20907 Include ICU include dirs in testpaint (#8622) 
`testpaint` uses ICU headers, so add the ICU_INCLUDE_DIR to the target.
 2019-01-23 14:30:49 +01:00
Michał Janiszewski bca8870667
Merge pull request #8458 from janisozaur/benchmark 
Add sprite sorting benchmark
 2019-01-22 21:30:17 +01:00
Tom Lankhorst 83cace393d Name entries in Travis' build matrix (#8621) 
* Name entries in Travis' build matrix

* State the compiler in Docker64 entry

* Mention Xcode

* Don't specify build type for MinGW

* Don't specify build type for Ubuntu Clang and Docker64

* Consistently mention flags in job name
 2019-01-22 19:56:44 +01:00
Michał Janiszewski 8e3170ca4d Add changelog entry for sprite sorting benchmark 2019-01-22 19:55:57 +01:00
Michał Janiszewski cba2dd96ec Allow specyfing more than one input file for sprite sort benchmark 2019-01-22 19:54:12 +01:00
Michał Janiszewski b38e600b15 Update sprite sort benchmark to accept filename 2019-01-22 19:45:56 +01:00
Gymnasiast d2e39392f3 Fix Xcode project 2019-01-22 19:45:56 +01:00
Michał Janiszewski 304840069d Add sprite sorting benchmark 2019-01-22 19:45:56 +01:00
Michał Janiszewski f2233d3cc3 Update MSVC project to use Google benchmark 2019-01-22 19:45:56 +01:00
Michał Janiszewski a5c7ea04e5 Update MSVC libraries to v19 to add Google benchmark 2019-01-22 19:45:56 +01:00
OpenRCT2 git bot d7520c13b0 Merge Localisation/master into OpenRCT2/develop. 2019-01-22 04:00:26 +00:00
Tom Lankhorst 55af6ad0e1 Free allocated memory when 'argc' == 0 (#8619) 
Fixes leak in #8597, InteractiveConsole allocates memory for arguments,
but frees it only if the argument count is greater than zero.
 2019-01-21 23:03:12 +00:00
OpenRCT2 git bot 57193aa439 Merge Localisation/master into OpenRCT2/develop. 2019-01-21 04:00:27 +00:00
Michael Steenbeek 4e9d2ce764
Split footpath object into two internally 2019-01-20 21:38:38 +01:00
Michael Steenbeek cd58d81cdb
Merge pull request #8615 from Gymnasiast/cleanup/path-drawing 
More path drawing cleanup
 2019-01-20 20:21:43 +01:00