Permalink
Commits on Jan 21, 2017
  1. Merge Localisation/master into OpenRCT2/develop.

    OpenRCT2-git-bot committed Jan 21, 2017
  2. Update installer version to 0.0.6

    Installer version was still 0.0.5.
    #5095
    Lastorder-DC committed with IntelOrca Jan 21, 2017
  3. Strip ghost flag from elements on loading

    Ghost elements are notoriously a reason of network desyncs, because they
    don't get transferred over network. They are meant to be local only and
    disregarded by any logic, but it is not yet the case in many places.
    
    Upon saving, we *remove* all the ghost elements (by calling
    `scenario_fix_ghosts`), based on assumption they can only be caused by
    local interaction. Testing has shown there are `sv6`s in the wild that
    have elements marked as ghosts and this could lead to a situation where
    we strip away parts of the park. This also causes network desyncs for
    reason stated above.
    
    As we strip elements with ghost flag from saves anyway, it should be
    safe to assume none of our saves introduce ghosts and this issue is
    limited to hacked parks only. One example of such park is [Cocopa
    Bay](http://www.nedesigns.com/park/3473/cocopa-bay/).
    
    This change removes the flag on all map elements while importing. This
    is much less invasive than removing all ghost elements on importing, as
    they may contain some actual data. This ~~fixes~~ hides the desync that
    could be seen in the Cocopa Bay park.
    
    As this doesn't change any in-game logic, no network version update is
    necessary.
    
    #5094
    janisozaur committed with IntelOrca Jan 21, 2017
Commits on Jan 20, 2017
  1. Add constants for CSG1 large surface sprites

    Gymnasiast committed with IntelOrca Jan 20, 2017
  2. Merge Localisation/master into OpenRCT2/develop.

    OpenRCT2-git-bot committed Jan 20, 2017
Commits on Jan 19, 2017
  1. Merge pull request #5092 from IntelOrca/add-rct1-path

    Load CSG1
    Gymnasiast committed on GitHub Jan 19, 2017
  2. Whitespace correction

    Gymnasiast committed on GitHub Jan 19, 2017
  3. Add note explaining the start address of CSG1

    Gymnasiast committed on GitHub Jan 19, 2017
  4. Rename terrain edge constant arrays

    IntelOrca committed with Gymnasiast Jan 1, 2017
  5. Remove empty extern

    [ci skip]
    wolfreak99 committed with janisozaur Jan 19, 2017
Commits on Jan 18, 2017
  1. Log number of exported objects as verbose, fixes #5063

    Gymnasiast committed on GitHub Jan 18, 2017
  2. Merge pull request #5087 from marijnvdwerf/fix/vertical-tunnels

    Test vertical tunnels properly
    Gymnasiast committed on GitHub Jan 18, 2017
Commits on Jan 17, 2017
  1. Fix wrong vertical tunnel offsets

    marijnvdwerf committed Jan 17, 2017
  2. Test vertical tunnels properly

    marijnvdwerf committed Jan 17, 2017
  3. Fix width of park rating bar in bottom toolbar

    HaasJona committed with Gymnasiast Jan 17, 2017
  4. Fix two usages of raw RIDE4 flag usages, rename one, add comment

    Gymnasiast committed with IntelOrca Jan 17, 2017
Commits on Jan 16, 2017
  1. Merge pull request #5076 from IntelOrca/refactor/structs/award

    Create new OpenRCT2 award struct
    IntelOrca committed on GitHub Jan 16, 2017
  2. Unify rct1_award and rct2_award

    IntelOrca committed Jan 16, 2017
  3. Create new OpenRCT2 award struct

    IntelOrca committed Jan 14, 2017
  4. msbuild: Fix building g2 with spacy paths

    IntelOrca committed Jan 16, 2017
  5. Fix #5081: Crash on fetching server list

    marijnvdwerf committed with IntelOrca Jan 16, 2017
  6. Merge #5043, #5068, #5080 and update network version to 29

    janisozaur committed on GitHub Jan 16, 2017
  7. Fix tall ride consideration

    The consideration of tall rides was probably not working properly as it was doing a straight comparrison of a flags variable.
    This instead removes it as it already checks if the ride has ratings anyway. I've also added a status check so that guests do not attempt to walk to a ride far away that isn't open.
    IntelOrca committed with janisozaur Jan 13, 2017
  8. Merge pull request #5044 from janisozaur/ninja

    Add BUILD_BYPRODUCTS entries to CMakeLists for googletest
    janisozaur committed on GitHub Jan 16, 2017
  9. Merge Localisation/master into OpenRCT2/develop.

    OpenRCT2-git-bot committed Jan 16, 2017
Commits on Jan 14, 2017
  1. Merge pull request #4936 from Broxzier/short

    Because of a comment on a diff in #4878 asking for clearer and more consistent type usage. What this PR changes:
    
    No unsigned long long found
    (signed) long long -> sint64
    unsigned int -> uint32
    (signed) int -> sint32
    (signed) long -> sint32
    unsigned short -> uint16
    (signed) short -> sint16
    unsigned char -> uint8
    No signed chars found
    plain char is implementation-defined, so I left those in.
    IntelOrca committed Jan 14, 2017
  2. Fix broken code alignment

    IntelOrca committed Jan 14, 2017
  3. clang-format: better pattern for common.h

    [ci skip]
    Broxzier committed with IntelOrca Jan 14, 2017
  4. Add include categories to .clang-format

    This adds 3 rules that clang-format uses when ordering include files:
     - common.h is assigned priority -1
     - Incudes using <> is given priority 1
     - Includes using "" is given priority 2
    
    It also disables putting the "main" file first (the .h/.hpp with the
    same name as the .c/.cpp"
    
    #5074
    [ci skip]
    Broxzier committed with IntelOrca Jan 14, 2017
  5. Merge pull request #5073 from IntelOrca/refactor/name-ride-entry-flags

    Refactor/name ride entry flags
    IntelOrca committed on GitHub Jan 14, 2017