Project

General

Profile

« Previous | Next » 

Revision a5d1e5ca

Added by skyjake almost 5 years ago

Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega

  1. Conflicts:
  2. doomsday/apps/client/include/client/clientsubsector.h
  3. doomsday/apps/client/include/world/map.h
  4. doomsday/apps/client/src/render/modelrenderer.cpp
  5. doomsday/apps/client/src/ui/widgets/gamewidget.cpp
  6. doomsday/apps/client/src/world/base/map.cpp
  7. doomsday/apps/client/src/world/subsector.cpp
  8. doomsday/cmake/Macros.cmake
  9. doomsday/libs/core/include/de/core/vector.h
  10. doomsday/libs/core/include/de/libcore.h
  11. doomsday/libs/core/src/data/info.cpp
  12. doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
  13. doomsday/libs/doomsday/net.dengine.base.pack/modules/commonlib.ds
  14. doomsday/libs/doomsday/src/world/bindings.cpp
  15. doomsday/sdk/libgui/src/graphics/image.cpp

Files

  • added
  • modified
  • copied
  • renamed
  • deleted