6 Commits

Author	SHA1	Message	Date
cutealien	2d63fdba3d	Merging r6288 through r6336 from trunk to ogl-es branch ... git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6337 dfc29bdd-3216-0410-991c-e03cc46cb475	2022-04-15 18:51:09 +00:00
cutealien	21302d038a	Merging r6196 through r6248 from trunk to ogl-es branch ... git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475	2021-08-26 21:57:27 +00:00
cutealien	fa0b1cb509	Merging r6145 through r6171 from trunk to ogl-es branch ... git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475	2020-12-19 15:03:11 +00:00
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
cutealien	20b3d56987	Merging r6075 through r6106 from trunk to ogl-es branch. ... Burnings renderer changes. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475	2020-06-12 20:41:49 +00:00
cutealien	2ae2a551a6	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-01-03 19:05:16 +00:00