⚲
Project
General
Profile
Sign in
Home
Projects
Help
Search
:
Doomsday Engine
All Projects
Doomsday Engine
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision a5d1e5ca
Added by
skyjake
almost 5 years
ago
ID
a5d1e5ca8a688612ad77952fa8ec6e8467acd732
Parent
49761781
,
e1e8d5ba
Child
9e4c69f1
Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega
Conflicts:
doomsday/apps/client/include/client/clientsubsector.h
doomsday/apps/client/include/world/map.h
doomsday/apps/client/src/render/modelrenderer.cpp
doomsday/apps/client/src/ui/widgets/gamewidget.cpp
doomsday/apps/client/src/world/base/map.cpp
doomsday/apps/client/src/world/subsector.cpp
doomsday/cmake/Macros.cmake
doomsday/libs/core/include/de/core/vector.h
doomsday/libs/core/include/de/libcore.h
doomsday/libs/core/src/data/info.cpp
doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
doomsday/libs/doomsday/net.dengine.base.pack/modules/commonlib.ds
doomsday/libs/doomsday/src/world/bindings.cpp
doomsday/sdk/libgui/src/graphics/image.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 skyjake.fi:doomsday/engine into work/omega