MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
890 Commits
2 Branches
0 Tags
38 MiB
Commit Graph

72 Commits (d5e6d04769e44f97c42b13c2a8b4b63fdae06521)

Author SHA1 Message Date
hybrid d5e6d04769 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 17:27:12 +00:00
hybrid 4f4ca75a4f Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 16:01:12 +00:00
hybrid 0753afac9d Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-28 17:04:07 +00:00
hybrid ed9566079e Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4487 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-28 14:54:50 +00:00
nadro 919c037d05 - Clean-up OGL ES2 driver (mainly stuff related to textures). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4481 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-19 15:54:47 +00:00
nadro 293236417f - Added VS2012 projects. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4439 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-16 00:59:25 +00:00
nadro 40b42e6010 - First version of rewritten OpenGL ES 2.0 driver (IDE projects aren't updated, 2d drawing methods doesn't work, only basic functionality of fixed pipeline materials). This driver will be improved soon. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4435 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-15 00:31:37 +00:00
Nadro 466ad034d3 - Added initial support for Android OS with example no. 8. Thanks for a gsfare and hiker for their hard work for this commit. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4309 dfc29bdd-3216-0410-991c-e03cc46cb475
 2012-09-06 23:14:12 +00:00
hybrid 9262b0848f Fix textureBlend function rename, which seems to have not been propagated from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4248 dfc29bdd-3216-0410-991c-e03cc46cb475
 2012-07-16 14:55:50 +00:00
hybrid 15c3dc795a Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-10-16 10:48:26 +00:00
hybrid 5caf2b4045 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-09-08 22:15:27 +00:00
hybrid 7ae68647e9 Next large merge from trunk, revisions 3729-3830 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-09 07:08:47 +00:00
hybrid 54fa54d446 More flexible driver choice 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3828 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-08 17:17:32 +00:00
hybrid d5b9d20e0e Pass high level shader files to ogl-es drivers. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3804 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-06 15:01:38 +00:00
hybrid e379658827 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3727 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-05-18 22:21:50 +00:00
hybrid 58d6c11fa0 Fix compilation problems due to last update. Fix vc10 project files 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-01-17 08:37:00 +00:00
hybrid de2e004b83 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-01-14 15:36:50 +00:00
hybrid 4f6edf5e2e New OpenGL-ES 2.x driver. This is a fully shader based render pipeline, which is compatible with, e.g., latest iPhone and other smartphone systems, and embedded devices such as the Pandora game console and the Beagle board. 
The whole implementation of the new driver was provided by the folks from Amundis (http://amundis.fr/index.php?lang=en). There are more projects to come from them. Many thanks to Thibault and his colleagues for providing the code for inclusion in the engine.
Please note that you have to remove not only the OpenGL driver (automatically done in IrrCompileConfig once the ogl-es driver is enabled there), but also the linking against the opengl32.lib in the project files. Otherwise no rendering will happen.
Also note that the driver currently does not support all features of the engine. Some materials are not fully working, the shadow system seems to be missing, and the mipmapping is broken. These things will be fixed in future bug fixes.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3370 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-08-08 17:46:48 +00:00
hybrid ab5739f571 Merged from trunk, revisions 3300-3365. Another large bugfix merge. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-07-18 21:25:27 +00:00
hybrid 7bae34bc61 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-06-01 22:52:38 +00:00
hybrid d07fc00916 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-01-23 20:13:43 +00:00
hybrid 329f550b17 Merged revisions 2781:2892 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2893 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-11-20 10:08:00 +00:00
hybrid 2061a3862f Merged revisions 2695:2780 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2781 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-11-02 17:20:21 +00:00
hybrid 72e83023ec Merged revisions 2441:2694 from trunk. This is a huge update which brings the ogl-es branch to the latest 1.6 state. No updates for the ogl-es driver have been incorporated, this branch might not even compile properly right now. I'm just very happy that the merge finally went through... 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2695 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-09-16 12:48:19 +00:00
hybrid b24d213745 Merged revisions 2375:2440 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-07-03 09:11:53 +00:00
hybrid 75b5403b5b Merged from trunk revisions 2144:2363 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2364 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-05-05 00:09:53 +00:00
hybrid 55e2c6d600 Merged from trunk, all revisions from 1977 to 2143. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2144 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-01-27 13:23:36 +00:00
hybrid 30100db0a5 Merged all revisions up to 1976 from trunk into ogl-es branch. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-12-19 09:56:25 +00:00
hybrid cc7f977f60 Merged revisions 1726:1852 from trunk for the recent updates. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-27 23:52:13 +00:00
hybrid 51484af6d3 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-12 10:11:25 +00:00
engineer_apple d4dd74ffff small bugfix winCE 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1524 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-09-01 15:41:36 +00:00
hybrid 4cca69a37b Some Q3 example changes. OctTree has been reenabled with larger vertex numbers. Example 16 now accepts pk3 files and bsp levels on the command line, and it can display the bounding boxes of octrees. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1441 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-07-31 17:29:23 +00:00
hybrid 641b1a3d56 Another merge that didn't work properly... 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1433 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-07-30 22:45:02 +00:00
hybrid e6e34950af Added some enhancements for scene graph traversal and an example for collision checking with .irr scenes from rogerborg. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1432 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-07-30 21:24:19 +00:00
hybrid 17d5f8a3f6 Merged from 1.4 branch revisions 1368:1422. 
This fixes wrong child handling in AnimatedMesh SceneNode, 2dimage clipping in d3d drivers, and a string handling issue in example 16.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1423 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-07-28 17:34:05 +00:00
hybrid c55da82a0c Merged revisions 1357:1366 from 1.4 branch. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1367 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-06-12 11:15:45 +00:00
hybrid 755e117078 Merged from 1.4 branch revisions 1316:1328. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1329 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-04-29 11:34:54 +00:00
bitplane 818b79852a Added a texture animator to volume light in special effects example to show off how cool it can look, and better integrated it into the tutorial. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1316 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-04-16 07:27:20 +00:00
hybrid e480b85d31 Fixed the setter methods to recreate the volume light. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1301 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-03-26 13:59:01 +00:00
hybrid e7add51880 Merged from 1.4 branch revisions 1272:1279 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1280 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-03-05 00:02:00 +00:00
teella 405a2682ba fix mouse cursor in OSX reported by Jay Riley 
Hide Menu and Doc when in fullscreen mode on OSX


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1261 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-02-26 13:12:53 +00:00
hybrid 68e1f2a67d Added command line support for loading meshes at startup. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1228 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-02-07 15:57:49 +00:00
hybrid 99aa627e76 Merged from 1.4 branch revisions 1174:1188 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1189 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-21 00:24:28 +00:00
bitplane 0add053f81 getMaterialCount in custom node example was non-const, reported by vitek 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1163 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-06 19:55:43 +00:00
teella 24989c4487 Volumetric lighting for Irrlicht 
Example useage added to 08.Special FX demo



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1160 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-06 13:13:24 +00:00
hybrid 07670acf7e Merged 1134:1151 from branch 1.4 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1152 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-04 11:10:37 +00:00
teella d42ac0704a added examples to MacOSX project 
1.HelloWorld
15.LoadIrrFile
16.Quake3Shader


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1147 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-03 09:37:56 +00:00
engineer_apple 24334f193c added Initial Windows Mobile 6 Version. 
- Windows Mobile 6 SDK
- Visual Studio 2005 only
Minor:
- Burningvideo: MipMap Selection repaired
- renamed private Driver function getTextureSizeFromImageSize to
  getTextureSizeFromSurfaceSize


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1146 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-02 10:28:12 +00:00
hybrid 99fd5bcc7c Merged 1.4 branch, revisions 1106:1132. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1133 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-12-23 17:04:40 +00:00
engineer_apple e1941642d6 ------------------------------------------- 
Changes in version 1.4 (... 13.11.2007)
- Fixed somed CQuake3ShaderSceneNode problems.
- Changed BurningsVideo internal Vertex Format. version changed to 0.39
- SceneManager:
   Removed the seperate rendering states for quake3 Shader Scene Nodes.
   Nodes are now solid or transparent. ( but still more states are needed )


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1048 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-11-13 14:37:07 +00:00