Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 18:51:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46271 commits 73 branches 59 tags 1.2 GiB
Commit graph

46271 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
4c63ad1ac8 code cleanup 2016-08-26 10:19:31 -07:00
Seth Alves
9884426ad8 replace debugging aborts with asserts 2016-08-26 06:13:33 -07:00
Seth Alves
acb04a0bc9 don't add children of controller joints until we know our avatar ID 2016-08-25 19:09:10 -07:00
Seth Alves
174a95a005 do some hokey pokey to avoid jitter of held entities while walking 2016-08-25 18:49:47 -07:00
Zach Pomerantz
996346980d clear the skybox between scenes 2016-08-25 18:08:22 -07:00
Zach Pomerantz
5e82093e69 set skybox clear color to empty color 2016-08-25 18:08:03 -07:00
Seth Alves
3b278adba3 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-25 17:28:18 -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
Seth Alves
dfae5b64bd attempt to avoid jitter of held entity while walking 2016-08-25 16:42:40 -07:00
samcake
8cc65ea965 Adrressing review issues 2016-08-25 16:31:42 -07:00
James B. Pollack
ee190db5eb some comments 2016-08-25 16:27:58 -07:00
James B. Pollack
9be073cc12 handle some more cases 2016-08-25 16:03:12 -07:00
Seth Alves
232917fcf8 when processing AvatarActionHold for another's avatar, use their hand-controller joint information 2016-08-25 16:02:58 -07:00
samcake
09a70740a8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 15:21:41 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -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
Seth Alves
948b4b7a15 in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity 2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde grab-point sphere is a child of controller joint, so it doesn't jitter 2016-08-25 13:31:07 -07:00
Zach Pomerantz
24162f0f3d set skybox default color to empty color 2016-08-25 12:37:23 -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
Seth Alves
39f52b3682 start on faux avatar joint that represent hand controllers 2016-08-25 10:58:23 -07:00
Seth Alves
7b1db2c8a9 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-25 10:41:53 -07:00
Seth Alves
3750488b8d Merge branch 'grab-point-sphere' of github.com:sethalves/hifi into joints-for-controllers 2016-08-25 10:41:41 -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
376756d413 include the codec name in the agent avatar audio stream 2016-08-25 09:58:36 -07:00
Seth Alves
cab30651d0 cleanups 2016-08-25 09:47:14 -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