BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity
36 Commits 5 Branches 14 Tags 22 MiB
2d63fdba3d
Commit Graph

36 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cutealien
2d63fdba3d 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-04-15 18:51:09 +00:00
cutealien
67469c8899 Merging r6275 through r6286 from trunk to ogl-es branch 
- Fixing warnings
- Updating bzip2 and zlib libraries


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475
 2022-01-07 16:30:25 +00:00
cutealien
6d96663c9a Merging r6256 through r6273 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6274 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-12-12 14:06:53 +00:00
cutealien
6025242ee9 Fix compiling Android and iOS 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6258 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-08-27 19:26:01 +00:00
cutealien
1efc93d766 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-27 19:20:42 +00:00
cutealien
ee3579015b Merging r6250 through r6254 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-08-27 19:14:39 +00:00
cutealien
21302d038a 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-26 21:57:27 +00:00
cutealien
08a2846a93 Merging r6194 from trunk to ogl-es branch. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6195 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-02-21 19:09:14 +00:00
cutealien
3a54e8d6b8 Merging r6186 through r6192 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6193 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-02-21 16:37:56 +00:00
cutealien
1f7c1830cb Whitespace fixes. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6186 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-01-06 14:59:13 +00:00
cutealien
838ecd6bf8 Merging r6181 through r6184 from trunk to ogl-es branch 
- Changes to touch-input handling on X11


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6185 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-01-06 14:52:49 +00:00
cutealien
f1a58b706c Fix bug introduced in last merge from svn trunk 
struct STouchInput was in there twice.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6183 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-12-30 19:08:13 +00:00
cutealien
d07057959e Fix compiling last commit (missing a letter). 
Thx @Maksym Hamarnyk


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6182 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-12-30 18:59:39 +00:00
cutealien
9274951a08 Enable _IRR_COMPILE_WITH_OGLES1_ on IOS. 
Should be enabled according to Maksym Hamarnyk


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6181 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-12-30 18:50:50 +00:00
cutealien
a9f7c2abc9 Merging r6173 through r6179 from trunk to ogl-es branch 
- Adding optional support for touch input in X11


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6180 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-12-30 18:39:20 +00:00
cutealien
1e6fe54cf5 Merging r6173 through r6176 from trunk to ogl-es branch 
Also adding -DPNG_ARM_NEON_OPT=0 to other places in Makefile as we don't have arm optimization for neon currently in our png lib.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6177 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-12-22 21:30:35 +00:00
cutealien
124cc0be1e Make it possible again to enable ES1 on Linux. 
Seems Debian 11 adds it back.
Thanks @TheBrokenRail for patch.
Hidden in comments for patch #322: https://sourceforge.net/p/irrlicht/patches/322


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6175 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-12-22 21:14:45 +00:00
cutealien
fa0b1cb509 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-19 15:03:11 +00:00
cutealien
01920bf808 Fix compiler error caused by merge. 
Thanks @ Maksym for report.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6152 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-11-04 23:32:24 +00:00
cutealien
6d16303add Remove headers from source-file sections in XCode project file. 
Thanks @ Maksym for the patch.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6151 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-11-03 22:00:19 +00:00
cutealien
64725ca8a6 Another OSX build file patch. 
It should work now.
Thanks @maksym for help.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6150 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-11-03 21:54:02 +00:00
cutealien
55f109762d Another fix for OSX build file. 
And a bit unifying it with trunk.
Likely one more bug in there... so another patch coming.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6149 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-11-03 21:29:57 +00:00
cutealien
9d3cc25f75 Fix some more problems with OSX build file. 
Probably will need one more patch...


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6148 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-11-03 21:14:42 +00:00
cutealien
caf7e44098 Trying to merge build patch from Maksym Hamarnyk to build OS X 
See a56263fbc1
Will need further testing.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6146 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-11-02 22:41:39 +00:00
cutealien
8557a1f7e6 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-02 22:26:23 +00:00
cutealien
8b9947f9f6 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-09-29 20:22:28 +00:00
cutealien
048aa500b9 Merging r6122 through r6127 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6128 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-20 15:26:29 +00:00
cutealien
eaefca2cd1 Merging r6120 through r6121 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6122 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-14 20:52:53 +00:00
cutealien
a471c1ee78 Merging r6117 through r6119 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6120 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-13 14:59:16 +00:00
cutealien
87c0b1fb93 Add missing parameters in CEAGLManager::activateContext. 
Thanks to Maksym Hamarnyk for the patch.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6118 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-13 14:49:38 +00:00
cutealien
562c0fb6f1 Merging r6107 through r6116 from trunk to ogl-es branch 
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-12 20:47:40 +00:00
cutealien
20b3d56987 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-12 20:41:49 +00:00
cutealien
084e0e669a Merging r6073 through r6074 from trunk to ogl-es branch. 
The support for UINT shader constants added in this is just returning warnings in GLES drivers as this would need ES 3.0


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6115 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-11 20:27:29 +00:00
cutealien
cb62c685de Merging r6039 through r6072 from trunk to ogl-es branch. 
Note: Not yet caught up with trunk.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6114 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-10 22:19:09 +00:00
cutealien
3e26f3d7a9 Fix problem with glGenerateMipMap in GLES2 
Thanks @wolfgang for report and patch: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=52625


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6112 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-10 20:57:08 +00:00
cutealien
2ae2a551a6 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-01-03 19:05:16 +00:00