Commit Graph

13 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 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
cutealien 5b63d4ef81 - addDirectory renamed to addDirectoryToFileList and now in IFileArchive so users can add any assets folders.
- asset directories which are added are now released again (was leaking before)
- "media" is no longer added automatically to assets folders by the engine, but must be added by users now (example is extended to do that).
- root assets folder no longer added in CAndroidAssetFileArchive but in CIrrDeviceAndroid to avoid calling a virtual function in a constructor (it had worked in this case for now - still was ugly and should never be done)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4679 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-11 23:35:59 +00:00
cutealien 6740009946 Merge r4545 from trunk:
Second round of override checks
Exposed some more functions:
getArchiveName returning name (path) of archive
getColor and getColorHSL for color select dialog
get/setDoubleClickTime in device for setting the time offset necessary to have two separate clicks instead of a double-click
Removed deprecated getXJoint and getMS3DJoint functions
NOTE: CAndroidAssetFileArchive::getArchiveName had to be added additionally to this patch.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:37:26 +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 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 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 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