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
73c5b296bb
Merging r6107 through r6116 from trunk to ogl-es branch
...
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:34:02 +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
d236d99c6c
Merging r5686 through r5778 from trunk to ogl-es branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5779 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:20:38 +00:00
cutealien
3a1a4a78ea
Merge revisions r5540 through r5547 from trunk to ogl-es
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5548 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-23 20:23:20 +00:00
cutealien
ff7a1c154f
Merge revisions r5476 through r5483 from trunk to ogl-es-
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5484 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-11 18:34:38 +00:00
cutealien
d00ade6cbd
Merge revisions r5434:r5436 from trunk to ogl-es
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5437 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:15:26 +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
d87aec8a3b
Merge r4616-4617 from trunk:
...
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4650 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:00:33 +00:00
cutealien
5cc50195e7
Merge r4546-4547 from trunk:
...
Fix syntax problems in Cg renderer base classes, which came from the override changes.
Third round of override macro updates. Should have touched all functions stating virtual for now. This might still have missed some, as sometimes the virtual keyword is missing on derived functions. And some open points are also still under consideration, will be fixed in future.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4636 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:41:53 +00:00
cutealien
6740009946
Merge r4545 from trunk:
...
Second round of override checks
Exposed some more functions:
getArchiveName returning name (path) of archive
getColor and getColorHSL for color select dialog
get/setDoubleClickTime in device for setting the time offset necessary to have two separate clicks instead of a double-click
Removed deprecated getXJoint and getMS3DJoint functions
NOTE: CAndroidAssetFileArchive::getArchiveName had to be added additionally to this patch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:37:26 +00:00
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
5caf2b4045
Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 22:15:27 +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
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
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
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
4dd11b322d
Cleanup of some helper structs.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1521 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-31 10:33:47 +00:00
hybrid
763acaa745
Merge revisions 1495:1497 from 1.4 branch. GUIImage fix by CuteAlien. Default value changes in particle system and scene manager.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1498 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-14 15:36:21 +00:00
hybrid
565fc47062
Merged 1486-1488 from 1.4 branch, IImage methods exposed and MeshManipulator moved.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1489 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-13 23:48:33 +00:00
hybrid
89b96c6609
Increased and synced the default parameter for polys per octree node.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1452 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-07 10:21:09 +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
897a3fa6a6
Merged from branch 1.4 revisions 1290:1305.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1306 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-30 23:19:12 +00:00
hybrid
9eb99c5bd7
Fixed quaternion warnings. Fixed returned interface pointers for newly introduced scene node changes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1299 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-26 12:56:25 +00:00
hybrid
11d12d3488
Changed scene node sorting to use squared distances.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1296 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-19 13:11:42 +00:00
hybrid
a3a41d8085
Major update to LWO loader to support more material properties and work with more meshes. Changed some meshloader constructors to take scenemanager instead of other parameters. Fixed obj loader texture loading with mixed file separators.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1215 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-29 16:59:36 +00:00
hybrid
99aa627e76
Merged from 1.4 branch revisions 1174:1188
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1189 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 00:24:28 +00:00
hybrid
b1c52e4dbe
Minor coding changes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1166 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-06 22:34:09 +00:00
teella
24989c4487
Volumetric lighting for Irrlicht
...
Example useage added to 08.Special FX demo
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1160 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-06 13:13:24 +00:00
engineer_apple
0efce9c9a2
-------------------------------------------
...
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@1047 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-13 14:36:17 +00:00
hybrid
738951ff4b
Fixed some type issues with sqrt. Fixed rect.isValid to work with all types and avoid useless tests. Cleaned up some variable uses and scopes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1004 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-26 16:18:11 +00:00
hybrid
68cd81b194
Split texture layer properties from SMaterial. Changed all texture access etc. in source code and examples. There is also a method to access textures now, which would allow to grab and drop them...
...
Also disabled dx8 by default.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@992 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-20 15:33:36 +00:00
hybrid
df946a1ce6
Removed unnecessary irr namespace prefixing.
...
Added STL mesh file format reader and writer. This is a pretty simple format, but I wanted to try the mesh writer interface.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@983 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 14:08:28 +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
hybrid
f74f7586e2
Some more constification, but still not done. Now we have also SEvent in OnEvent as const ref, so most user apps will need some kind of upgrade for the new library version.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@964 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-16 23:41:55 +00:00
hybrid
f4bc95371b
First larger constification. Made serialization const. Some other constification and signedness changes. Minor other code changes.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@959 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-14 22:25:59 +00:00
irrlicht
2da809bc2a
added mesh writing features. COLLADA file writer is finished, .irrmesh writer is under construction.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@924 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-08 06:10:52 +00:00
hybrid
9eeba07bc8
Fix extra qualification.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@813 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-30 17:15:54 +00:00