Changeset 11437

Timestamp:

May 29, 2017, 4:18:43 PM (7 years ago)

Author:

patricwi

Message:

Dialogue project merged

Location:

code/branches/Presentation_FS17

Files:

• . (modified) (view diffs)
• data/gui/layouts/Dialogue.layout (copied) (copied from code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout) (view diffs)
• data/gui/scripts/Dialogue.lua (copied) (copied from code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua) (view diffs)
• data/gui/scripts/TestDialogButttons.lua (copied) (copied from code/branches/Dialogue_FS17/data/gui/scripts/TestDialogButttons.lua) (view diffs)
• data/levels/DialogueShowcase.oxw (copied) (copied from code/branches/Dialogue_FS17/data/levels/DialogueShowcase.oxw) (view diffs)
• data/overlays/HUDTemplates3.oxo (modified) (view diffs)
• data/tcl/core (copied) (copied from code/branches/Dialogue_FS17/data/tcl/core) (view diffs)
• src/modules/CMakeLists.txt (modified) (view diffs)
• src/modules/dialogue (copied) (copied from code/branches/Dialogue_FS17/src/modules/dialogue) (view diffs)
• src/modules/dialogue/DialogueManager.cc (modified) (view diffs)