⚲
Project
General
Profile
Sign in
Home
Projects
Help
Search
:
Doomsday Engine
All Projects
Doomsday Engine
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision b54c09dd
Added by
skyjake
almost 5 years
ago
ID
b54c09dd3a8726371aaa77f0d406d5820b296d61
Parent
651ea202
,
022839e0
Child
bb999dec
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into work/omega
Conflicts:
appveyor.yml
doomsday/apps/api/api_mapedit.h
doomsday/apps/client/include/render/rend_main.h
doomsday/apps/client/include/resource/tga.h
doomsday/apps/client/include/world/map.h
doomsday/apps/client/libs/fmod/src/fmod_music.cpp
doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
doomsday/apps/client/src/api_mapedit.cpp
doomsday/apps/client/src/audio/base/audiosystem.cpp
doomsday/apps/client/src/clientapp.cpp
doomsday/apps/client/src/render/modelrenderer.cpp
doomsday/apps/client/src/render/rend_main.cpp
doomsday/apps/client/src/resource/idtech1image.cpp
doomsday/apps/client/src/resource/image.cpp
doomsday/apps/client/src/world/base/bindings_world.cpp
doomsday/apps/client/src/world/base/map.cpp
doomsday/apps/client/src/world/base/sector.cpp
doomsday/apps/libdoomsday/include/doomsday/resource/tga.h
doomsday/libs/core/include/de/Slope
doomsday/libs/core/include/de/core/slope.h
doomsday/libs/core/include/de/core/vector.h
doomsday/libs/core/src/core/core/slope.cpp
doomsday/libs/core/src/data/record.cpp
doomsday/libs/core/src/scripting/bindings_math.cpp
doomsday/libs/doomsday/include/doomsday/resource/tga.h
doomsday/libs/doomsday/libs/importdeh/include/importdeh.h
doomsday/libs/doomsday/libs/importdeh/src/dehreader.cpp
doomsday/libs/doomsday/libs/importdeh/src/info.cpp
doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
doomsday/libs/doomsday/libs/importudmf/src/importudmf.cpp
doomsday/libs/doomsday/net.dengine.base.pack/modules/commonlib.ds
doomsday/libs/doomsday/src/doomsdayapp_bindings.cpp
doomsday/libs/doomsday/src/resource/databundle.cpp
doomsday/libs/doomsday/src/resource/tga.cpp
doomsday/libs/doomsday/src/world/actions.cpp
doomsday/libs/gamekit/libs/common/src/common.cpp
doomsday/libs/gamekit/libs/common/src/game/g_game.cpp
doomsday/libs/gamekit/libs/common/src/world/player.cpp
doomsday/sdk/libgui/src/graphics/image.cpp
doomsday/tools/dshell/src/aboutdialog.cpp
doomsday/tools/shell/src/aboutdialog.cpp
doomsday/tools/shell/src/preferences.cpp
Files
added
modified
copied
renamed
deleted
Loading...
Doomsday
Engine
2.3
⇣
Builds
Add-ons
Manual
·
Forums
Support
Bug
Tracker
Blog
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into work/omega