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
6f8df7fc29
Merging r5946 through r5966 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5967 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:53:23 +01:00
cutealien
37b154102b
Merge trunk revisions 4630 to 4685:
...
- Makefile for the new IrrFontTool links now correctly to libfontconfig
- Bugfix: getFont for xml-fonts now also works for fonts inside archives (thx @Neirdan for bugreport)
- Add function mergeFilename + tests
- Add ISceneNodeAnimator::setStartTime/getStartTime to allow resetting movement animators.
- Get Irrlicht to compile with IRRLICHT_FAST_MATH on Linux (out-define code which was written for VS and remove #warn which is not a preprocessor command recognized by GCC).
- Make key-release events also show the correct Char value on Windows (thx @zerochen for report+fix here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49499 )
- Fix input with numlock-keys on Linux. Thx @zerochen for report and help with bugfixing.
- Linux version of makedocumentation.sh now works like the DOS version and creates html docs.
- Add some error checking in test.
- Indentation
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4686 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-13 13:01:14 +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
4f4ca75a4f
Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 16:01:12 +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
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
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
hybrid
2489bda2e8
Merged 1499:1506 from 1.4 branch: Doc updates, getEmitter added.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1507 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-20 08:24:52 +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
eb6f51a636
An rpm spec file, might need some more changes to work with latest code.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1034 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-10-19 16:07:29 +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