Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 8, 2011
  1. @culexian

    Add missing string include

    culexian authored
  2. @culexian

    Merge branch 'master' of github.com:lubosz/ArxFatalis into std_string

    culexian authored
    Conflicts:
    	src/core/AVI.cpp
    	src/core/Application.cpp
    	src/core/Application.h
    	src/graphics/GraphicsEnum.cpp
    	src/graphics/GraphicsUtility.cpp
    	src/gui/MenuWidgets.cpp
    	src/gui/Speech.cpp
    	src/gui/Speech.h
    	src/gui/Text.cpp
    	src/io/Registry.h
Commits on Mar 1, 2011
  1. @culexian
Commits on Jan 30, 2011
  1. @culexian

    Merge branch 'master' of github.com:lubosz/ArxFatalis into std_string

    culexian authored
    Conflicts:
    	src/animation/Animation.h
    	src/animation/AnimationRender.cpp
    	src/animation/Cinematic.cpp
    	src/animation/CinematicKeyframer.cpp
    	src/animation/Intro.cpp
    	src/core/Application.cpp
    	src/core/Time.cpp
    	src/game/Damage.cpp
    	src/game/Equipment.cpp
    	src/game/Player.h
    	src/graphics/data/CinematicTexture.cpp
    	src/graphics/data/Texture.h
    	src/graphics/effects/CinematicEffects.cpp
    	src/graphics/effects/SpellEffects.cpp
    	src/gui/Interface.h
    	src/gui/Menu.h
    	src/gui/MenuPublic.cpp
    	src/gui/MenuWidgets.cpp
    	src/gui/Speech.cpp
    	src/io/CinematicLoad.cpp
    	src/io/IO.h
    	src/io/Logger.cpp
    	src/io/Screenshot.cpp
    	src/scene/CinematicSound.cpp
    	src/scene/Interactive.h
    	src/scene/Scene.cpp
    	src/scripting/Script.cpp
    	src/scripting/Script.h
Something went wrong with that request. Please try again.