Project

General

Profile

« Previous | Next » 

Revision 28843a5a

Added by skyjake almost 5 years ago

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

  1. Conflicts:
  2. .gitignore
  3. .travis.yml
  4. README.md
  5. doomsday/CMakeLists.txt
  6. doomsday/apps/api/api_mapedit.h
  7. doomsday/apps/client/CMakeLists.txt
  8. doomsday/apps/client/client-mac.doxy
  9. doomsday/apps/client/client-win32.doxy
  10. doomsday/apps/client/include/render/vissprite.h
  11. doomsday/apps/client/include/world/map.h
  12. doomsday/apps/client/net.dengine.client.pack/Info
  13. doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info
  14. doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
  15. doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info
  16. doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
  17. doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/model.dei
  18. doomsday/apps/client/res/linux/net.dengine.Doomsday.desktop.in
  19. doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings
  20. doomsday/apps/client/src/api_mapedit.cpp
  21. doomsday/apps/client/src/client/clientsubsector.cpp
  22. doomsday/apps/client/src/def_main.cpp
  23. doomsday/apps/client/src/render/modelloader.cpp
  24. doomsday/apps/client/src/render/modelrenderer.cpp
  25. doomsday/apps/client/src/render/rend_halo.cpp
  26. doomsday/apps/client/src/render/rend_main.cpp
  27. doomsday/apps/client/src/render/skyfixedge.cpp
  28. doomsday/apps/client/src/render/walledge.cpp
  29. doomsday/apps/client/src/render/wallspec.cpp
  30. doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp
  31. doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
  32. doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
  33. doomsday/apps/client/src/world/base/bindings_world.cpp
  34. doomsday/apps/client/src/world/base/map.cpp
  35. doomsday/apps/client/src/world/base/sector.cpp
  36. doomsday/apps/client/src/world/base/surface.cpp
  37. doomsday/apps/libdoomsday/api.doxy
  38. doomsday/cmake/MacOSXBundleInfo.plist.in
  39. doomsday/cmake/MacOSXPluginBundleInfo.plist.in
  40. doomsday/cmake/Macros.cmake
  41. doomsday/cmake/PlatformUnix.cmake
  42. doomsday/cmake/Version.cmake
  43. doomsday/doc/dshell/dshell.ame
  44. doomsday/doc/readme/readme.ame
  45. doomsday/doc/server/server.ame
  46. doomsday/libs/core/include/de/core/vector.h
  47. doomsday/libs/core/include/de/libcore.h
  48. doomsday/libs/core/include/de/scripting/nameexpression.h
  49. doomsday/libs/core/include/de/scripting/scriptlex.h
  50. doomsday/libs/core/net.dengine.stdlib.pack/Info
  51. doomsday/libs/core/src/scripting/builtinexpression.cpp
  52. doomsday/libs/core/src/scripting/catchstatement.cpp
  53. doomsday/libs/core/src/scripting/evaluator.cpp
  54. doomsday/libs/core/src/scripting/nameexpression.cpp
  55. doomsday/libs/core/src/scripting/parser.cpp
  56. doomsday/libs/core/src/scripting/process.cpp
  57. doomsday/libs/core/src/scripting/scriptlex.cpp
  58. doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
  59. doomsday/libs/doomsday/libs/importidtech1/src/mapinfotranslator.cpp
  60. doomsday/libs/doomsday/net.dengine.base.pack/Info
  61. doomsday/libs/doomsday/src/defs/dedfile.cpp
  62. doomsday/libs/doomsday/src/doomsdayapp.cpp
  63. doomsday/libs/doomsday/src/gameprofiles.cpp
  64. doomsday/libs/gamekit/libs/common/src/common.cpp
  65. doomsday/libs/gamekit/libs/common/src/game/g_game.cpp
  66. doomsday/libs/gamekit/libs/common/src/world/mobj.cpp
  67. doomsday/libs/gamekit/libs/common/src/world/p_map.cpp
  68. doomsday/libs/gamekit/libs/doom/src/intermission.cpp
  69. doomsday/libs/gamekit/libs/doom/src/m_cheat.cpp
  70. doomsday/libs/gamekit/libs/heretic/src/intermission.cpp
  71. doomsday/libs/gui/net.dengine.stdlib.gui.pack/Info
  72. doomsday/libs/gui/src/text/font.cpp
  73. doomsday/post/CMakeLists.txt
  74. doomsday/sdk-qch.doxy
  75. doomsday/sdk.doxy
  76. doomsday/sdk/libcore/CMakeLists.txt
  77. doomsday/tools/shell/CMakeLists.txt
  78. doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings
  79. doomsday/tools/wadtool/CMakeLists.txt

Files

  • added
  • modified
  • copied
  • renamed
  • deleted