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

1469 Commits

Author SHA1 Message Date
wolfreak99 7d09486744 Make land tool size holdable 2017-07-15 12:02:51 +02:00
wolfreak99 15cc2a0230 Rename some small scenery flags, tidy up sub_6E1F34 2017-07-15 11:55:20 +02:00
Gymnasiast 34073e10ae Fix Junior RC data files to disable steep inclines, fixes #5902 2017-07-15 10:52:35 +02:00
William Wallace ae110a9159 Allow switching between OpenGL and other renderers without restarting 2017-07-13 19:04:37 +01:00
Tomas Dittmann c1b8230eef Wrap the FileStream creation in try-catch. (#5840) 2017-07-13 18:56:33 +01:00
Ted John fb10a1460d Fix #5858: crash when using custom ride 
Add protection against ride objects with no colour presets. Default to black colours.
 2017-07-13 18:24:46 +01:00
Tomas Dittmann 77a6207100 add invalid entry pointer guards. 
update the changelog
 2017-07-13 10:16:34 +02:00
wolfreak99 e7bacc6d84 Apply new mousedown event parameters to windows 2017-07-13 10:15:34 +02:00
wolfreak99 2155aa26fa Begin reorder of "mouse_down" window event parameters 2017-07-13 10:15:34 +02:00
Michał Janiszewski 3d487541d7 Reset network version for 0.1.1 2017-07-12 23:24:33 +02:00
Michał Janiszewski 859861eddb Start 0.1.1 2017-07-12 23:06:29 +02:00
Michał Janiszewski 6d1f732ed6
Release v0.1.0 
- Feature: [#1399 (partial), #5177] Add window that displays any missing/corrupt objects when loading a park
- Feature: [#5056] Add cheat to own all land.
- Feature: [#5133] Add option to display guest expenditure (as seen in RCTC).
- Feature: [#5196] Add cheat to disable ride ageing.
- Feature: [#5504] Group vehicles into ride groups
- Feature: [#5576] Add a persistent 'display real names of guests' setting.
- Feature: [#5611] Add support for Android
- Feature: [#5706] Add support for OpenBSD
- Feature: OpenRCT2 now starts up on the display it was last shown on.
- Feature: Park entrance fee can now be set to amounts up to £200.
- Improved: Construction rights can now be placed on park entrances.
- Improved: Mouse can now be dragged to select scenery when saving track designs
- Fix: [#259] Money making glitch involving swamps (original bug)
- Fix: [#441] Construction rights over entrance path erased (original bug)
- Fix: [#578] Ride ghosts show up in ride list during construction (original bug)
- Fix: [#597] 'Finish 5 roller coasters' goal not properly checked (original bug)
- Fix: [#667] Incorrect banner limit calculation (original bug)
- Fix: [#739] Crocodile Ride (Log Flume) never allows more than five boats (original bug)
- Fix: [#837] Can't move windows on title screen to where the toolbar would be (original bug)
- Fix: [#1705] Time Twister's Medieval entrance has incorrect scrolling (original bug)
- Fix: [#3178, #5456] Paths with non-ASCII characters not handled properly on macOS.
- Fix: [#3346] Crash when extra long train breaks down at the back
- Fix: [#3479] Building in pause mode creates too many floating numbers, crashing the game
- Fix: [#3565] Multiplayer server crash
- Fix: [#3681] Steel Twister rollercoaster always shows all track designs
- Fix: [#3846, #5749] Crash when testing coaster with a diagonal lift in block brake mode
- Fix: [#4054] Sorting rides by track type: Misleading research messages
- Fix: [#4055] Sort rides by track type: Sorting rule is not really clear (inconsistent?)
- Fix: [#4512] Invisible map edge tiles corrupted
- Fix: [#5009] Ride rating calculations can overflow
- Fix: [#5253] RCT1 park value conversion factor too high
- Fix: [#5400] New Ride window does not focus properly on newly invented ride.
- Fix: [#5489] Sprite index crash for car view on car ride.
- Fix: [#5730] Unable to uncheck 'No money' in the Scenario Editor.
- Fix: [#5750] Game freezes when ride queue linked list is corrupted.
- Fix: [#5819] Vertical multi-dimension coaster tunnels drawn incorrectly
- Fix: Non-invented vehicles can be used via track designs in select-by-track-type mode.
- Fix: Track components added by OpenRCT2 are now usable in older scenarios.
- Technical: [#5047] Add ride ratings tests
- Technical: [#5458] Begin offering headless build with reduced compile- and run-time dependencies
- Technical: [#5755] Title sequence wait periods use milliseconds
- Technical: Fix many desync sources
 2017-07-12 22:12:47 +02:00
Tomas Dittmann 90bb6320e5 Guard against invalid sprite access crashes (#5867) 
ride->num_vehicles not matching ride->vehicles[] in
ride_prepare_breakdown() and window_ride_maintenance_dropdown().
 2017-07-12 21:23:50 +02:00
ζeh Matt d7f1f13d0c Fix #5866: Don't tween sprites that did not move. (#5875) 2017-07-12 13:23:10 +01:00
Michael Steenbeek da17ac9781 Bump network version 2017-07-12 12:10:21 +02:00
ZehM4tt f000e885d3 Fix desync with "Disable clearance check" while placing rides with footpaths. 
Refactored single constant to named flags.
 2017-07-12 11:32:27 +02:00
ZehM4tt 250a66c45f Fix game advancing too fast when game was paused/frozen. 
Regression from #5848
Added braces.
 2017-07-11 21:45:37 +02:00
X123M3-256 a2545d7050 Fix potentially uninitialized variable 2017-07-11 19:57:30 +02:00
X123M3-256 b73c954362 Prevent booster pieces from toggling spinning 2017-07-11 15:55:06 +02:00
Michał Janiszewski ae282f782e Fix #5803: Null map element in onridephoto (#5852) 2017-07-11 12:34:11 +01:00
ζeh Matt ec236f0bf5 Fix platform_get_ticks resolution to match other platforms. (#5843) 2017-07-10 21:46:11 +02:00
ζeh Matt a8af3c7670 Refactor game loop to use a semi-fixed timestep. (#5848) 
Fix headless game being jumpy/stuttering.
Bump up network version.
 2017-07-10 21:43:20 +02:00
Duncan 454a5d9411 Fix diagonal steep slope support drawing. (#5844) 
Mistake during original implementation. Fixes #5148
 2017-07-10 08:16:33 +02:00
Richard Jenkins fff3e55e6b Merge pull request #5854 from Chaosmeister/backwardsmotionnullguard 
Guard against null in vehicle_update_track_motion_backwards_get_new_track()
 2017-07-09 22:17:29 +01:00
Tomas Dittmann e31c4d83db Guard against null in vehicle_update_track_motion_backwards_get_new_track() 2017-07-09 22:52:03 +02:00
Michał Janiszewski ce24a6fb85 Prevent overflowing tunnel count (#5853) 2017-07-09 22:48:21 +02:00
Michał Janiszewski 23882ae7a6 Merge pull request #5814 from rwjuk/spriteguardnull 
Guard against NULL in fix_invalid_vehicle_sprite_sizes()
 2017-07-09 21:19:49 +02:00
Michał Janiszewski f89e56bbc4 Update exit condition to prevent endless loop 2017-07-09 21:13:37 +02:00
Tomas Dittmann cf1f907138 continue instead of return 2017-07-09 20:42:42 +02:00
Tomas Dittmann a163c2b1b3 prevent crash with hacked spiral slides 2017-07-09 20:42:42 +02:00
duncanspumpkin 540763ad0c Fix tunnel portal drawing for multidim inverted track. 
Mistake made from generated code. Missed in #5087. Fixes #5819.
 2017-07-09 12:10:04 +02:00
Duncan 7b47438f49 Fix windows x86 debug builds (#5845) 2017-07-09 09:51:02 +01:00
Tomas Dittmann bec1538f48 Improve the error console output. (#5839) 2017-07-09 00:09:46 +01:00
wolfreak99 ac81072597 Fix hold down speed 2017-07-08 10:36:28 +02:00
spacek531 c73e17f02b move the zoom case up to handle it as it was 2017-07-07 17:35:33 +01:00
spacek531 7ecf049e87 add janisozar suggestion 
[ci skip]
 2017-07-07 17:35:33 +01:00
spacek531 668366bf6b Revert "upgrade save format from uint16 to uint32" 
This reverts commit 85757d9fefbacf8b7d07cec9cd9714e2f70f2faa.
 2017-07-07 17:35:33 +01:00
spacek531 78ab94b12a upgrade save format from uint16 to uint32 2017-07-07 17:35:33 +01:00
spacek531 bec8b73506 fix saving of milliseconds, loading still beyond knowledge 
[ci skip]
 2017-07-07 17:35:32 +01:00
spacek531 97bf67e605 add missing curly bracket 2017-07-07 17:35:32 +01:00
spacek531 16167d84f0 clarified comments, changed TITLE_COMMAND_ORDER command to uint16 2017-07-07 17:35:32 +01:00
spacek531 78e25e381c modify saving, add comments 
[ci skip]
 2017-07-07 17:35:32 +01:00
spacek531 a3acfb4312 Increase digits from 4 to 5 
I'm not used to string lengths that are one shorter
 2017-07-07 17:35:32 +01:00
spacek531 c1ac654916 fix order of rotate, zoom in clamping 2017-07-07 17:35:32 +01:00
spacek531 c302bec47a fix rotate being able to be set to 0 2017-07-07 17:35:32 +01:00
spacek531 fc71361a9e increase digits for wait, decrease digits for rotate, zoom 2017-07-07 17:35:32 +01:00
spacek531 bd4e8cbd08 change Min to Max 2017-07-07 17:35:32 +01:00
spacek531 ef38a66cc2 begin update editor for ms values 
[ci skip]
 2017-07-07 17:35:31 +01:00
spacek531 d5610ece54 Remove duplicate line 2017-07-07 17:35:31 +01:00
spacek531 c815a427c0 Change Seconds (internal) to Milliseconds, en-GB too 2017-07-07 17:35:31 +01:00
spacek531 f5bc1b598c removed extra newline, changed tabs to spaces 2017-07-07 17:35:31 +01:00
spacek531 bb8160fa3b Remove extra newline in math.hpp 2017-07-07 17:35:31 +01:00
spacek531 b460401ab6 Removed redundant Ceil 2017-07-07 17:35:31 +01:00
spacek531 ec0f35fe7b added comment 2017-07-07 17:35:31 +01:00
spacek531 cbe154f63b I hope this isn't a joke of a commit 
I have no idea.
 2017-07-07 17:35:31 +01:00
Richard Jenkins e5b39846b0 Merge pull request #5812 from janisozaur/fix-5795-v2 
Fix #5795: Implement sprite cycle checking v2
 2017-07-07 17:24:42 +01:00
wolfreak99 6633588179 Add missing cheat_reset toggle 2017-07-07 09:20:27 +02:00
wolfreak99 e5eefca5c0 Add missing cheat log strings 2017-07-07 09:20:27 +02:00
Michał Janiszewski 8d02ce37b5 Fix compilation on MSVC 2017-07-07 07:56:45 +02:00
rwjuk d364b2824f Remove needless null check 2017-07-06 23:35:00 +01:00
Michał Janiszewski a3414502a6 Update network version 2017-07-07 00:17:36 +02:00
Michał Janiszewski 12500dd802 Fixup the disjoint null sprites 2017-07-07 00:14:45 +02:00
Michał Janiszewski f6cb731476 Merge pull request #5802 from rwjuk/fix5800 
Fix #5800: Crash when opening server from command line
 2017-07-06 23:39:26 +02:00
rwjuk f28db5731f Guard against NULL in fix_invalid_vehicle_sprite_sizes() 2017-07-06 22:29:51 +01:00
Michał Janiszewski 22d0cb99f9 Load title sequence when invalid path was given 2017-07-06 23:25:38 +02:00
Michał Janiszewski ab95988c66 Improve error reporting for detected cycles 2017-07-06 22:28:10 +02:00
Michał Janiszewski 029aea0fc2 Remove reset_empty_sprites 
Leave in sprite_clear_all_unused as the safer version
 2017-07-06 22:20:07 +02:00
Michał Janiszewski bed085d329 Remove unneeded sprite reset 
This is done in all exports now
 2017-07-06 22:18:05 +02:00
Michał Janiszewski 07faba7aa5 Re-add sprites that got disconnected in a looped list 2017-07-06 22:17:02 +02:00
rwjuk 00848ca629 Correct sprite cycle fixing algorithm 2017-07-06 19:57:59 +02:00
rwjuk 67cbe2a2a1 Fix compilation issues and restore line that went astray 2017-07-06 19:57:55 +02:00
rwjuk 72a1ad89a3 Remove superfluous parameter 2017-07-06 19:57:52 +02:00
rwjuk 28789c3767 Restore resetting of sprite index 2017-07-06 19:57:46 +02:00
rwjuk 372781cc74 Code quality improvements 2017-07-06 19:57:41 +02:00
rwjuk 247d72b1aa Implement sprite cycle checking 2017-07-06 19:57:37 +02:00
rwjuk 5c0a85df5e Bump network version 2017-07-06 13:22:48 +01:00
rwjuk cc95aa0433 Fix visual corruption caused by zero sprite dimensions 
Sprite corruption issue highlight

Fix already bugged saves

Fix visual corruption caused by zero sprite dimensions
 2017-07-06 13:22:24 +01:00
Michał Janiszewski aac81163d0 Update network version to avoid confusion 2017-07-06 11:14:42 +02:00
Michał Janiszewski ec7bcfce34 Revert "Fix #5795: Implement sprite cycle checking" 2017-07-06 11:13:12 +02:00
rwjuk ab6d4ee240 Fix black screen on loading file with invalid extension 2017-07-05 23:54:43 +01:00
rwjuk 8224e715d8 Network version bump 2017-07-05 23:34:47 +01:00
rwjuk a586c961fb Correct sprite cycle fixing algorithm 2017-07-05 23:34:47 +01:00
rwjuk 9d338101b9 Fix compilation issues and restore line that went astray 2017-07-05 23:34:47 +01:00
rwjuk 30648df16a Remove superfluous parameter 2017-07-05 23:34:47 +01:00
rwjuk 5cc188076c Restore resetting of sprite index 2017-07-05 23:34:47 +01:00
rwjuk 89bfe1d1bd Code quality improvements 2017-07-05 23:34:47 +01:00
rwjuk 22f88f80b0 Implement sprite cycle checking 2017-07-05 23:34:47 +01:00
Tomas Dittmann 446796db4b Prevent integer overflow in interest calculation (#5724) 
Fixes #5635
 2017-07-06 00:30:10 +02:00
rwjuk e7512c58ac Fix whitespace 2017-07-05 22:47:53 +01:00
rwjuk 7c2e1b626d Fix #5800: Crash when opening server from command line 2017-07-05 22:08:02 +01:00
Tomas Dittmann 14d14de911 Fix #5205: Prevent the paint loop becoming an infinite loop (#5771) 2017-07-05 18:00:30 +01:00
Gymnasiast ee58ac4882 Fix #4512: invisible map edge tiles corrupted 2017-07-05 18:37:39 +02:00
Michael Steenbeek ae3bc6183f Bump network version 2017-07-05 09:32:50 +02:00
rwjuk 2fb1e40f1a Guard against nullptr in AudioMixer.cpp 2017-07-05 09:32:50 +02:00
rwjuk 68c819c01f Log to console when invalid objects found during check 2017-07-05 07:28:46 +02:00
rwjuk fe140c5c20 Fix #5789: No missing obj notification when loading from cmd line 2017-07-05 07:28:46 +02:00
Richard Jenkins 4e4022d693 Fix #5790: Ride list window does not force refresh on view change (#5791) 2017-07-04 23:03:43 +01:00
Ted John 705ad7c85d Fix #5787: Opening an incomplete ride moves the viewport to unrelated place 
Remove ghost elements for track before validating it.
 2017-07-04 22:25:23 +01:00
Ted John a558423794 Invalidate missing object list on item click 2017-07-04 21:52:11 +01:00
Gymnasiast b0fece095c Raise maximum entrance fee to £200 
It could even be higher, depending on the initial guest cash, but this should do for now
 2017-07-04 15:23:12 +02:00
Yaroslav Tretyakov 56987960b3 Add better fix for #3846 #5749 (#5781) 2017-07-04 12:15:15 +01:00
Yaroslav Tretyakov c7de74f132 Fix #3846, #5749: ride_create_vehicles_find_first_block could not handle diagonal blocks (#5778) 
* Fix #3846: Testing or opening (certain) rollercoaster causes game to hang
* Fix #5749: Game Crash when I test the roller coaster
 2017-07-04 07:43:25 +01:00
Richard Jenkins 048c543fe2 Fix needless double invocation of Memory::Set 
Memory::Set() invocations moved to InitialiseEntryMaps() function.
 2017-07-03 23:59:19 +01:00
Ted John 0422699539 Fix #5381: Game crashes in editor when scenery or pathing is clicked 
Add more defensive checks for when there are no objects loaded.
- Do not open footpath window if there are no footpath objects loaded.
- Prevent crash in scenery window if no scenery groups loaded.
 2017-07-03 21:46:07 +01:00
Richard Jenkins aec214c684 Fix #5767: Importing AA/LL SC4s causes a crash 2017-07-03 17:32:05 +01:00
rwjuk dd2ab63b26 Fix #5765: Peep purchase animation shows for $0.00 2017-07-03 15:50:50 +02:00
Ted John 32e8737796 Merge pull request #5758 from rwjuk/fix5756 
Fix #5756: Only refresh ride list window every 64 ticks for performance
 2017-07-03 07:57:04 +01:00
Ted John 146982d4b0 Fix #5750: OpenRCT2 locking up consistently, no reports (#5757) 
Prevent freezing on corrupted ride queues by ignoring sprites that are not guests when a guest re-joins the front of the queue.
 2017-07-03 07:56:34 +01:00
rwjuk a941400403 Refactor window_ride_list_refresh_list() to single loop 2017-07-02 21:32:20 +01:00
rwjuk 398004901b Only refresh ride list window every 64 ticks for perf. 2017-07-02 20:49:39 +01:00
Ted John cb28381990 Merge pull request #5746 from IntelOrca/fix/5507 
Fix #5507: RCT1 path check is case-sensitive on Linux
 2017-07-02 12:18:40 +01:00
Ted John 09bb7bfd6c Allocate strings with new instead of malloc 2017-07-02 11:37:01 +01:00
Ted John fd2eda921f Merge pull request #5705 from Broxzier/hardcoded-values 
Replace -1 with SPR_NONE for viewport sprite, sort some includes
 2017-07-02 00:08:33 +01:00
Ted John 46d8287bd9 Merge pull request #5624 from rwjuk/objectwindow 
Implement window displaying object load failures
 2017-07-02 00:07:17 +01:00
Ted John 14443b30f1 Fix #5751: Title sequence seconds are about 0.8 seconds 2017-07-02 00:04:32 +01:00
Ted John 3ca84dcc17 Refactor vehicle logic related to #5749 2017-07-01 12:24:38 +01:00
Broxzier 29fb31c69c Remove 'static const' that slipped in 2017-07-01 11:45:43 +02:00
Luke Lau 027be6010d Fix #5583: Right click to drag camera after menu (#5748) 
Reset the input state to normal after receiving a right click outside of a dropdown.
 2017-07-01 01:35:51 +01:00
Ted John 5db0a05f11 Fix #5658: Assertion failed errors in peep.c (#5747) 
Protect edge cases that occur in various hacked parks:
* Current station <-> ride exits
* Current seat <-> peep load positions
 2017-07-01 01:31:19 +01:00
Ted John ddb96ec267 Refactor load park result 
Use a C++ struct and pass that to C.
 2017-07-01 01:29:35 +01:00
Ted John d75295b027 Move handle_park_load_failure into game.c 2017-07-01 01:29:34 +01:00
Ted John c3356d457e Fix S4s never loading if no object errors 2017-07-01 01:29:34 +01:00
rwjuk ab38c07fb9 Make object window work with S4s and scenarios 2017-07-01 01:29:34 +01:00
rwjuk 214bf3988b Implement 'missing objects' window 
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
 2017-07-01 01:28:51 +01:00
Ted John 52555df089 Merge pull request #5738 from Gymnasiast/fix/5253 
Fix #5253: RCT1 park value conversion factor too high
 2017-06-30 23:13:19 +01:00
Michael Steenbeek bcbccba3e6 Create track sequence direction flags (#5744) 2017-06-30 23:11:47 +01:00
Michael Steenbeek 44af1653a6 Replace 'center' with 'centre' (#5745) 2017-06-30 23:11:28 +01:00
Ted John f515314a2d Only warn if object export can not fix checksum 2017-06-30 22:25:27 +01:00
Ted John e9519d2d8b Fix #5507: RCT1 path check is case-sensitive on Linux 
If the csg path does not exist, find the first file in the directory that matches (case insensitive).
 2017-06-30 21:11:35 +01:00
Gymnasiast 6206fbda80 Do not reuse _parkValueConversionFactor of previous S4 2017-06-30 16:02:57 +02:00
Gymnasiast fea2c66036 Name remaining TRACK_ELEM_FLAGs 2017-06-30 14:37:26 +02:00
Ted John 659ccc03d0 Merge pull request #5740 from OpenRCT2/bugfixes 
Fix chat sounds
 2017-06-30 00:22:53 +01:00
zsilencer ef6ecc8900 Set correct pan for chat sound. 2017-06-29 15:54:21 -06:00
Michał Janiszewski 1e21b150ae Fix missing newlines in various files 2017-06-29 23:31:03 +02:00
zaxcav b39723a0a8 Allow mechanics to walk over wide tiles on the edge of the patrol zone 2017-06-29 20:34:37 +02:00
Ted John 50c8fefb35 Fix bug in sprite_move, add sprite null check 2017-06-29 19:25:59 +01:00
Ted John 2fffeb9470 Set the map to blank if no title sequences can load 2017-06-29 19:24:28 +01:00
Reece f581d52355 Disable money effect in pause mode 2017-06-29 20:12:36 +02:00
Gymnasiast 50a7c40fbd Fix #5253: RCT1 park value conversion factor too high 2017-06-29 20:08:59 +02:00
Gymnasiast 9148b98928 Fix #667: Incorrect banner limit calculation 2017-06-29 19:18:08 +02:00
Gymnasiast 4e87ad6ac3 Properly check 'Finish 5 roller coasters' criteria, fixes #597 
This fixes the following things:
- The objective was not available when using money (despite it being used on such scenarios in RCT1)
- The scenario editor set the 'partially finished flag' on every single ride
- The scenario editor did not check if there were five finished roller coasters
- When checking the goal, there was no check if the ride was a roller coaster
- When checking the goal, there was no check if the ride was one of the roller coasters to be completed
 2017-06-29 17:32:12 +02:00
Richard Jenkins 74a14505cd Fix #578: Ride ghosts show up in ride list during construction 2017-06-29 16:39:48 +02:00
Ted John e265fa8948 Fix crash when headless server creates money fx (#5729) 
Ensure headless instances of the game, which do not have graphics loaded, do not try to measure the string for new money effect sprites.
 2017-06-29 12:30:49 +01:00
Gymnasiast 6483705d2c Make CIs happy about return paths 2017-06-29 12:06:29 +02:00
Gymnasiast 194cc4dcb3 Fix #5730: Unable to uncheck 'No money' in the Scenario Editor 2017-06-29 12:01:30 +02:00
Michael Steenbeek 251ead0531 Fix #441: Construction rights over entrance path discarded; refactor 2017-06-29 11:30:18 +02:00
Ted John 4cc6743446 Merge pull request #5714 from Gymnasiast/refactor-land-rights-window 
Refactor land rights window
 2017-06-28 12:42:42 +01:00
Zeh Matt a8efd2cc4d Fix #5676: Last action issues 
LastActionTime using server tick instead of real time platform ticks. (#5722)
 2017-06-27 14:50:21 +01:00
Ted John f08db17d94 Merge pull request #5713 from rwjuk/fix5707 
Fix #5707: Usernames aren't detected for multiplayer
 2017-06-27 13:27:21 +01:00
Richard Jenkins 1893326b62 Check for file existence before releasing config in config_open() (#5712) 2017-06-27 13:23:16 +01:00
David CARLIER 04ed2d78d2 Fix building on FreeBSD 2017-06-27 08:56:03 +02:00
rwjuk c904fa9fe2 Duplicate string literal for assignment to utf8* var 2017-06-26 20:58:36 +01:00
Gymnasiast 51f5a4ff7b Fix whitespace 2017-06-26 20:59:52 +02:00
Gymnasiast 65a3d4551b Name buy land rights flags 2017-06-26 20:56:32 +02:00
rwjuk 3162b9c221 Use String::IsNullOrEmpty() 2017-06-26 19:10:55 +01:00
Gymnasiast b806ded6a4 Refactor land rights window 2017-06-26 20:01:35 +02:00
rwjuk 3236701d51 Fix #5707: Usernames aren't detected for multiplayer 2017-06-26 18:59:01 +01:00
Gymnasiast 9b25a45e90 Remove call to non-existant window class 77 2017-06-26 16:07:42 +02:00
Ted John 06859c90c2 Merge pull request #5708 from IntelOrca/reduce-headless-memory-footprint 
Reduce memory footprint for headless instances
 2017-06-26 14:41:55 +01:00
Michael Steenbeek ce16693da0 Merge pull request #5706 from ibara/develop 
Add OpenBSD support.
 2017-06-26 15:02:40 +02:00
ZehM4tt 0a633647e4 Fix ghost scenery removing objects with "Disable Clearance check" enabled. 
Fix footpath_remove ignoring the ghost flag removing the wrong path.
Replaced some constants with the known flags.
 2017-06-26 14:58:07 +02:00
wolfreak99 27f5773e4d rename event unknown_14 to viewport_rotate 2017-06-26 10:06:58 +02:00
Ted John 4f1cfb4631 Don't load graphics for headless 2017-06-25 23:19:24 +01:00
Brian Callahan 46ae0578e4 Add a note for OpenBSD and getting path names of running executables. 2017-06-25 23:26:26 +02:00
Brian Callahan e5d305f9e7 Use cstdarg instead of stdarg.h 2017-06-25 23:25:46 +02:00
Brian Callahan fe8f949b3f Add OpenBSD support. 2017-06-25 23:25:46 +02:00
Broxzier 9e204c11a9 Replace newly added SPR_NONE's with SPRITE_INDEX_NULL, remove new includes 
needed to change its type to match .
 2017-06-25 22:44:58 +02:00
Broxzier 71a922b3f5 Replace 4 more occurances of -1 with SPR_NONE 2017-06-25 21:37:51 +02:00
wolfreak99 0dbe8f32e5 Allow Construction rights to be placed on park entrance 2017-06-25 21:19:03 +02:00
Broxzier 36fb2c42d9 Replace -1 with SPR_NONE for viewport sprite, sort some includes 2017-06-25 21:13:04 +02:00
Gymnasiast 2f3b5d1c7a Add IDs for null sound IDs 2017-06-25 20:45:38 +02:00
Ted John f275e5ba9b Remove all platform.h includes from header files 
System headers, particularly windows.h polute the namespace too much with macros and unwanted definitions. Do not use them in header files.
 2017-06-25 18:59:56 +01:00
Ted John 9c269ae94b Fix #5489: Sprite index crash for car view on car ride 2017-06-25 17:53:51 +01:00
Ted John acf3b0cf83 Only include FindPkgConfig once 2017-06-25 14:28:25 +01:00
Ted John c4ad6571ea Remove speex dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 95514b9cbc Remove SDL2 dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 89d43c1120 Merge pull request #5702 from IntelOrca/refactor/nosdl/freetype2 
Remove SDL2_ttf dependency, replace with some code form SDL2_ttf without SDL2 dependencies and instead only requiring freetype alone.
 2017-06-25 11:35:06 +01:00
Michael Steenbeek 8333266ca5 Name several ride construction flags, clean up ride_data.c, fix "mini coaster" boosters 2017-06-25 12:14:39 +02:00
Tomas Dittmann f9be3c0046 Identify _trackDesignPlaceSceneryZ and fix #259 
Add the SceneryZ-value to the TrackZ value to compute the correct value for window_track_place_get_base_z(). Fixes issue #259.
 2017-06-25 11:17:25 +02:00
Ted John 6368a29d39 Fix NO_TTF builds 2017-06-25 00:18:08 +01:00
Ted John 16d6ddd22b Remove unused code from SDL_ttf 2017-06-24 23:40:46 +01:00
Ted John 8046cbc707 Replace SDL2 calls 2017-06-24 23:31:40 +01:00
Ted John b7fd89361b Use complete SDL_ttf code 2017-06-24 23:13:07 +01:00
ZehM4tt efa0275104 Fix client not resuming when server toggles pause. 2017-06-24 23:30:53 +02:00
camthesaxman c301e83a64 fix water rendering 2017-06-24 18:53:25 +02:00
Gymnasiast c9b5ec4172 Guard against NULL ObjectRepositoryItem, fixes #5614 2017-06-24 17:45:04 +02:00
Ted John 9ee1bbe4b5 Add some TTF code, poor 2017-06-24 14:50:30 +01:00
Ted John 2c07a55696 Refactor TTF into new source and remove SDL2_ttf 2017-06-24 14:50:30 +01:00
Ted John b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +02:00
Ted John 3003393c87 Allow re-creation of object manager 
Removing lazy initialisation of it.
 2017-06-24 09:56:51 +02:00
Gymnasiast 55977997fd Fix #1705: Time Twister's Medieval entrance has incorrect scrolling 2017-06-23 23:17:22 +02:00
Gymnasiast db091032cc Put .DAT fixes into their own method, fix max cars on the Crocodile Ride 2017-06-23 17:29:51 +02:00
Gymnasiast 234bedb8b8 Replace more occurences of vehicles per ride entry 2017-06-23 17:19:51 +02:00
Matte A a1c456f607 Fix clipping in text for some translations (#5692) 2017-06-23 09:54:05 +02:00
Gymnasiast 8561f3774e Raise friction cap on the Junior Roller Coaster to 18 2017-06-23 09:41:45 +02:00
Matte A 92426994af Giving the cheat "Own all land" a tool-tip 2017-06-23 08:18:45 +02:00
RMcTn 92988a6020 Moved peep release balloon code into a function 2017-06-22 22:55:19 +02:00
Michael Steenbeek fef10c1f60 Clean up windows using land tools 2017-06-22 20:49:13 +02:00
Michael Steenbeek 1f00469b26 Replace free+null with SafeFree, allow freeing NULL 
free(NULL) is perfectly fine, no need to check
 2017-06-22 12:49:33 +02:00
ZehM4tt 81572e9592 Fix game crashing/freezing when kicking players in MP. 2017-06-21 12:02:37 +02:00
Gymnasiast 8ffe50728a Bump network version 2017-06-21 09:56:23 +02:00
Gymnasiast 16900dd618 Avoid booster speed overflows and undefined behaviour, fixes #5679 2017-06-21 09:54:54 +02:00
Gymnasiast 1f180c19b3 Clean up crooked house and top spin vehicle update 2017-06-21 09:54:53 +02:00
Gymnasiast 77481847ca Refactor Giga and Junior booster speed factor 2017-06-20 19:12:49 +02:00
Gymnasiast 176fe0d036 Replace OPENSSL_{malloc,free} with the standard C versions 2017-06-20 18:49:43 +02:00
Michał Janiszewski 9bfc9a91e3 Pre-emptively reset sprites on export for higher compression ratios (#5668) 
The sprites need to be reset anyway before they get used, so reset them
on every export just so they can be compressed better
 2017-06-20 16:34:04 +02:00
Gymnasiast 8b6ecc76d2 Clean up boosters 2017-06-20 14:24:10 +02:00
Gymnasiast 412332a3a5 Use constants for the max amount of stations and colour schemes in the rct_ride struct 2017-06-20 13:39:12 +02:00
Gymnasiast f2f8cec944 Clean up dropdowns 2017-06-20 13:38:51 +02:00
Gymnasiast 0db5bc6bd2 Define max vehicles per ride entry, use SPRITE_INDEX_NULL more 2017-06-20 13:38:23 +02:00
Gymnasiast d6488f34a8 Remove unused NUM_COLOURS 
It's the same as COLOUR_COUNT, which _is_ used
 2017-06-20 10:44:59 +02:00
Michał Janiszewski 5f1e62721a Merge pull request #5655 from janisozaur/gfxbench 
Add support for benchmarking park rendering
 2017-06-20 08:10:56 +02:00
Gymnasiast 53be8da368 Fix incorrect constant 2017-06-19 22:44:06 +02:00
Gymnasiast 5db6e5afa1 Use constants for number of marketing campaigns and expenditure table 2017-06-19 22:17:05 +02:00
Gymnasiast 65806a55db Create and use defines for the amount of surface and edge textures 2017-06-19 22:16:34 +02:00
Hielke Morsink d68bed10cd Readd call to network_process_game_commands (#5662) 2017-06-19 22:16:19 +02:00
ZehM4tt def76edd55 Ignore UI-only flag in sprite checksum 
Ignore peep.window_invalidate_flags in sprite checksum to prevent
false positivie desync alerts, flag does not affect game state.
 2017-06-19 17:42:51 +02:00
ZehM4tt 10740106f2 Fix causing asserts with DEBUG_DESYNC and loading new maps. (#5650) 
Moved input handling out of game_logic_update back to game_update,
should be executed per frame not tick.
Placed gInUpdateCode at the proper locations.
 2017-06-19 17:41:28 +02:00
Michał Janiszewski 990a153b82 Add support for benchmarking park rendering 2017-06-19 12:37:50 +02:00
Michael Steenbeek 9c3a16b6e0 Merge pull request #5611 from OpenRCT2/android 
Android
 2017-06-19 10:25:18 +02:00
Marijn van der Werf ddff36c9ee tabs to spaces 2017-06-19 02:54:21 +02:00
Richard Jenkins 306d2623ef Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly (#5633) 
* Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly

And revert incorrect 'fix'

* Remove all keyboard defines from platform.h
 2017-06-18 21:47:51 +02:00
ZehM4tt 08230f047c Fix desync if "Handyman mow grass by default" is checked. (#5652) 2017-06-18 20:43:15 +02:00
Gymnasiast 595e73e2d9 Name GAME_COMMAND_FLAG_7 2017-06-18 18:25:49 +02:00
duncanspumpkin e9038e5a92 Remove unneccesary casts. 
Casts had previously been used when the types were unknown. They are now known and can be removed
 2017-06-18 08:07:29 +01:00
ZehM4tt efdac19f3b Extract game commands execution​ from within network_update. (#5642) 
* Moved out command processing from network_update into its own function. This should fix some false positives calling scenario_rand from a command callback.

* Fix Server_Handle_GAMECMD to use the command queue instead of executing directly.

* Exit the queue processing to still check for desync
 2017-06-18 08:03:37 +02:00
Gymnasiast 9f5d1cf40a Fix ride naming in S4 import, cleanup 2017-06-17 19:10:53 +02:00
Richard Jenkins 312adaf8e7 Merge pull request #5644 from Gymnasiast/max-stations 
Add define for number of colour schemes, correct several cases of max stations per ride
 2017-06-17 14:32:36 +01:00
Gymnasiast 631f4d8907 Add a constant for RIDE_ENTRY_INDEX_NULL 2017-06-17 14:32:15 +02:00
Gymnasiast ed905f3c68 Add define for number of colour schemes, correct several cases of max stations per ride 2017-06-17 14:31:48 +02:00
Gymnasiast 26cd0da5be Check the first non-null ride type in object selection 2017-06-17 13:52:17 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +02:00
Gymnasiast d782018a8f Fix trailing whitespace and RIDE_TYPE_NULL in new_ride.c 2017-06-17 13:33:25 +02:00
ZehM4tt f05e94c1c6 Fixed a desync that would happen when having the guests list open. (#5632) 
* Fixed a desync that would happen when having the guests list open.
* Refactored the flashing state of peeps to not affect the flags.
* Added deprecation info for SPRITE_FLAGS_PEEP_FLASHING.
* Removed unused line that used the old flag.
* Update network version
 2017-06-17 12:55:41 +02:00
rwjuk 7094bbf74a Fix #5635, overflow when calculating loan interest 
Introduces 64-bit money type
 2017-06-17 12:20:22 +02:00
ZehM4tt 5bb8dfb49c Remove queued game commands that would be impossible to execute. 
Added a warning instead of assert for commands that are discarded.
 2017-06-17 11:49:26 +02:00
ZehM4tt 4362314f70 Clarified the comment. 2017-06-17 11:49:26 +02:00
ZehM4tt ea59769cfd Fixes clients receiving commands before the map data is sent and loaded. 2017-06-17 11:49:26 +02:00
Marijn van der Werf 0341841cf7 Remove commented function 2017-06-16 22:55:08 +02:00
ZehM4tt 9e1711c345 Fix some scenery, path placement and construction mode desyncs 2017-06-16 09:45:00 +02:00
wolfreak99 69a800f285 remove unused gRCT2AddressSavedGamesPath2 (#5626) 2017-06-16 07:53:09 +01:00
Michał Janiszewski 5077f2d78a Mark Path::Combine template as static 2017-06-15 22:55:33 +02:00
Marijn van der Werf 8766ec37a1 Add Android project 2017-06-15 14:22:15 +02:00
rwjuk 5f5f12a63c Fix #5617: PLATFORM_MODIFIER defined twice for macOS 2017-06-15 07:47:31 +02:00
Marijn van der Werf 297d6ba1d5 Add virtual destructor 2017-06-15 00:16:55 +02:00
Michał Janiszewski 4851a45a83 Detect warnings for all parts of compilation (#5618) 2017-06-15 00:08:41 +02:00
Ted John 1dae7f9f32 Move SDL_LoadBMP call to libopenrct2ui (#5616) 2017-06-14 19:47:22 +01:00
wolfreak99 46b575ee18 Remove unnecessary gFirstTimeSaving call, handle gFirstTimeSaving in game_load_save 2017-06-14 16:28:11 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Gymnasiast f3f15d18f7 Replace more occurrences of scenery IDs 2017-06-14 16:06:43 +02:00