Project

General

Profile

« Previous | Next » 

Revision 4cda39e4

Added by skyjake almost 6 years ago

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

  1. Conflicts:
  2. distrib/autobuild.py
  3. doomsday/apps/client/include/ui/clientrootwidget.h
  4. doomsday/apps/client/include/ui/dialogs/packagesdialog.h
  5. doomsday/apps/client/include/ui/widgets/packagesbuttonwidget.h
  6. doomsday/apps/client/include/ui/widgets/packageswidget.h
  7. doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings
  8. doomsday/apps/client/src/audio/audiodriver.cpp
  9. doomsday/apps/client/src/audio/base/audiosystem.cpp
  10. doomsday/apps/client/src/render/modelloader.cpp
  11. doomsday/apps/client/src/render/modelrenderer.cpp
  12. doomsday/apps/client/src/render/rend_font.cpp
  13. doomsday/apps/client/src/render/rend_main.cpp
  14. doomsday/apps/client/src/render/viewports.cpp
  15. doomsday/apps/client/src/resource/idtech1image.cpp
  16. doomsday/apps/client/src/ui/clientrootwidget.cpp
  17. doomsday/apps/client/src/ui/clientwindow.cpp
  18. doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp
  19. doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp
  20. doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp
  21. doomsday/apps/client/src/ui/dialogs/packageinfodialog.cpp
  22. doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp
  23. doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp
  24. doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
  25. doomsday/apps/client/src/ui/home/homewidget.cpp
  26. doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp
  27. doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp
  28. doomsday/apps/client/src/ui/widgets/packageswidget.cpp
  29. doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp
  30. doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
  31. doomsday/apps/libdoomsday/include/doomsday/gameapi.h
  32. doomsday/apps/libdoomsday/include/doomsday/gameprofiles.h
  33. doomsday/apps/libdoomsday/include/doomsday/resource/lumpcatalog.h
  34. doomsday/apps/libdoomsday/include/doomsday/world/thinker.h
  35. doomsday/apps/libdoomsday/net.dengine.base.pack/databundles.dei
  36. doomsday/apps/libdoomsday/src/doomsdayapp.cpp
  37. doomsday/apps/libdoomsday/src/game.cpp
  38. doomsday/apps/libdoomsday/src/game_init.cpp
  39. doomsday/apps/libdoomsday/src/gameprofiles.cpp
  40. doomsday/apps/libdoomsday/src/resource/bundles.cpp
  41. doomsday/apps/libdoomsday/src/resource/databundle.cpp
  42. doomsday/apps/plugins/common/include/g_common.h
  43. doomsday/apps/plugins/common/src/common.c
  44. doomsday/apps/plugins/common/src/game/g_game.cpp
  45. doomsday/apps/plugins/common/src/hu_menu.cpp
  46. doomsday/apps/plugins/common/src/menu/page.cpp
  47. doomsday/apps/plugins/doom/src/d_main.cpp
  48. doomsday/apps/plugins/hexen/include/p_mobj.h
  49. doomsday/cmake/FindGlib.cmake
  50. doomsday/cmake/PlatformWindows.cmake
  51. doomsday/cmake/Version.cmake
  52. doomsday/external/assimp
  53. doomsday/sdk/libappfw/include/de/widgets/variablearraywidget.h
  54. doomsday/sdk/libappfw/src/baseguiapp.cpp
  55. doomsday/sdk/libappfw/src/dialogs/directorylistdialog.cpp
  56. doomsday/sdk/libappfw/src/guiwidget.cpp
  57. doomsday/sdk/libappfw/src/widgets/choicewidget.cpp
  58. doomsday/sdk/libappfw/src/widgets/directoryarraywidget.cpp
  59. doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp
  60. doomsday/sdk/libcore/include/de/libcore.h
  61. doomsday/sdk/libcore/src/core/app.cpp
  62. doomsday/sdk/libcore/src/core/loop.cpp
  63. doomsday/sdk/libcore/src/filesys/assetobserver.cpp
  64. doomsday/sdk/libcore/src/filesys/directoryfeed.cpp
  65. doomsday/sdk/libcore/src/filesys/libraryfile.cpp
  66. doomsday/sdk/libcore/src/filesys/package.cpp
  67. doomsday/sdk/libcore/src/filesys/packagefeed.cpp
  68. doomsday/sdk/libcore/src/scriptsys/bindings_core.cpp
  69. doomsday/sdk/libgui/src/persistentglwindow.cpp
  70. doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings

Files

  • added
  • modified
  • copied
  • renamed
  • deleted