omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/omigamedev/new_engine

Browse Source 
* 'master' of https://bitbucket.org/omigamedev/new_engine:
  add text input popup
This commit is contained in:
omigamedev
2019-09-12 15:18:22 +02:00
parent 566a4e72a5 c8666b9e67
commit 6920c0380e
12 changed files with 186 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PanoPainter.xcodeproj/project.pbxproj
View File

@@ -156,6 +156,8 @@
AD7FB09222470DE5005913AB /* app_vr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD7FB09122470DE2005913AB /* app_vr.cpp */; };
AD7FB09322470DE5005913AB /* app_vr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD7FB09122470DE2005913AB /* app_vr.cpp */; };
AD83A0D323268B6F005B0871 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD83A0D223268B6F005B0871 /* MobileCoreServices.framework */; };
AD83A0D9232A7906005B0871 /* node_input_box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD83A0D7232A7905005B0871 /* node_input_box.cpp */; };
AD83A0DA232A793A005B0871 /* node_input_box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD83A0D7232A7905005B0871 /* node_input_box.cpp */; };
ADA2A57822BE8D8E00C6B6C9 /* node_tool_bucket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA2A57622BE8D8E00C6B6C9 /* node_tool_bucket.cpp */; };
ADA2A57922BE8D8E00C6B6C9 /* node_tool_bucket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA2A57622BE8D8E00C6B6C9 /* node_tool_bucket.cpp */; };
ADA3ABF6222C8C370083B825 /* node_panel_quick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */; };
@@ -462,6 +464,8 @@
AD7FB08E22470C75005913AB /* node_panel_floating.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_panel_floating.cpp; sourceTree = "<group>"; };
AD7FB09122470DE2005913AB /* app_vr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_vr.cpp; sourceTree = "<group>"; };
AD83A0D223268B6F005B0871 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.4.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
AD83A0D7232A7905005B0871 /* node_input_box.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_input_box.cpp; sourceTree = "<group>"; };
AD83A0D8232A7906005B0871 /* node_input_box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_input_box.h; sourceTree = "<group>"; };
AD8CF71F1E913F0500083FFD /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log.cpp; sourceTree = "<group>"; };
AD8CF7201E913F0500083FFD /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
AD95AEC31E41EDEC002DD03A /* font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = font.cpp; sourceTree = "<group>"; };
@@ -728,6 +732,8 @@
AD1063621EC7ADFA002A525F /* node_image_texture.h */,
AD1063631EC7ADFA002A525F /* node_image.cpp */,
AD1063641EC7ADFA002A525F /* node_image.h */,
AD83A0D7232A7905005B0871 /* node_input_box.cpp */,
AD83A0D8232A7906005B0871 /* node_input_box.h */,
AD1063651EC7ADFA002A525F /* node_message_box.cpp */,
AD1063661EC7ADFA002A525F /* node_message_box.h */,
AD1063671EC7ADFA002A525F /* node_panel_brush.cpp */,
@@ -1478,6 +1484,7 @@
AD0E5CC01ECC72AD00C35669 /* node_icon.cpp in Sources */,
AD0E5CC11ECC72AD00C35669 /* node_image_texture.cpp in Sources */,
ADF4F7762263920400422C7C /* settings.cpp in Sources */,
AD83A0DA232A793A005B0871 /* node_input_box.cpp in Sources */,
AD0E5CBD1ECC72AD00C35669 /* node_checkbox.cpp in Sources */,
ADBC8C581FAFD05A0094B339 /* node_dialog_cloud.cpp in Sources */,
AD7FB086223E8A43005913AB /* YGLayout.cpp in Sources */,
@@ -1512,6 +1519,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
AD83A0D9232A7906005B0871 /* node_input_box.cpp in Sources */,
AD7FB07B223E8A42005913AB /* log.cpp in Sources */,
AD74030F1FB9D0D3004ACFCC /* node_combobox.cpp in Sources */,
ADBC8C571FAFD05A0094B339 /* node_dialog_cloud.cpp in Sources */,