Changeset 11747
- Timestamp:
- Feb 15, 2018, 10:28:52 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 4 deleted
- 3 edited
- 4 copied
-
. (modified) (1 prop)
-
data/gui/layouts/Dialog.layout (copied) (copied from code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout)
-
data/gui/layouts/Dialogue.layout (deleted)
-
data/gui/scripts/Dialog.lua (copied) (copied from code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua)
-
data/gui/scripts/Dialogue.lua (deleted)
-
data/levels/DialogShowcase.oxw (copied) (copied from code/branches/Dialog_HS17/data/levels/DialogShowcase.oxw)
-
data/levels/DialogueShowcase.oxw (deleted)
-
data/overlays/HUDTemplates3.oxo (modified) (1 diff)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/dialog (copied) (copied from code/branches/Dialog_HS17/src/modules/dialog)
-
src/modules/dialogue (deleted)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/Dialog_HS17 (added) merged: 11455,11515,11579,11607,11611-11612,11642,11644,11652,11656,11658,11670
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo
r11743 r11747 217 217 218 218 <GUIOverlay 219 name = "Dialog ue"220 guiname = "Dialog ue"219 name = "Dialog" 220 guiname = "Dialog" 221 221 visible = "false" 222 222 /> -
code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt
r11730 r11747 27 27 28 28 ADD_SUBDIRECTORY(asteroidmining) 29 ADD_SUBDIRECTORY(dialog ue)29 ADD_SUBDIRECTORY(dialog) 30 30 ADD_SUBDIRECTORY(designtools) 31 31 ADD_SUBDIRECTORY(gametypes)
Note: See TracChangeset
for help on using the changeset viewer.
