DarkRadiant: master ef56bbf6
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
codereader | codereader | master | 10.12.2017 10:18 | master e1d0009d |
Changeset | Merge branch 'game_setup' # Conflicts: # install/i18n/darkradiant.pot # install/i18n/de/LC_MESSAGES/darkradiant.mo # install/i18n/de/LC_MESSAGES/darkradiant.po # tools/i18n/darkradiant.pot # tools/xcode/DarkRadiant.xcodeproj/project.pbxproj |
|||
mod - .gitignore | Diff File | |||
mod - include/ifilesystem.h | Diff File | |||
mod - include/igame.h | Diff File | |||
mod - include/imodule.h | Diff File | |||
mod - install/games/darkmod.game | Diff File | |||
mod - install/i18n/darkradiant.pot | Diff File | |||
mod - install/i18n/de/LC_MESSAGES/darkradiant.mo | Diff File | |||
mod - install/i18n/de/LC_MESSAGES/darkradiant.po | Diff File | |||
mod - install/menu.xml | Diff File | |||
mod - libs/os/file.h | Diff File | |||
mod - libs/os/path.h | Diff File | |||
mod - plugins/eclassmgr/EClassManager.cpp | Diff File | |||
mod - plugins/eclassmgr/EClassManager.h | Diff File | |||
mod - plugins/entity/EntityNode.cpp | Diff File | |||
mod - plugins/entity/EntityNode.h | Diff File | |||
mod - plugins/script/interfaces/GameInterface.cpp | Diff File | |||
mod - plugins/script/interfaces/GameInterface.h | Diff File | |||
mod - plugins/shaders/Doom3ShaderSystem.cpp | Diff File | |||
mod - plugins/shaders/Doom3ShaderSystem.h | Diff File | |||
mod - plugins/vfspk3/Doom3FileSystem.cpp | Diff File | |||
mod - plugins/vfspk3/Doom3FileSystem.h | Diff File | |||
mod - plugins/vfspk3/FileVisitor.h | Diff File | |||
mod - plugins/vfspk3/vfspk3.cpp | Diff File | |||
mod - radiant/Makefile.am | Diff File | |||
mod - radiant/map/Map.cpp | Diff File | |||
mod - radiant/settings/Game.cpp | Diff File | |||
mod - radiant/settings/Game.h | Diff File | |||
add - radiant/settings/GameConfiguration.h | Diff File | |||
rm - radiant/settings/GameFileLoader.cpp | Diff | |||
rm - radiant/settings/GameFileLoader.h | Diff | |||
mod - radiant/settings/GameManager.cpp | Diff File | |||
mod - radiant/settings/GameManager.h | Diff File | |||
mod - radiant/ui/UserInterfaceModule.cpp | Diff File | |||
add - radiant/ui/prefdialog/GameSetupDialog.cpp | Diff File | |||
add - radiant/ui/prefdialog/GameSetupDialog.h | Diff File | |||
add - radiant/ui/prefdialog/GameSetupPage.cpp | Diff File | |||
add - radiant/ui/prefdialog/GameSetupPage.h | Diff File | |||
add - radiant/ui/prefdialog/GameSetupPageIdTech.cpp | Diff File | |||
add - radiant/ui/prefdialog/GameSetupPageIdTech.h | Diff File | |||
add - radiant/ui/prefdialog/GameSetupPageTdm.cpp | Diff File | |||
add - radiant/ui/prefdialog/GameSetupPageTdm.h | Diff File | |||
mod - radiant/ui/prefdialog/PrefDialog.cpp | Diff File | |||
mod - radiant/ui/prefdialog/PrefDialog.h | Diff File | |||
mod - tools/i18n/darkradiant.pot | Diff File | |||
mod - tools/msvc/DarkRadiant.vcxproj | Diff File | |||
mod - tools/msvc/DarkRadiant.vcxproj.filters | Diff File | |||
mod - tools/xcode/DarkRadiant.xcodeproj/project.pbxproj | Diff File |