Changeset 11747 for code

Timestamp:

Feb 15, 2018, 10:28:52 PM (7 years ago)

Author:

landauf

Message:

merged Dialog_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (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)

code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo

@@ -217 +217 @@
 
     <GUIOverlay
-      name = "Dialogue"
-      guiname = "Dialogue"
+      name = "Dialog"
+      guiname = "Dialog"
       visible = "false"
     />

code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt

@@ -27 +27 @@
 
 ADD_SUBDIRECTORY(asteroidmining)
-ADD_SUBDIRECTORY(dialogue)
+ADD_SUBDIRECTORY(dialog)
 ADD_SUBDIRECTORY(designtools)
 ADD_SUBDIRECTORY(gametypes)