Changeset 11743 for code/branches/Presentation_HS17_merge/data
- Timestamp:
- Feb 14, 2018, 11:31:43 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 3 edited
- 4 copied
-
. (modified) (1 prop)
-
data/levels/NC_StoryModeLevel (copied) (copied from code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel)
-
data/levels/NC_StoryModeLevel.oxw (copied) (copied from code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw)
-
data/levels/templates/StoryModeEscort.oxt (copied) (copied from code/branches/CampaignMap_HS17/data/levels/templates/StoryModeEscort.oxt)
-
data/overlays/HUDTemplates3.oxo (modified) (1 diff)
-
data/overlays/StoryModeHUD.oxo (modified) (1 diff)
-
data/overlays/StoryModeHUD2.oxo (copied) (copied from code/branches/CampaignMap_HS17/data/overlays/StoryModeHUD2.oxo)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/CampaignMap_HS17 (added) merged: 11458,11507,11512-11513,11525-11527,11544-11545,11560,11564,11584,11588,11605,11634,11636,11663,11675-11676
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo
r11718 r11743 47 47 <Template name="spaceshiphud"> 48 48 <OverlayGroup name = "spaceshiphud" scale = "1, 1"> 49 <Map /> 49 50 50 51 51 <HUDHealthBar -
code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo
r11359 r11743 2 2 <Template name="StoryModeMap"> 3 3 <OverlayGroup name = "spaceshiphud" scale = "1, 1"> 4 <Map />5 6 4 7 5 <GUIOverlay
Note: See TracChangeset
for help on using the changeset viewer.
