minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-10 04:00:21 +02:00
Code Issues Projects Releases Wiki Activity
Files
.github
bin
cmake
doc
examples
include
lib
media
scripts
source
tests
tools
Exporters
FileToHeader
GUIEditor
CGUIAttribute.h
CGUIAttributeEditor.cpp
CGUIAttributeEditor.h
CGUIBoolAttribute.h
CGUIColorAttribute.h
CGUIDummyEditorStub.h
CGUIEditFactory.cpp
CGUIEditFactory.h
CGUIEditWindow.cpp
CGUIEditWindow.h
CGUIEditWorkspace.cpp
CGUIEditWorkspace.h
CGUIEnumAttribute.h
CGUIPanel.cpp
CGUIPanel.h
CGUIStringAttribute.h
CGUITextureAttribute.h
CGUITextureCacheBrowser.cpp
CGUITextureCacheBrowser.h
CMemoryReadWriteFile.cpp
CMemoryReadWriteFile.h
EGUIEditTypes.h
GUI Editor_vc10.vcxproj
GUI Editor_vc10.vcxproj.filters
GUI Editor_vc11.vcxproj
GUI Editor_vc11.vcxproj.filters
GUI Editor_vc12.vcxproj
GUI Editor_vc12.vcxproj.filters
GUI Editor_vc14.vcxproj
GUI Editor_vc14.vcxproj.filters
GUIEditor_gcc.cbp
Makefile
main.cpp
IrrFontTool
MeshConverter
irrEdit
.gitignore
CMakeLists.txt
Config.cmake.in
README.md
changes.txt
irr-readme.txt
ogles-readme.txt
c84d8acff9b089aaf0fb407542f95e8ff8e5dd60
irrlicht/tools/GUIEditor
History
cutealien 8b9947f9f6 Merging r6128 through r6139 from trunk to ogl-es branch. 
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-09-29 20:22:28 +00:00
..
CGUIAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIAttributeEditor.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIAttributeEditor.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIBoolAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIColorAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIDummyEditorStub.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditFactory.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditFactory.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWindow.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWindow.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWorkspace.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEditWorkspace.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIEnumAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIPanel.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIPanel.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUIStringAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITextureAttribute.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITextureCacheBrowser.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CGUITextureCacheBrowser.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMemoryReadWriteFile.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
CMemoryReadWriteFile.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
EGUIEditTypes.h
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc10.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc10.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc11.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc11.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc12.vcxproj
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc12.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUI Editor_vc14.vcxproj
Merging r6128 through r6139 from trunk to ogl-es branch.
2020-09-29 20:22:28 +00:00
GUI Editor_vc14.vcxproj.filters
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
GUIEditor_gcc.cbp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
main.cpp
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00
Makefile
Merging r5975 through r6036 from trunk to ogl-es branch.
2020-01-03 19:05:16 +00:00