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

12119 Commits

Author SHA1 Message Date
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
OpenRCT2 git bot 3151b2b9da Merge Localisation/master into OpenRCT2/develop. 2017-07-05 04:00:19 +00: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
Michał Janiszewski 705b8f2fff Provide some additional information in travis jobs 2017-07-04 22:14:00 +02:00
Michał Janiszewski cfbfcb61aa Perform Android builds on tagged commits 2017-07-04 22:14:00 +02: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
Michael Steenbeek 0aaff4317f Add #3846 and #5749 to changelog 2017-07-04 09:41:51 +02: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
OpenRCT2 git bot 0be6003474 Merge Localisation/master into OpenRCT2/develop. 2017-07-04 04:00:23 +00: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
Ted John 1442b43898 Update changelog 
[ci skip]
 2017-07-03 20:50:37 +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
Krutonium eeca2e1d83 Update openrct2.desktop file 
For example, this allows you to associate Saves and Scenarios with the game.
 2017-07-03 10:52:08 +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
OpenRCT2 git bot 126d0df2d0 Merge Localisation/master into OpenRCT2/develop. 2017-07-03 04:00:24 +00: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
OpenRCT2 git bot 018ccea688 Merge Localisation/master into OpenRCT2/develop. 2017-07-02 04:00:27 +00: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
Ted John 72eb22df2e Fix vscode debugger attach configuration 2017-07-01 12:24:04 +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