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
207b598a43
Merging r6275 through r6286 from trunk to ogl-es branch
...
- Fixing warnings
- Updating bzip2 and zlib libraries
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-01-14 12:23:21 +01:00
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
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
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
15128e6e9f
Merge revisions r5416:r5420 from trunk to ogl-es.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5421 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-13 12:42:29 +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
cutealien
52ce5d3127
Merge r4580-4594 from trunk:
...
Removed unnecessary glFinish call on OSX platform. Thanks devonsoft for report this bug.
Merge near identical code in CTriangleSelector::createFromMesh and CTriangleSelector::updateFromMesh (createFromMesh now using updateFromMesh).
vector2d::equals now has an tolerance parameter for passing the epsilon (like vector3d has already). Note that this changes the default behavior of vector2d::equals as well as functions using it like the operators for ==, !=, <, >, <=, >= when using vector2d with f64 as the tolerance is increased in that case (for f32 and integer values it shouldn't make any difference).
line2d::intersectWith has a new parameter to allow ignoring intersections with coincident lines
Revert VS10 project file to previous version as it got accidentally checked in with static linking enabled (sorry).
Fix more typos in documentation and add a little more docs (thx @Yoran for reporting).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4647 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:38:20 +00:00
hybrid
aec5a3afae
Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4511 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-17 17:45: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
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
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
b24d213745
Merged revisions 2375:2440 from trunk.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-07-03 09:11: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
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
e78db30247
Docs update for trunk and branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1508 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-20 08:36:41 +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
755e117078
Merged from 1.4 branch revisions 1316:1328.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1329 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 11:34:54 +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