Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 22:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46195 commits 71 branches 56 tags 1.2 GiB
Commit graph

46195 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
2a12f2feae marketplaces html 2016-08-29 17:27:39 -07:00
James B. Pollack
95c627aa71 dev 2016-08-29 14:24:36 -07:00
James B. Pollack
264176dac6 css 2016-08-26 14:21:32 -07:00
James B. Pollack
382cbd0a73 start 2016-08-26 14:16:37 -07:00
Brad Hefta-Gaub
9801ff075a Merge pull request #8433 from samcake/hdr 
Fix Screen Space ambient occlusion which was broken since a while
 2016-08-25 16:57:24 -07:00
Brad Hefta-Gaub
10c465f591 Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering 
Improved web entity rendering
 2016-08-25 16:49:00 -07:00
samcake
8cc65ea965 Adrressing review issues 2016-08-25 16:31:42 -07:00
samcake
09a70740a8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 15:21:41 -07:00
Brad Hefta-Gaub
ac291a398d Merge pull request #8329 from AndrewMeadows/render-collision-geometry 
Render collision geometry
 2016-08-25 15:15:28 -07:00
Andrew Meadows
2c8ab9b2b8 Merge pull request #8497 from hyperlogic/feature/improve-ik-quality 
Raised max iterations for IK to 16 from 4
 2016-08-25 15:06:11 -07:00
samcake
9669234f9c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 12:36:01 -07:00
Anthony J. Thibault
e82f6a90af Improved web entity rendering 
* fading now works properly
* web browsers are now fully opaque.
 2016-08-25 11:04:23 -07:00
Anthony Thibault
8d5a896ccf Merge pull request #8524 from AndrewMeadows/fix-default-scripts 
fix typo
 2016-08-25 10:28:27 -07:00
Andrew Meadows
da387a958a fix typo 2016-08-25 10:26:05 -07:00
Brad Hefta-Gaub
b5adf1cf4c Merge pull request #8515 from AndrewMeadows/include-default-scripts 
include default scripts instead of loading them
 2016-08-25 09:41:32 -07:00
Andrew Meadows
a0911d2b9d add local scope wrappers to new default scripts 2016-08-25 09:04:06 -07:00
Andrew Meadows
fefe5e30ec don't use globals and remove double definitions 2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Andrew Meadows
3690b38c65 fix warnings found by eslint in defaultScripts.js 2016-08-25 08:56:22 -07:00
Andrew Meadows
13a12a2a13 Script.include() default scripts not Script.load() 2016-08-25 08:56:22 -07:00
Andrew Meadows
d7bb555987 make menu wording more correct 2016-08-25 08:53:08 -07:00
Andrew Meadows
c337cc92e5 remove crufty comment 2016-08-25 08:51:53 -07:00
Andrew Meadows
b95cb566cd fix collision mesh for non-trivial registration 2016-08-24 22:26:56 -07:00
Andrew Meadows
502146b171 distribute reg offset to compound children 2016-08-24 22:26:56 -07:00
Andrew Meadows
19cd4648ad scale collision render mesh correctly 2016-08-24 22:26:56 -07:00
Andrew Meadows
acaa77b75a remove cruft from debug efforts 2016-08-24 22:26:56 -07:00
Andrew Meadows
e4317adcf1 remove cruft 2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114 remove cruft and fix typo in rebase 2016-08-24 22:26:56 -07:00
Andrew Meadows
d801b3521c fix warnings on windows 2016-08-24 22:26:56 -07:00
Andrew Meadows
e554712259 remove entities-renderer dependency on physics lib 2016-08-24 22:26:56 -07:00
Andrew Meadows
48c73acae0 restore privacy of GeometryResourceWatcher methods 2016-08-24 22:26:56 -07:00
Andrew Meadows
269b7ae7c1 remove commented out cruft 2016-08-24 22:26:56 -07:00
Andrew Meadows
83426fd5a8 handle transitions to/from STATIC_MESH 
when rendering collision geometry
 2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec create collision render geometry only when needed 2016-08-24 22:26:56 -07:00
Andrew Meadows
eb65be5478 remove cruft argument from allocateModel() 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
ef597265d7 remove unimplemented declaration 2016-08-24 22:26:56 -07:00
Andrew Meadows
fe4198530f don't render raw compound collision geometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
191b7f0f39 variable namechange: Hull --> Mesh 2016-08-24 22:26:56 -07:00
Andrew Meadows
329c5432ed _showCollisionHull --> _showCollisionGeometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
1f84ef3053 compute normals for collision mesh geometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
481d6990a3 trigger collision shape render mesh creation 2016-08-24 22:26:56 -07:00
Andrew Meadows
3b772d2fe6 fallback to SIMPLE_COMPOUND when can't do COMPOUND 2016-08-24 22:26:56 -07:00
Andrew Meadows
26f5d3cfaa fix render geometry for collision shapes 2016-08-24 22:26:56 -07:00
Andrew Meadows
daff897fc4 const shapes, and use *MotionState::setShape() 2016-08-24 22:26:56 -07:00
Andrew Meadows
25fb7aacad ShapeManager hands out const shape pointers 2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba cleanup logic around creating RenderItems 2016-08-24 22:26:56 -07:00
Andrew Meadows
d8fa0d1dd1 segregateMeshGroups() --> createRenderItems() 2016-08-24 22:25:45 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Andrew Meadows
499150bbed finish hook alert for new entity collision shape 2016-08-24 22:25:45 -07:00