mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 02:05:13 +01:00
Code Issues Releases Wiki Activity
22,619 Commits 8 Branches 59 Tags
ff909cc28654d27691794de6c3385f4e9cd1e3fe
Commit Graph

22619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Steenbeek
2a53f1150b Add #7991 to changelog [ci skip] 2019-03-03 12:51:38 +01:00
Aaron van Geffen
a6773584b0 Amend changelog; increase network version. 2019-03-03 12:09:19 +01:00
duncanspumpkin
e4ab16acc1 Fix #8804: Raising water shows money effect at the bottom rather than new height 2019-03-03 11:17:21 +01:00
Michał Janiszewski
01c7429a5c Merge pull request #8817 from janisozaur/fixes-201903 
minor cleanups
 2019-03-03 08:42:33 +01:00
Michał Janiszewski
a2bfb77b4a Make sure the header-only function direction_valid is static 2019-03-03 08:18:15 +01:00
Michał Janiszewski
f83fa88512 Fix printing of non-POD NetworkRideId_t 
The underlying type is using int32_t rather than uint32_t, so reflect
that as well
 2019-03-03 08:18:15 +01:00
Duncan
f198ef5919 Merge pull request #8799 from duncanspumpkin/set_water_height_ga 
Set Water Height Action
 2019-03-02 17:42:04 +00:00
duncanspumpkin
47de289ca2 Increment network version 2019-03-02 16:06:44 +00:00
Tom Lankhorst
10aaf7816e Add files to xcode project 2019-03-02 16:06:04 +00:00
duncanspumpkin
7484b3f00e Fix formating. Add correct includes 2019-03-02 16:06:03 +00:00
duncanspumpkin
aef3f24178 Remove reference to game command 2019-03-02 16:06:03 +00:00
duncanspumpkin
61cb84e0ca Add WaterSetHeightAction 2019-03-02 16:06:03 +00:00
Duncan
ec60781a2b Merge pull request #8796 from duncanspumpkin/entranceexit_place_ga 
Entranceexit place ga
 2019-03-02 16:04:01 +00:00
Tom Lankhorst
8b34d3d119 Add files to xcode project 2019-03-02 15:09:11 +00:00
Matt
15838861cd Add load and save test. 2019-03-02 13:11:08 +01:00
Duncan
46ae0934f8 Fix #8809. Check for valid colours ignored special cases (#8813) 
Due to the special cases the colour check would fail and this would mean that the ride type could not be changed. 255 and 0 are both used to indicate that the ride should use different colours for each train.
 2019-03-02 12:51:27 +01:00
Tom Lankhorst
c951118eb0 Corrected order of finding and linking 2019-03-02 09:48:04 +01:00
Tom Lankhorst
68eec6bb5d Include OpenSSL when not DISABLE_NETWORK/DISABLE_HTTP 2019-03-02 09:24:54 +01:00
Tom Lankhorst
44d4783309 Split linking cURL and SSL 2019-03-02 09:23:13 +01:00
Tom Lankhorst
49d36926b4 Move find_package benchmark to appropriate place 2019-03-02 09:21:19 +01:00
Tom Lankhorst
73c8a0a4a8 Require curl include when not DISABLE_HTTP 2019-03-02 09:20:25 +01:00
Tom Lankhorst
e7d875dd04 Always link threads, fix linking cURL 
Threads are currently used throughout the codebase so they need to be
required. CURL is required when using HTTP, not when using Networking.
 2019-03-02 09:00:49 +01:00
duncanspumpkin
87a21d6cda Increment network version 2019-03-02 07:25:28 +00:00
duncanspumpkin
e128a78b91 Fix formating and other issues 
Refactor as per comments.

Simplified some of the code as well

Use constants
 2019-03-02 07:24:42 +00:00
duncanspumpkin
c55ff1288d Add conversion from old command 2019-03-02 07:24:42 +00:00
duncanspumpkin
f10391c98d Remove references to old command 2019-03-02 07:24:42 +00:00
duncanspumpkin
7f586f50e1 Move all callees to the game action framework. Fix CoordXY bug 2019-03-02 07:24:41 +00:00
duncanspumpkin
27046c2468 Simplify game action by creating seperate function for track design ptd1 2019-03-02 07:24:41 +00:00
duncanspumpkin
6081aa4720 Create place game action 2019-03-02 07:24:41 +00:00
ζeh Matt
e776faee97 Merge pull request #8812 from ZehMatt/import-export-fixes 
Fix #8811: Import export fields not copied correctly.
 2019-03-02 07:47:36 +01:00
OpenRCT2 git bot
769a345d1d Merge Localisation/master into OpenRCT2/develop. 2019-03-02 04:00:21 +00:00
Matt
d1cb2cc738 Update changelog.txt 2019-03-02 04:51:28 +01:00
Matt
538526f075 Bump up network version. 2019-03-02 04:51:20 +01:00
Matt
8b6012a44b Add missing field "no_of_food" to importer/exporter. 2019-03-02 04:46:31 +01:00
Matt
5f6ae6ac8c Fix copying the wrong field. 2019-03-02 04:45:47 +01:00
ζeh Matt
dcf750f004 Merge pull request #8805 from ZehMatt/ga-toplevel-pause 
Fix nested query not working in paused game state.
 2019-03-01 10:56:57 +01:00
Matt
df5dfa6863 Bump up network version. 2019-03-01 10:21:09 +01:00
Matt
6350a3b0b4 Fix nested query not working in paused game state. 2019-03-01 08:26:03 +01:00
ζeh Matt
4805c1c082 Merge pull request #8801 from ZehMatt/mp-playerinfo 
Synchronize player info
 2019-02-28 20:41:00 +01:00
Ted John
cdec457abd Refactor peep struct 2019-02-28 20:28:58 +01:00
Matt
d14b07a748 Bump up network version. 2019-02-28 20:15:32 +01:00
Matt
0000e9741f Fix #8798: Player info not being synchronized over network. 2019-02-28 20:15:11 +01:00
Duncan
453855993d Merge pull request #8762 from duncanspumpkin/entranceexit_remove_ga 
Entrance Exit Remove GameAction
 2019-02-28 09:43:25 +00:00
duncanspumpkin
6c91d54255 Increment network version 2019-02-28 09:13:11 +00:00
duncanspumpkin
5d82760cf0 Use more sensible flags 2019-02-28 08:22:52 +00:00
duncanspumpkin
1565982f18 Fix formating 2019-02-28 08:22:52 +00:00
Tom Lankhorst
c86c99f0cd Add files to xcode project (#21) 2019-02-28 08:21:59 +00:00
duncanspumpkin
7fdc482e7d Make review changes. Fix formating 2019-02-28 08:21:58 +00:00
duncanspumpkin
245a7fe64d Remove old game command 2019-02-28 08:21:58 +00:00
duncanspumpkin
f4791f9d96 Remove allow while paused 2019-02-28 08:21:58 +00:00