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
861d54842b
Merging r6140 through r6144 from trunk to ogl-es branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6145 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-11-04 01:07:18 +01: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
b42fbc5ab1
Merging r5975 through r6036 from trunk to ogl-es branch.
...
GLES drivers adapted, but only did make compile-tests.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-12 14:24:32 +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
1e6c870ba2
Merging r5892 through r5916 from trunk to ogl-es branch
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5917 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:46:26 +01:00
cutealien
4d9c660504
Merging r5812 through r5842 from trunk to ogl-es branch
...
Also added some comments to gl-es drivers about missing polygon offset code.
The merges had some changes for that in the OpenGL driver, but both es drivers have no code at all about this.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5889 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:45:40 +01:00
cutealien
990d475fbb
Merging r5686 through r5778 from trunk to ogl-es branch (part 2)
...
(was in wrong folder in last commit, so only source folder got checked in).
Also adapt ES1 and ES2 driver to remove texture from OGL texture cache
(that was fixed in GL driver in the parts that got merged).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5780 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:30:26 +00:00
cutealien
202977fe38
Merging r5679 through r5685 from trunk to ogl-es branch
...
- Fix several problems with SMaterial serialization.
- SMaterial.ZWriteFineControl only using 1 bit now.
- Remove compile warnings.
- Switch Irrlicht to 8 textures per Material as default by increasing value of _IRR_MATERIAL_MAX_TEXTURES_.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5686 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 23:15:56 +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
cutealien
2a7094889a
Merge revision 5277:5302 from trunk to ogl-es
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5303 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-05-27 19:47:59 +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
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
hybrid
3f0c8e3a3b
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: svn://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
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
15c3dc795a
Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +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
7ae68647e9
Next large merge from trunk, revisions 3729-3830
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 07:08:47 +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
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
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