Commit Graph

29 Commits (master)

Author SHA1 Message Date
cutealien 3ff5abe55d Merging r6364 through r6379 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-09 10:07:30 +02:00
cutealien c2c991d224 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-05-01 23:45:10 +03:00
cutealien ced66e610c 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-30 23:04:14 +02:00
cutealien fb6aac08ed 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-14 11:25:29 +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 7bd44b9733 Merge revisions r5532 through r5538 from trunk to ogl-es-
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5539 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-30 13:20:12 +00:00
cutealien 80718d0e60 Merge revisions r5484 through r5501 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5502 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-16 14:30:26 +00:00
nadro 5dae8edba4 - Fixed compilation issues on Xcode 8.x.
- Increased macOS deployment target to 10.9.
- Increased iOS deployment target to 8.0.
- (Known bug) Software drivers don't work in macOS Sierra.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5401 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-06 19:30:11 +00:00
nadro b371f08d4a - Merged rev 5258-5275 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5286 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-17 22:17:43 +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 ed78a4e3d1 - Merged rev 5202 from trunk.
- Fixed support for OSX.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5203 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-05 17:34:57 +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 564a60f4aa Merge revision 4959:4961 from trunk to ogl-es
- Allow moving the camera around with the mouse in the MaterialViewer.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4962 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-02 21:41:41 +00:00
cutealien a52b5458f8 Merge revision 4954:4959 from trunk to ogl-es:
Fix bug in MaterialViewer - light control colors got initialized wrong.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4960 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-02 19:11:45 +00:00
cutealien 37e2691ede Update example cbp project file for MaterialViewer (last check-in wasn't yet correct).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4956 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-01 22:03:27 +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 f50e1af202 Merge revision 4771:4781 from trunk to ogl-es:
- Example 22 no longer select a random texture after loading a new texture (thanks at mongoose7 for reporting).
- Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (Thanks at @Midnight for reporting).
- Remove force blending mechanism and improve blending handling in material renderers.
- Fixed issue with wrongly enabled Z-writing for transparent shader materials. Thanks Hendu for this fix.
- Fixed issue with missing blending when transparent shader material is used with blending operation set to EBO_NONE.
- IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set.
- Crashfix for CGUIEditBox. CGUIEditBox::setMultiLine must break text when changed or other functions like getTextDimension can crash afterward for strings with newline characters.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4838 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:27:32 +00:00
cutealien fbc4fa7da1 Merge revision 4711:4723 from branch to ogl-es:
- Fix c::b project obj folder names. Some static builds had used the shared folders (thx @ gerdb for reporting)
- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
- Fix a reorder warning.
- triangle3d constructor and line3d::getIntersectionWithSphere passing vectors now as const-ref instead of per value. Thx @nemo for reporting.
- Mention another fonttool to create Irrlicht fonts (by Armen).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4829 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 13:25:22 +00:00
hybrid 3f0c8e3a3b Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:15:53 +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 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
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 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 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