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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
cutealien
nadro
hybrid