mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity
11,993 Commits 8 Branches 59 Tags
dd2ab63b2682ff06808b9de5aa00a4b99cc0e49f
Commit Graph

11993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ted John
9b2777bc56 Fix read keyboard config error 
Do not try to read more keyboard shortcuts than there actually are.
 2017-06-30 19:11:32 +01:00
Gymnasiast
6206fbda80 Do not reuse _parkValueConversionFactor of previous S4 2017-06-30 16:02:57 +02:00
Michael Steenbeek
0224ca5ca0 Fix changelog order 2017-06-30 15:39:06 +02:00
Gymnasiast
fea2c66036 Name remaining TRACK_ELEM_FLAGs 2017-06-30 14:37:26 +02:00
OpenRCT2 git bot
f3b3345db6 Merge Localisation/master into OpenRCT2/develop. 2017-06-30 04:00:32 +00:00
Ted John
659ccc03d0 Merge pull request #5740 from OpenRCT2/bugfixes 
Fix chat sounds
 2017-06-30 00:22:53 +01:00
zsilencer
2385ef1059 Fix incorrect arguments to resampler. 2017-06-29 16:40:00 -06:00
zsilencer
ef6ecc8900 Set correct pan for chat sound. 2017-06-29 15:54:21 -06:00
zsilencer
bde3197e79 Fix incorrect resampling rate when at the end of a sound. 2017-06-29 15:43:40 -06:00
Michał Janiszewski
1e21b150ae Fix missing newlines in various files 2017-06-29 23:31:03 +02:00
Michał Janiszewski
5a20ab2ffe Add missing newline in input.c 
[ci skip]
 2017-06-29 23:21:31 +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
Gymnasiast
ad943351ed Add the fix for #3479 to the changelog 2017-06-29 20:14:26 +02: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