Skip to content
This repository has been archived by the owner. It is now read-only.

/ re3 Archived

Permalink
miami

Commits on Aug 12, 2021

  1. Revert "map memory usage high default" 

    This reverts commit b7c7c88.
    @erorcun
    erorcun committed Aug 12, 2021
    df89e50

  2. map memory usage high default

    @withmorten
    withmorten committed Aug 12, 2021
    81c6c5e

  3. map memory usage high default

    @withmorten
    withmorten committed Aug 12, 2021
    b7c7c88

  4. Fix sampman_null

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    0a2df3c

  5. Sync fixes from miami

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    8759c2e

  6. Sync audio changes from master

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    92c5cf1

  7. Waypoint text fix

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    43fbf29

  8. Refactor cAudioManager::ProcessActiveQueues, fix doppler effect

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    033d89a

  9. Rename unused audio member

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    f1545da

  10. Replace static_assert with #error

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    4f8993e

  11. Fix sampman_null

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    2ef43e8

  12. Put more things under ifdef

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    ce78081

  13. Add define to enable/disable external 3d audio simulation

    @Sergeanur
    Sergeanur committed Aug 12, 2021
    6c2d179

  14. mission retry fix

    @Nick007J
    Nick007J committed Aug 12, 2021
    b99edf9

Commits on Aug 11, 2021

  1. Fix unset emitting volume for sawmill

    @Sergeanur
    Sergeanur committed Aug 11, 2021
    2eb0390

  2. Fix unset emitting volume for moan sound

    @Sergeanur
    Sergeanur committed Aug 11, 2021
    f131f70

  3. Merge branch 'master' into miami 

    # Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/RoadBlocks.cpp
#	src/core/Radar.cpp
#	src/core/Radar.h
#	src/peds/Ped.cpp
#	src/peds/Population.cpp
#	src/renderer/Renderer.cpp
#	src/vehicles/CarGen.cpp
    @Sergeanur
    Sergeanur committed Aug 11, 2021
    75f812c

  4. Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2

    @Sergeanur
    Sergeanur committed Aug 11, 2021
    463fdab

  5. Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls

    @Sergeanur
    Sergeanur committed Aug 11, 2021
    d7a28c4

  6. Add sprite to the waypoint marker

    @Sergeanur
    Sergeanur committed Aug 11, 2021
    0544beb

Commits on Aug 9, 2021

  1. Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls

    @Sergeanur
    Sergeanur committed Aug 9, 2021
    1f98f01

  2. Add sprite to the waypoint marker

    @Sergeanur
    Sergeanur committed Aug 9, 2021
    8ea411e

  3. fix steam saves

    @withmorten
    withmorten committed Aug 9, 2021
    ab5965c

  4. small fix

    @withmorten
    withmorten committed Aug 9, 2021
    858f913

Commits on Aug 8, 2021

  1. Merge remote-tracking branch 'upstream/miami' into miami

    @Nick007J
    Nick007J committed Aug 8, 2021
    3869369

  2. fix bug in CCurves

    @Nick007J
    Nick007J committed Aug 8, 2021
    2ee32ab

  3. Comment out text following #endif

    @Barracuda6 @Sergeanur
    Barracuda6 authored and Sergeanur committed Aug 8, 2021
    42ad9c4

  4. Fix

    @Sergeanur
    Sergeanur committed Aug 8, 2021
    76a22c0

  5. Sync fix from miami

    @Sergeanur
    Sergeanur committed Aug 8, 2021
    f887d51

  6. Merge branch 'master' into miami

    @Nick007J
    Nick007J committed Aug 8, 2021
    e17504a

  7. Revert "small fix" 

    This reverts commit bd96584.
    @Nick007J
    Nick007J committed Aug 8, 2021
    4673f50

  8. Revert "small fix" 

    This reverts commit bd96584.
    @Nick007J
    Nick007J committed Aug 8, 2021
    35dd465

  9. Merge branch 'master' into miami

    @Nick007J
    Nick007J committed Aug 8, 2021
    8d9508b

  10. small fix

    @Nick007J
    Nick007J committed Aug 8, 2021
    bd96584

  11. merge

    @Nick007J
    Nick007J committed Aug 8, 2021
    873840a
NewerOlder