cutealien
3ff5abe55d
Merging r6364 through r6379 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-09 10:07:30 +02:00
cutealien
c2c991d224
Merging r6288 through r6336 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6337 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-01 23:45:10 +03:00
cutealien
51598db3bb
Merging r6145 through r6171 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-20 22:40:36 +01:00
cutealien
c17023f55c
Merging r6128 through r6139 from trunk to ogl-es branch.
...
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-10-01 19:58:50 +02:00
cutealien
fb6aac08ed
Merging r6075 through r6106 from trunk to ogl-es branch.
...
Burnings renderer changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:25:29 +02:00
cutealien
a90caf6867
Merging r5918 through r5944 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5945 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:51:25 +01:00
cutealien
14ffa95ccd
Merging r5863 through r5876 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5891 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:46:04 +01:00
cutealien
80718d0e60
Merge revisions r5484 through r5501 from trunk to ogl-es
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5502 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-16 14:30:26 +00:00
nadro
5dae8edba4
- Fixed compilation issues on Xcode 8.x.
...
- Increased macOS deployment target to 10.9.
- Increased iOS deployment target to 8.0.
- (Known bug) Software drivers don't work in macOS Sierra.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5401 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-06 19:30:11 +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
be5793727d
Merge revision 5303:5311 from trunk to ogl-es
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5312 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-07-08 22:11:55 +00:00
nadro
b371f08d4a
- Merged rev 5258-5275 from trunk.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5286 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-17 22:17:43 +00:00
nadro
db0dac2f09
- Merged rev 5226-5244 from trunk.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5246 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-17 13:08:20 +00:00
nadro
e604a608eb
- Merged rev 5212-5219 from trunk.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5220 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-15 21:06:53 +00:00
nadro
ed78a4e3d1
- Merged rev 5202 from trunk.
...
- Fixed support for OSX.
Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
(If you need one of those features please use rev 5180)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5203 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-05 17:34:57 +00:00
nadro
ce6b7562ce
Merge revision 4977:5180 from trunk to ogl-es.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:32:01 +00:00
cutealien
07d70d8058
Merge revision 4824:4854 from trunk to ogl-es (catched up to trunk):
...
- Fix dependencies for example 30
- minor stuff
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4855 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 20:18:14 +00:00
cutealien
fbc4fa7da1
Merge revision 4711:4723 from branch to ogl-es:
...
- Fix c::b project obj folder names. Some static builds had used the shared folders (thx @ gerdb for reporting)
- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
- Fix a reorder warning.
- triangle3d constructor and line3d::getIntersectionWithSphere passing vectors now as const-ref instead of per value. Thx @nemo for reporting.
- Mention another fonttool to create Irrlicht fonts (by Armen).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4829 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 13:25:22 +00:00
hybrid
d5e6d04769
Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 17:27:12 +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
ed9566079e
Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge
...
git-svn-id: svn://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
293236417f
- Added VS2012 projects.
...
git-svn-id: svn://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
9262b0848f
Fix textureBlend function rename, which seems to have not been propagated from trunk.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4248 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-16 14:55:50 +00:00
hybrid
54fa54d446
More flexible driver choice
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3828 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-08 17:17:32 +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
7bae34bc61
Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
...
git-svn-id: svn://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
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
329f550b17
Merged revisions 2781:2892 from trunk.
...
git-svn-id: svn://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
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
30100db0a5
Merged all revisions up to 1976 from trunk into ogl-es branch.
...
git-svn-id: svn://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
cc7f977f60
Merged revisions 1726:1852 from trunk for the recent updates.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-27 23:52:13 +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
c55da82a0c
Merged revisions 1357:1366 from 1.4 branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1367 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-06-12 11:15:45 +00:00
hybrid
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
hybrid
99fd5bcc7c
Merged 1.4 branch, revisions 1106:1132.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1133 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-23 17:04:40 +00:00
engineer_apple
e1941642d6
-------------------------------------------
...
Changes in version 1.4 (... 13.11.2007)
- Fixed somed CQuake3ShaderSceneNode problems.
- Changed BurningsVideo internal Vertex Format. version changed to 0.39
- SceneManager:
Removed the seperate rendering states for quake3 Shader Scene Nodes.
Nodes are now solid or transparent. ( but still more states are needed )
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1048 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-13 14:37:07 +00:00
hybrid
f74f7586e2
Some more constification, but still not done. Now we have also SEvent in OnEvent as const ref, so most user apps will need some kind of upgrade for the new library version.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@964 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-16 23:41:55 +00:00
hybrid
dd982f9bed
Fixed paths.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@956 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-14 11:52:22 +00:00
hybrid
8b0f65e138
Small fixes. Missed a gl link.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@893 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-03 06:53:59 +00:00
hybrid
8e103273e3
Remove glu from Makefile.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@890 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-02 19:53:13 +00:00
hybrid
59ac643248
Added Spot lights for hardware drivers. Added per pixel fog support for OpenGL.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@838 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-15 03:39:44 +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