Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tracyprofiler #778

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from
Open

Tracyprofiler #778

wants to merge 34 commits into from

Commits on May 24, 2020

  1. Add tracy extern folder

    @nico-abram
    nico-abram committed May 24, 2020
    Configuration menu
    Copy the full SHA
    b9d6333 View commit details
    Browse the repository at this point in the history

  2. Add Tracy profiler in cmake

    @nico-abram
    nico-abram committed May 24, 2020
    Configuration menu
    Copy the full SHA
    50e193f View commit details
    Browse the repository at this point in the history

  3. Minimal tracy integration

    @nico-abram
    nico-abram committed May 24, 2020
    Configuration menu
    Copy the full SHA
    589e6a0 View commit details
    Browse the repository at this point in the history

  4. Only set Mt on windows

    @nico-abram
    nico-abram committed May 24, 2020
    Configuration menu
    Copy the full SHA
    891a761 View commit details
    Browse the repository at this point in the history

  5. Fix compile in relwithdebug

    @nico-abram
    nico-abram committed May 24, 2020
    Configuration menu
    Copy the full SHA
    163c9b7 View commit details
    Browse the repository at this point in the history

  6. More Tracy integration

    @nico-abram
    nico-abram committed May 24, 2020
    Configuration menu
    Copy the full SHA
    85f631b View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. Default tracy to off

    @nico-abram
    nico-abram authored May 25, 2020
    Configuration menu
    Copy the full SHA
    bb2d244 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored May 25, 2020
    Configuration menu
    Copy the full SHA
    5abe8a6 View commit details
    Browse the repository at this point in the history

  3. Update DownloadManager.cpp

    @nico-abram
    nico-abram authored May 25, 2020
    Configuration menu
    Copy the full SHA
    01996ea View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored May 31, 2020
    Configuration menu
    Copy the full SHA
    993c15a View commit details
    Browse the repository at this point in the history

  2. Remove accidental FORCE on cmake tracy option 

    This made it impossible to enable
    @nico-abram
    nico-abram authored May 31, 2020
    Configuration menu
    Copy the full SHA
    a404e9f View commit details
    Browse the repository at this point in the history

  3. Move tracy CMake flag to extrn 

    Flags that pertain to a specific library should be in CMakeLists.txt paired with it's `add_subdirectory` line. This keeps everything that is related near each other.
    @jameskr97
    jameskr97 committed May 31, 2020
    Configuration menu
    Copy the full SHA
    0fdace8 View commit details
    Browse the repository at this point in the history

  4. Move another thing from root CMakeLists to tracy/CMakeLists

    @nico-abram
    nico-abram committed May 31, 2020
    Configuration menu
    Copy the full SHA
    4f7cf8a View commit details
    Browse the repository at this point in the history

  5. Make tracy only start accumulating profiling data when we connect the… 

    … profiler
    @nico-abram
    nico-abram committed May 31, 2020
    Configuration menu
    Copy the full SHA
    2d95da4 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Update tracy to 0.7

    @nico-abram
    nico-abram committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    175ad67 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored Jun 13, 2020
    Configuration menu
    Copy the full SHA
    a9be46b View commit details
    Browse the repository at this point in the history

  3. Fix typo in conflict fix

    @nico-abram
    nico-abram authored Jun 13, 2020
    Configuration menu
    Copy the full SHA
    50ab192 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored Jul 2, 2020
    Configuration menu
    Copy the full SHA
    69f7f1f View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Merge branch 'develop' into tracyprofiler

    @poco0317
    poco0317 committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    23c1fff View commit details
    Browse the repository at this point in the history

  2. merge issues

    @poco0317
    poco0317 committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    d2d17bf View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored Oct 27, 2020
    Configuration menu
    Copy the full SHA
    4239f3b View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Fix stuff in merge from develop into tracy

    @nico-abram
    nico-abram committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    5714418 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. Merge remote-tracking branch 'origin/develop' into tracyprofiler

    @poco0317
    poco0317 committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    e7c8bcb View commit details
    Browse the repository at this point in the history

  2. fix scuffed merge

    @poco0317
    poco0317 committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    8b0c291 View commit details
    Browse the repository at this point in the history

  3. update tracy to 0.7.4

    @poco0317
    poco0317 committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    926b89e View commit details
    Browse the repository at this point in the history

  4. reenable linking to dbghelp in msvc for tracy if tracy is enabled

    @poco0317
    poco0317 committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    3b530e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2020

  1. add more ZoneScoped and attempt to show name of Actors in Zones

    @poco0317
    poco0317 committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    ade070d View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. Update tracy to 0.7.6

    Gregory Robertson committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    84b8b09 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2021

  1. Merge pull request #965 from g-robertson/tracyprofiler 

    Update tracy to 0.7.6
    @poco0317
    poco0317 authored Mar 28, 2021
    Configuration menu
    Copy the full SHA
    6c635c0 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2021

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored May 3, 2021
    Configuration menu
    Copy the full SHA
    72415fa View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored May 9, 2022
    Configuration menu
    Copy the full SHA
    40d386b View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored Sep 12, 2022
    Configuration menu
    Copy the full SHA
    e9dc426 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored Sep 19, 2022
    Configuration menu
    Copy the full SHA
    3955395 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Merge branch 'develop' into tracyprofiler

    @nico-abram
    nico-abram authored Oct 24, 2022
    Configuration menu
    Copy the full SHA
    2e36175 View commit details
    Browse the repository at this point in the history