MoNTE48
c9cde45d0e
Merging r6256 from trunk to ogl-es branch (fixing OSX again)
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:06:51 +02:00
cutealien
374912b476
Merge revision 4790:4793 from trunk to ogl-es:
...
- Add a code profiler (stop-watch style).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4845 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:40:08 +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
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
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
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
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
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
hybrid
63f28cf5ff
Moved material enums into separate files. Disabled randr again, was accidentially activated.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@984 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 14:35:35 +00:00
bitplane
1f1006a177
Added CuteAlien's IGUISpinBox.
...
Added setDrawBorder to IGUIEditBox and IGUIStaticText.
Added setTextAlignment to GUIEditBox and IGUIStaticText, for text justification and vertical alignment.
IGUIEditbox now supports multiple lines using setWordWrap and setMultiLine.
IGUIElement now calls getter and setter functions when serializing, in case of getter/setter overrides.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@745 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-30 23:30:40 +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