Commit Graph

30 Commits (b849f8666374b6cc7af3ec6b066d476b4d7abb25)

Author SHA1 Message Date
cutealien b849f86663 Merging r6337 through r6363 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6379 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-08 11:42:26 +02:00
cutealien 252abab03d Merging r5652 through r5663 from trunk to ogl-es.
This is mostly about cubemap changes. ES drivers compile, but not tested
if cubemaps work with them.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5664 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-11-25 15:44:47 +00:00
cutealien bdb412cd44 Merge revisions r5604 through r5621 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5622 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-06-17 20:01:00 +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 19a829138d Merge revision 4961:4971 from trunk to ogl-es:
- Allow moving the camera around with the mouse in the MaterialViewer.
- Allow compiling on VS with (/Zc:wchar_t-) set.
- bugfix: CUserPointerAttribute::setString had used wrong scanf string parameters (and as far as I can see never worked).
- Can now enable/disable backround drawing for IGUITable and IGUIProfiler.
- Make profiler start/stop calls use counters to make profiling recursive functions easier.
- IGUIProfiler can now work with any profiler using the IProfiler interface.
- Allow to freeze the IGUIProfiler interface.
- Allow IGUIProfiler to display all profile groups on the same page.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4972 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 00:55:50 +00:00
cutealien 901ec7b0da Merge revision 4812:4822 from trunk to ogl-es:
- Fix compile troubles on VS. Thx @Foaly for reporting.
- Animated dwarfes are more fun.
- Reset group-page as well when calling CGUIProfiler::firstPage.
- Ignore binary 17.
- Add examples 17 and 30+ to Linux build support.
- Fix warnings.
- Fix typo in comment.
- CGUIProfiler can now handle it when a group doesn't fit on a single page.
- Add interface for easier access to scrollbars for IGUIListBox, IGUITreeView and IGUITable
- Add IGUITable::getItemHeight


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4853 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:38:19 +00:00
cutealien 5508ba4d23 Merge revision 4789:4790 from trunk to ogl-es:
- Add override font to IGUITable


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4843 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:10:30 +00:00
cutealien 2fc9d4403b Merge revision 4785:4788 from trunk to ogl-es:
- IGUITable can now disable the active column.
- IGUIElement::getElementFromPoint now virtual.
- remove redundant includes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4841 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:05:21 +00:00
cutealien 6d650ec027 Merge revision 4745:4761 from trunk to ogl-es:
- Focus behavior of IGUIEnvironment now controllable (right-click focus, mouse-over focus). Disabled elements no longer get the focus unless users enforce it.
- CGUITreeView: Irrlicht elements can't just set ID's otherwise user-elements stop working.
- CGUITreeView: Make the horizontal scrollbar (mostly) work. Selection still messed up, but was that way before and least h-scrolling works now somewhat.
- Remove lot's of setFocus and removeFocus calls. Also several places where elements check if they have the focus inside events.
- Buttons can now now have 7 more image-states, 1 more sprite-state and the sprites are now scaleable.
- IGUIEnvironment::hasFocus can work with a const pointer.
- Spritebanks can now draw scaled sprites.
- Improve spritebank slightly (more comfort functions and documentation).
- CGUIEditBox and the GUI-Editor now convert pasted text correctly using mbstowcs.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4836 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:16:46 +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
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 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 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 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 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 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
bitplane 3d51b275d4 Checking for IsEnabled is now consistent across all GUI elements (bug 2003234 by CuteAlien)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1412 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-08 19:47:51 +00:00
hybrid 9c167398bb Added the missing copyright headers and changed the new files to 2008 as well.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1354 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-05-22 12:07:43 +00:00
hybrid 54b918f770 Removed some unused variables.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1252 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-21 13:03:22 +00:00
hybrid 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
bitplane 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
bitplane 00ce168fdf constified OnEvent for table (oops)
fixed hardware buffer destruction

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1175 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-14 04:58:32 +00:00
bitplane 6436ded4e1 Huge GUITable update by CuteAlien.
Modal screen no longer flashes invisible children.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1172 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-11 15:56:37 +00:00
hybrid 05667475b6 Fixed some warnings.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1144 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-31 00:28:51 +00:00
bitplane 0dffdd46a6 table serialization
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1132 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-23 02:48:02 +00:00
hybrid d8a80a664b Removed another umlaut from comments. Minor other changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1130 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-22 22:33:51 +00:00
bitplane aab1dfa7cb 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: svn://svn.code.sf.net/p/irrlicht/code/trunk@1124 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-22 07:49:29 +00:00