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

13427 Commits

Author SHA1 Message Date
Michael Steenbeek 57a2612365
Fix scenery group assignment race conditions 
When adding entries to scenery groups by hand, like we do for a lot of ToonTowner's stuff, it currently tries to get the loaded scenery group. If this happens not to be loaded at that time, this will fail.
Instead, hardcode the headers - that's how object .DATs do this anyway.
 2017-12-01 11:54:25 +01:00
Michael Steenbeek 7b373e23ac Fix #6756: Raise maximum amount of scenery items per tab to 1024 2017-12-01 10:02:33 +01:00
OpenRCT2 git bot f4b6b728e3 Merge Localisation/master into OpenRCT2/develop. 2017-12-01 04:00:39 +00:00
Aaron van Geffen 1747253c42 Do not accept implicit font substitutions from FontConfig. 
FontConfig implicitly falls back to any default font it is configured to handle.
In our implementation, this cannot account for supported character sets, leading
to unrendered characters (tofu) when trying to render e.g. CJK characters using a
Western (sans-)serif font. We therefore ignore substitutions FontConfig provides,
and instead rely on exact matches on the fonts predefined for each font family.
 2017-11-30 23:35:02 +01:00
Michael Steenbeek 3eb0ffbc53
Add #5838 to changelog 
[ci skip]
 2017-11-30 23:28:17 +01:00
Tomas Dittmann 1332004640 switch returnvalue from 0 to `false`. 
switch const variable to `#define`
 2017-11-30 23:26:15 +01:00
Tomas Dittmann 60b457d13f Prevent writing to invalid memory. 
Switch magic number to constant `maxTrackElements`.
If the number of TrackElements becomes equal to maxTrackElements, cleanup the data and abort the export.
 2017-11-30 23:26:15 +01:00
Michael Steenbeek b0aaf13cec Clean up and future-proof peep spawn import 2017-11-30 23:08:59 +01:00
Ted John 47a68e9e90 Add constant for maximum zoom level 2017-11-30 21:21:38 +00:00
OpenRCT2 git bot 5d5c64acbf Merge Localisation/master into OpenRCT2/develop. 2017-11-30 04:00:45 +00:00
Michael Steenbeek 251dad113c Make ride_entry_get_first_non_null_ride_type() take a const ride entry 2017-11-29 12:15:33 +01:00
Michael Steenbeek e568dcabff
Adding some missing entries to changelog 2017-11-29 12:09:05 +01:00
Michael Steenbeek 7feb0f8f7e Fix #4760: Correct guest entry points on loading scenario 2017-11-29 09:10:09 +01:00
Michael Steenbeek 32f91e3e45 Draw friction wheels instead of chain on LRC station 2017-11-29 09:08:27 +01:00
OpenRCT2 git bot 743c79c169 Merge Localisation/master into OpenRCT2/develop. 2017-11-29 04:00:46 +00:00
Michael Steenbeek 677815ddc8
Update update info in readme 2017-11-28 22:38:32 +01:00
Michael Steenbeek 4430496d03
Bump minimum Windows version to 7, remove copypasta from OpenTTD 2017-11-28 22:37:53 +01:00
Michael Steenbeek 3f8556c85a Fix #6294: Refactor Editor::SelectedObjects 2017-11-28 13:38:54 +01:00
OpenRCT2 git bot 66aa25da81 Merge Localisation/master into OpenRCT2/develop. 2017-11-28 04:01:14 +00:00
Michał Janiszewski 3df5dd8391
More compiler warnings 2017-11-27 23:52:17 +01:00
Michał Janiszewski f46f2d6821 Fix g1 image ID check (#6742) 2017-11-27 22:03:54 +00:00
OpenRCT2 git bot a3be15c9c9 Merge Localisation/master into OpenRCT2/develop. 2017-11-27 04:01:17 +00:00
Michał Janiszewski 585fc1afce
Ensure variables in switch are properly scoped 2017-11-26 23:14:40 +01:00
Ted John 86ec21016d
Merge pull request #6487 from janisozaur/includes 
Remove limits.h from common.h
 2017-11-26 22:08:51 +00:00
Michał Janiszewski 9fcef9ed07 Only guard font access in RCT2-less builds 2017-11-26 21:48:54 +01:00
Michał Janiszewski 8097beeae1 Guard access to font 2017-11-26 21:38:50 +01:00
Michał Janiszewski 14f39e189d Fix building 2017-11-26 21:24:57 +01:00
Michał Janiszewski b7ecaf6ae0 Fix StaffList.cpp compilation 2017-11-26 20:36:03 +01:00
Michał Janiszewski 6943a45b19 Remove limits.h from common.h 2017-11-26 20:36:03 +01:00
Richard Jenkins 210e6d8eef
Update changelog for track design search 
[ci skip]
 2017-11-26 13:54:58 +00:00
Hielke Morsink 59cfc3459d Add clear button 2017-11-26 13:44:45 +00:00
Hielke Morsink c648a60502 Add search box to track list window 
This adds a vector of indices used for the track designs array, which is
used instead of the window list index.

Some other things I've edited that are not directly related to this
commit:

- Orders widgets in logical order like how they appear on screen
- Adds some comments to existing code
 2017-11-26 13:44:45 +00:00
OpenRCT2 git bot 94c4c285ee Merge Localisation/master into OpenRCT2/develop. 2017-11-26 04:00:30 +00:00
Ted John 84305af7ab
Merge pull request #6715 from Broxzier/screenshot_climate 
Add optional screenshot argument to set weather
 2017-11-25 23:32:35 +00:00
Ted John 79a1755666
Merge pull request #6722 from duncanspumpkin/name_sprite_fields 
Name known misc sprite fields
 2017-11-25 23:31:00 +00:00
Michał Janiszewski 0a9ee59152 Change format to use 5-wide index 2017-11-25 16:42:12 +01:00
Michał Janiszewski 39bb4bcc41 Report indexing progress 2017-11-25 16:42:12 +01:00
duncanspumpkin b3cf757ee1 Increment network version 2017-11-25 09:31:16 +00:00
duncanspumpkin b6ce5ce4a5 Simplify fountain code. Name sprite fields. Fix warning 
Fountain jumping code has been sped up slightly so that the code can be simplified and not require rolling over a unsigned int. Also removed setting direction of the fountain as the field was not used.
 2017-11-25 09:30:38 +00:00
duncanspumpkin 464f5e858a Remove unused fields 2017-11-25 09:30:36 +00:00
duncanspumpkin 6905b81216 Label unused vars as pad and remove where required 2017-11-25 09:30:35 +00:00
duncanspumpkin 993ca5a03d Fix warning 2017-11-25 09:30:35 +00:00
duncanspumpkin e7774a4012 Clean up balloon update code. See previous commit for more info 2017-11-25 09:30:34 +00:00
duncanspumpkin 8bf42ea4f9 Modify how steam updates to simplify code. 
This will move steam in exactly the same way as the previous code but the
code is easier to understand. Note on first load of a save that was made
prior to this change there will be 1 tick of incorrect movement for steam. This is barrely noticeable.
 2017-11-25 09:30:33 +00:00
duncanspumpkin 0afc0eba5e Name known misc sprite fields. 2017-11-25 09:30:32 +00:00
OpenRCT2 git bot 4b860f5efd Merge Localisation/master into OpenRCT2/develop. 2017-11-25 04:01:15 +00:00
Michał Janiszewski a1bd146ac2
Set CMAKE_SYSTEM_PROCESSOR for Mingw toolchain file 2017-11-24 20:59:04 +01:00
Michael Steenbeek 1f4643b19c Show TT's Glass Roofs in the Abstract Theming group 2017-11-24 13:56:11 +01:00
Michael Steenbeek b5a4aa30cc Add TT's tile roofs to R&W tab, add TT's wooden roofs to Mine theming 2017-11-24 13:17:25 +01:00
Michael Steenbeek 303447f647 Show TT's Pirate Roofs in the Pirates Theming group 2017-11-24 12:27:22 +01:00