Project

General

Profile

« Previous | Next » 

Revision b54c09dd

Added by skyjake almost 5 years ago

Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine into work/omega

  1. Conflicts:
  2. appveyor.yml
  3. doomsday/apps/api/api_mapedit.h
  4. doomsday/apps/client/include/render/rend_main.h
  5. doomsday/apps/client/include/resource/tga.h
  6. doomsday/apps/client/include/world/map.h
  7. doomsday/apps/client/libs/fmod/src/fmod_music.cpp
  8. doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
  9. doomsday/apps/client/src/api_mapedit.cpp
  10. doomsday/apps/client/src/audio/base/audiosystem.cpp
  11. doomsday/apps/client/src/clientapp.cpp
  12. doomsday/apps/client/src/render/modelrenderer.cpp
  13. doomsday/apps/client/src/render/rend_main.cpp
  14. doomsday/apps/client/src/resource/idtech1image.cpp
  15. doomsday/apps/client/src/resource/image.cpp
  16. doomsday/apps/client/src/world/base/bindings_world.cpp
  17. doomsday/apps/client/src/world/base/map.cpp
  18. doomsday/apps/client/src/world/base/sector.cpp
  19. doomsday/apps/libdoomsday/include/doomsday/resource/tga.h
  20. doomsday/libs/core/include/de/Slope
  21. doomsday/libs/core/include/de/core/slope.h
  22. doomsday/libs/core/include/de/core/vector.h
  23. doomsday/libs/core/src/core/core/slope.cpp
  24. doomsday/libs/core/src/data/record.cpp
  25. doomsday/libs/core/src/scripting/bindings_math.cpp
  26. doomsday/libs/doomsday/include/doomsday/resource/tga.h
  27. doomsday/libs/doomsday/libs/importdeh/include/importdeh.h
  28. doomsday/libs/doomsday/libs/importdeh/src/dehreader.cpp
  29. doomsday/libs/doomsday/libs/importdeh/src/info.cpp
  30. doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
  31. doomsday/libs/doomsday/libs/importudmf/src/importudmf.cpp
  32. doomsday/libs/doomsday/net.dengine.base.pack/modules/commonlib.ds
  33. doomsday/libs/doomsday/src/doomsdayapp_bindings.cpp
  34. doomsday/libs/doomsday/src/resource/databundle.cpp
  35. doomsday/libs/doomsday/src/resource/tga.cpp
  36. doomsday/libs/doomsday/src/world/actions.cpp
  37. doomsday/libs/gamekit/libs/common/src/common.cpp
  38. doomsday/libs/gamekit/libs/common/src/game/g_game.cpp
  39. doomsday/libs/gamekit/libs/common/src/world/player.cpp
  40. doomsday/sdk/libgui/src/graphics/image.cpp
  41. doomsday/tools/dshell/src/aboutdialog.cpp
  42. doomsday/tools/shell/src/aboutdialog.cpp
  43. doomsday/tools/shell/src/preferences.cpp

Files

  • added
  • modified
  • copied
  • renamed
  • deleted