minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
irrlicht/examples
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
..
01.HelloWorld Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
01.HelloWorld_Android Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
01.HelloWorld_emscripten Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
01.HelloWorld_iOS Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
02.Quake3Map Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
03.CustomSceneNode Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
04.Movement Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
05.UserInterface Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
06.2DGraphics Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
07.Collision Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
08.SpecialFX Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
09.Meshviewer Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
10.Shaders Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
11.PerPixelLighting Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
12.TerrainRendering Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
13.RenderToTexture Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
13.RenderToTexture_emscripten Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
14.Win32Window Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
15.LoadIrrFile Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
16.Quake3MapShader Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
17.HelloWorld_Mobile Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
18.SplitScreen Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
19.MouseAndJoystick Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
20.ManagedLights Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
21.Quake3Explorer Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
22.MaterialViewer Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
23.SMeshHandling Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
24.CursorControl Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
25.XmlHandling Merging r6075 through r6106 from trunk to ogl-es branch. 2020-06-12 20:41:49 +00:00
26.OcclusionQuery Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
27.PostProcessing Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
28.CubeMapping Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
29.HardwareSkinning Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
30.Profiling Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
BuildAllExamples.xcworkspace Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
Demo Merging r6128 through r6139 from trunk to ogl-es branch. 2020-09-29 20:22:28 +00:00
BuildAllExamples.workspace Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
BuildAllExamples_vc10.sln Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
BuildAllExamples_vc11.sln Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
BuildAllExamples_vc12.sln Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
BuildAllExamples_vc14.sln 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
buildAllExamples.sh Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00
whereAreTheBinaries.txt Merging r5975 through r6036 from trunk to ogl-es branch. 2020-01-03 19:05:16 +00:00