Commit Graph

33 Commits (master)

Author SHA1 Message Date
hybrid e52f7c693c 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: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:15:53 +00:00
hybrid a774707164 Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 17:04:07 +00:00
hybrid f70a39f7f5 Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4487 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 14:54:50 +00:00
nadro dd6f2f46c7 - Added VS2012 projects.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4439 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-16 00:59:25 +00:00
hybrid 40fd2fc874 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
git-svn-id: http://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 40f2be1ce5 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.
git-svn-id: http://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 e12163dac4 Fix compilation problems due to last update. Fix vc10 project files
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-17 08:37:00 +00:00
hybrid c7a7055a25 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: http://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 28c067bac4 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: http://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 6e7c44fe95 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: http://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 2832a61dd2 Merged revisions 2781:2892 from trunk.
git-svn-id: http://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 0aa5845e59 Merged revisions 2695:2780 from trunk.
git-svn-id: http://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 1584e0d569 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: http://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 9d0cf6c3ba Merged from trunk revisions 2144:2363
git-svn-id: http://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 211f574c82 Merged from trunk, all revisions from 1977 to 2143.
git-svn-id: http://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 c5d29d0786 Merged all revisions up to 1976 from trunk into ogl-es branch.
git-svn-id: http://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 b4e8a117c7 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver.
git-svn-id: http://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 5e04a990eb Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-05-22 11:51:37 +00:00
bitplane 169101850f 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: http://svn.code.sf.net/p/irrlicht/code/trunk@1236 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-11 19:34:12 +00:00
hybrid 7bcb188a03 Added a command-line tool for access to the mesh writer modules.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1207 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-27 15:41:38 +00:00
bitplane 057ea09da9 Table serialization fix, small update to gui editor colour attribute, updated readme.txt
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1180 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-16 05:10:27 +00:00
bitplane bcf61ee6ce Added StarSonata GUI patch from the tracker, const corrected. Fixed some bugs and changed the style and behaviour of the tabs. Tables aren't fully tested and don't serialize properly yet.
Changed gui editor to show off and test the new tab features.
Updated project files and makefile, have only tested vc8 and dev-cpp. Didn't know how to do the OSX project so I'll leave it for Dean.
Moved EGUI_ALIGNMENT into separate header.
Added getArea and getVolume for bounding boxes, no real reason for them.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1124 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-22 07:49:29 +00:00
hybrid 5ddb050e70 Fixed some typos in irrList and adapted GUIEditor to ConstIterators.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1017 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-10-02 12:43:25 +00:00
bitplane 9be7473508 font tool overlapping character fix by heiye. updated const signatures in gui editor and font tool.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@980 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 08:03:29 +00:00
irrlicht 0e6c294217 renamed IUnknown to IReferenceCounted
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@916 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-07 06:11:47 +00:00
bitplane b5cee3c55a CuteAlien's menu changes and fixes, CuteAlien/StarSonata's coloured listbox item extension.
Added a close event for windows (and in future other elements), absorbing this event will prevent the window from closing.
Used the new skin icon in the gui editor's resize button.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@879 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-29 23:37:24 +00:00
hybrid 573f395c3d Fixed documentation, found by Slappy.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@863 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-25 23:49:44 +00:00
bitplane f182bc371e some doc comments about event types and event receivers. fixed a bug in the gui editor
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@825 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-07 03:12:22 +00:00
bitplane e0a66f229b Added navigation through the GUI using tab and the shift and control keys. Added keyboard navigation for most elements. Fixed that annoying bug where you had to click twice to change focus.
Added IGUIElement::isMyChild, isPointInside,  SEvent.GUIEvent.Element. 
Changed setFocus and removeFocus to return bools.
changed quaternion::toAngleAxis to use iszero. 

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@763 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-07 07:03:54 +00:00
hybrid e2d28828ec Fixed a compile error due to missing const qualifier.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@723 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-21 08:17:12 +00:00
irrlicht 3ca6592f38 fixed gui editor v7 solution file, corrected CFontTool #defines for windows
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@713 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-17 07:47:23 +00:00
bitplane 9900aae837 added IFileSystem::getFileDir and made XML bitmap font use relative path for texture.
gui editor now compiles again

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@654 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-05-26 22:19:21 +00:00
bitplane 30b56d2ec5 Moved everything to /trunk
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-05-20 18:03:49 +00:00