beea38a195
Merged from 1.4 branch revisions 1235:1250
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1251 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-21 00:20:39 +00:00
81e8956dd5
Fixed a crash in the collada 1.4 loader, also added better texture search.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1250 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-20 17:17:42 +00:00
f978f537f9
Fixed wrong weights assignment found by bang2ni.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1249 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-14 09:33:45 +00:00
152f5f1c68
Fixed the signatures the other way.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1248 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-12 23:43:19 +00:00
5cc156d983
Fixed a docs typo.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1247 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-12 23:25:03 +00:00
408045e3ff
reverted (accidental?) changes to ISceneNode::getPosition and setPosition return values
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1246 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-12 18:05:09 +00:00
25235a32fe
Added multiple inheritance to the billboard texte scene node in order to expose both billboard and textnode interface.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1244 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-12 16:01:26 +00:00
6ae3b9e478
Added a matrix read method.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1243 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-12 15:32:39 +00:00
93bf946053
Some coding style changes, made one method const.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1242 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-12 15:31:35 +00:00
daedda8523
Fixed a performance bug in ISceneNode constructor reported by izhbq412
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1237 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-11 20:00:54 +00:00
6f4a9f921a
Compiling without the BMP loader now compiles without the built-in font data. Added some comments and a warning about this. CGUIPanel draws background when border is on
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1236 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-11 19:34:12 +00:00
f9a0f21bef
Merged from 1.4 branch revisions 1218:1234
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1235 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-09 14:12:28 +00:00
f6db869698
Added IGUIComboBox::setTextAlignment and made combo boxes properly serializable
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1233 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-08 08:23:38 +00:00
ebf3a2730b
Support externally created windows under Linux. Patch submitted by cyberwan.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1231 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-07 17:01:44 +00:00
0672eea652
Added the compile time check to disable GUI compilation. Noticed by CuteAlien.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1230 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-07 16:30:22 +00:00
68e1f2a67d
Added command line support for loading meshes at startup.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1228 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-07 15:57:49 +00:00
de40041412
Fixed a problem with index duplicates which refer to different meshbuffers. Only fixed for non-animated meshes, yet, but might be not a very common problem anyway.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1226 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-07 14:54:04 +00:00
d687a3f0c9
Fixed typo in project file.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1225 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-05 21:42:32 +00:00
bcce969600
Fixed a merge conflict and disabled header compilation.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1224 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-01 14:41:45 +00:00
82f2e6d76c
Another patch by pc0de, fixing problems when combining material serialization with null driver.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1223 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-31 00:17:44 +00:00
aef3770890
Fixed my typo.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1222 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-31 00:14:38 +00:00
6f15d5d025
Patch by pc0de which gives CMeshSceneNode the same debug elements as CAnimatedMeshSN.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1221 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-31 00:12:39 +00:00
134fe5f7a5
Reenable materials for old LWO formats.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1220 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-30 00:36:49 +00:00
c167d7c759
Added a FileSystem check to avoid several error messages.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1219 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-30 00:17:16 +00:00
5bc1bdc13e
Merged from 1.4 branch revisions 1198:1217
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1218 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-30 00:07:52 +00:00
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
b5ac2dfa27
added CLWOMeshFileLoader to OSX project
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1213 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-29 08:27:40 +00:00
46a01b0d0a
Fixed bug with tab controls not absorbing a mouse-down but expecting to have the focus in a mouse-up, reported by christianclavet.
...
Windows are now brought to the front when any of their children are focused.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1212 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-29 02:24:49 +00:00
6a1cafc09e
Fixed some texture problems and speed up string reading. Release memory after mesh is loaded.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1211 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-29 00:04:35 +00:00
f9d4bc02d0
CWin32CursorControl::setVisible fix by MasterGod
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1208 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-27 20:20:36 +00:00
e9fe5ab4b6
Added a command-line tool for access to the mesh writer modules.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1207 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-27 15:41:38 +00:00
da2958a592
Changed the Collada writer to use the new Collada 1.4 format.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1206 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-27 00:35:01 +00:00
fd753b6b6a
Fixed some more material and effect problems, and a mem leak. Tried to get transparency to work.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1205 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-25 17:01:42 +00:00
6d7357c3c5
Fixed some bugs in the collada loader and activated proper material usage. Now, collada 1.4 meshes are also textured and colored.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1204 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-25 00:12:46 +00:00
78b1d0f18c
Better geometry support for Collada loader.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1203 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-24 17:24:52 +00:00
94e8a3e360
Start with texture support implementation.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1202 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-24 00:38:59 +00:00
e5dc2bf3b6
Integrated robotgrafik's collada patch, added some more stuff myself. Still no good material support and major geometry problems.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1201 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-23 17:15:15 +00:00
114035be62
Added some more tags and debug output.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1200 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-23 00:29:55 +00:00
e81cc013eb
Changed error message in font loader, if no regions are found users are given a hint to load the XML file instead.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1198 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-22 12:50:36 +00:00
e66d6fa7a3
Fixed some warnings, bugs, and still the annoying merge conflict.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1197 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 23:56:39 +00:00
638104c129
Added VolumeLight scene node and LWO loader to project files and config.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1195 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 08:54:46 +00:00
acd01e92b2
Really fixed all merge conflicts, found by The Anaconda.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1194 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 07:00:02 +00:00
fcc37ae566
Added an updated version of the LWO loader. Many material settings are still missing.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1193 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 00:38:06 +00:00
d80773ade6
Started Collada 1.4 support. This is work in progress, so don't expect it to work yet.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1192 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 00:35:47 +00:00
4b36179303
Fixed merge conflict.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1191 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 00:32:59 +00:00
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
f73f392e77
Fixed some material bugs in the b3d loader.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1184 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-18 00:54:01 +00:00
a1ced50bea
Remove warnings on OSX compile submitted by Jay Riley
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1182 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-17 22:32:16 +00:00
d64b5fa2b0
Removed extra qualifier added in revision 1175. reported by jppequenao (bug 1871574)
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1181 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-16 05:15:34 +00:00
1608f3f6fe
Table serialization fix, small update to gui editor colour attribute, updated readme.txt
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1180 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-16 05:10:27 +00:00
hybrid
bitplane
teella