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

35 Commits (master)

Author SHA1 Message Date
MoNTE48 c9cde45d0e Merging r6256 from trunk to ogl-es branch (fixing OSX again) 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-08-30 23:06:51 +02:00
cutealien b42fbc5ab1 Merging r5975 through r6036 from trunk to ogl-es branch. 
GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-12 14:24:32 +02:00
cutealien c9f5503436 Merging r5843 through r5862 from trunk to ogl-es branch 
Adapting both GLES drivers to new addHighLevelShaderMaterial interfaces.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5890 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-03-09 15:45:59 +01:00
cutealien 291fb2ffac Merging r5788 through r5805 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5806 dfc29bdd-3216-0410-991c-e03cc46cb475
 2019-04-23 20:17:39 +00:00
cutealien 990d475fbb Merging r5686 through r5778 from trunk to ogl-es branch (part 2) 
(was in wrong folder in last commit, so only source folder got checked in).
Also adapt ES1 and ES2 driver to remove texture from OGL texture cache
(that was fixed in GL driver in the parts that got merged).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5780 dfc29bdd-3216-0410-991c-e03cc46cb475
 2019-02-27 20:30:26 +00:00
cutealien f1ee785039 Merge revisions r5337:r5415 from trunk to ogl-es. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5416 dfc29bdd-3216-0410-991c-e03cc46cb475
 2017-04-12 15:33:31 +00:00
cutealien 88b27cbdeb Fix last merge (revisions 5316:5335 from trunk to ogl-es). 
Sorry, accidentally only the android sub-folder got checked-in and the rest was missing.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5366 dfc29bdd-3216-0410-991c-e03cc46cb475
 2017-03-13 14:54:20 +00:00
nadro e604a608eb - Merged rev 5212-5219 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5220 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-12-15 21:06:53 +00:00
nadro ce6b7562ce Merge revision 4977:5180 from trunk to ogl-es. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-11-12 22:32:01 +00:00
cutealien 43817f07f7 Merge revision 4939:4954 from trunk to ogl-es: 
- Bugfix: Cloning CBillboardSceneNode now copies colors and sizes.
- Last fix to enable numkeys on X11 had broken the normal DELETE key on X11. So reworked the fix some more.
- Array index was used before limit check
- Add an array with driver name strings for the driver enums.
- Cleaning up Meshviewer example. 
Also added a project target for LinuxGLES2 for the MaterielViewer cbp (this should be done for all examples at some point).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4955 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-10-01 22:02:09 +00:00
cutealien 5def8f4fa9 Merge revision 4932:4938 from trunk to ogl-es (4932 ignored as it was the revert of an earlier patch which wasn't merged). We've now catched up to current trunk again. 
- Fixed issue with functions for convert from/to UTF8 and shared libs.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4939 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-09-18 22:29:17 +00:00
cutealien 22bf85884d Merge revision 4922:4923 from trunk to ogl-es: 
- Added helper functions for converting between wchar and utf-8.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4936 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-09-18 22:03:14 +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
nadro e49efc5498 - Updated ogl-es branch to rev4182. 
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
 2012-06-11 22:43:38 +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 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 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
hybrid 3f664b5391 Small code cleaning. Additional check for proper values in substring method. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1415 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-07-17 09:01:06 +00:00
hybrid cdffc4a5d6 Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-05-22 11:51:37 +00:00
hybrid ffb438d141 Minor changes and cleanup. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1292 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-03-19 10:20:41 +00:00
hybrid 4e6e236ec4 Merged from branch 1.4, revisions 1275:1289 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1290 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-03-19 09:54:51 +00:00
hybrid 451d5bca72 Merged from 1.4 branch revisions 1251:1271 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1272 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-03-02 14:28:48 +00:00
hybrid 7ce4f2517f Some documentation updates. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1020 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-10-02 22:41:05 +00:00
hybrid df946a1ce6 Removed unnecessary irr namespace prefixing. 
Added STL mesh file format reader and writer. This is a pretty simple format, but I wanted to try the mesh writer interface.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@983 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-19 14:08:28 +00:00
hybrid 13b9851487 Another round of constness additions. Almost finished now. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@969 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-17 16:09:50 +00:00
bitplane c00ce1d372 Moved everything to /trunk 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-05-20 18:03:49 +00:00