Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TrinityCore/TrinityCore
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Twl/TrinityCore
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 23 files changed
  • 1 contributor

Commits on Feb 24, 2013

  1. Core: Add support for building Trinity on OS X. 

    Fixed problems that prevented a proper compilation. Build tested on 10.8 with clang (r173279), libc++ (r175998) with enabled C++11 support (should work with most versions in use today but only with libc++ as the stdlib and with c++11 support included).
Made Trinity comply with the new standard's compilation nuisances.
New CMake directives need to be set:
	- WITH_LIBCPP=1
	- LIBCPP_INCLUDE_PATH
	- LIBCPP_LIB_PATH
    @Twl
    Twl committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    c8d56bb View commit details
    Browse the repository at this point in the history

  2. Core/Mac: Use built-in type defines not just on OS X but when there i… 

    …s available C++11 support.

Replace a solution with a hack to work with non-C99-compliant compilers.
    @Twl
    Twl committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    4d9af9b View commit details
    Browse the repository at this point in the history

  3. Core/Dep: Add minor changes made to G3D to the diff file.

    @Twl
    Twl committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    c88b98f View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @Twl
    Twl committed Mar 8, 2013
    Configuration menu
    Copy the full SHA
    c8a449f View commit details
    Browse the repository at this point in the history

  2. Dep/G3D (Mac): Create a separate G3D diff for the minimal changes int… 

    …roduced.
    @Twl
    Twl committed Mar 8, 2013
    Configuration menu
    Copy the full SHA
    f9244bc View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2013

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	dep/g3dlite/G3D-v8.0_hotfix6.diff
    @Twl
    Twl committed Mar 14, 2013
    Configuration menu
    Copy the full SHA
    32cc39c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @Twl
    Twl committed Mar 14, 2013
    Configuration menu
    Copy the full SHA
    6bf6bf3 View commit details
    Browse the repository at this point in the history

  3. Merge upstream.

    @Twl
    Twl committed Mar 14, 2013
    Configuration menu
    Copy the full SHA
    4d87383 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2013

  1. Merge 'upstream/master'

    @Twl
    Twl committed Mar 15, 2013
    Configuration menu
    Copy the full SHA
    da6651a View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @Twl
    Twl committed Mar 23, 2013
    Configuration menu
    Copy the full SHA
    9a184f5 View commit details
    Browse the repository at this point in the history
Loading