cutealien
70169e0cff
merge r4543-4544 from trunk:
...
First round of override updates.
Some fixes:
Added get/setCurrentRenderPass to scene manager (internally renamed, exposed)
Removed destructor from light scene node.
Removed getType calls from archive loaders (one file archives have this)
Removed some internal exposures and virtual attributes for protected classes
Remove white spaces before semicolon
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4634 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:57:38 +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
15c3dc795a
Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +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
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
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
30100db0a5
Merged all revisions up to 1976 from trunk into ogl-es branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-12-19 09:56:25 +00:00
hybrid
cc7f977f60
Merged revisions 1726:1852 from trunk for the recent updates.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-27 23:52:13 +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
682a1200a8
Replaced transformBox by transformBoxEx to avoid major malfunction of the transformations when the transformation includes rotations.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1511 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-25 13:46:22 +00:00
hybrid
2489bda2e8
Merged 1499:1506 from 1.4 branch: Doc updates, getEmitter added.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1507 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-20 08:24:52 +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
a5286dbb30
Fixed warning.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1342 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 22:07:21 +00:00
hybrid
402c34e47d
Warning fix and new method for both 1.4 branch and trunk.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1332 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 12:10:33 +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
0e63486fbe
Merged revisions 1309:1314 from 1.4 branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1315 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-12 23:02:15 +00:00
engineer_apple
201ce2c119
-------------------------------------------
...
Changes in version 1.4 (... 13.11.2007)
- Fixed somed CQuake3ShaderSceneNode problems.
- Changed BurningsVideo internal Vertex Format. version changed to 0.39
- SceneManager:
Removed the seperate rendering states for quake3 Shader Scene Nodes.
Nodes are now solid or transparent. ( but still more states are needed )
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1046 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-13 14:35:29 +00:00
hybrid
435cf0a5fe
Fix the texture matrix translation method, discovered by vitek.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1031 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-10-17 16:24:01 +00:00
hybrid
ce4453fb36
More matrix enhancements.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1019 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-10-02 22:20:57 +00:00
lukeph
f7eb2e9a5c
added identity check on getInverse() in CMatrix4
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1018 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-10-02 14:24:45 +00:00
hybrid
17ed8d5b60
Some new convenience functions and fixes for template usage.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@946 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-12 17:46:58 +00:00
hybrid
9eabb49041
Some more parts of the matrix class templatized.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@784 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-13 18:23:09 +00:00
hybrid
010e9b2fc1
Added adjustable attenuation to dynamic lights.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@726 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-21 21:06:21 +00:00
irrlicht
4873ecf3e8
removed some warnings when doing double/float conversions
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@695 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-07 13:21:19 +00:00
hybrid
db6011aae3
Removed development replacement code. Sorry, this was not meant to be in SVN...
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@683 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-03 21:15:48 +00:00
bitplane
f960e51037
removed namespace from matrix4 constructor enum to make it compile again in VC
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@682 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-03 20:44:11 +00:00
hybrid
b6b7cfd13b
Started to make matrix4 a template to allow for better adaption. Due to renaming of the template the original matrix4 type is still the f32 version of the matrix. I had to remove some forward declarations, though as I did not want to add the template declaration into other headers.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@675 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-02 10:37:00 +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