Commit graph

46210 commits

Author SHA1 Message Date
Brad Davis
0213dd0359 Don't bottleneck the render-perf tool on new frame creation 2016-08-26 19:08:50 -07:00
Brad Davis
e4334be0cf Use synchronous logging (may impact performance when debugging is enabled) 2016-08-26 19:08:15 -07:00
Brad Davis
1652965ac2 Destroy contexts properly 2016-08-26 19:07:44 -07:00
Brad Davis
02c79d9714 Fix the OpenVR issues on AMD 2016-08-26 19:05:29 -07:00
Brad Davis
95b5a23c7a Properly destroy GL programs 2016-08-26 19:04:46 -07:00
Brad Davis
7ffa212006 Don't use textures that are in the transfer pipeline 2016-08-26 19:04:24 -07:00
James B. Pollack
44d102d723 Merge pull request #8529 from imgntn/edit_fix
Fix some edit.js bugs
2016-08-26 15:43:14 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color
fix skybox default
2016-08-26 15:14:44 -07:00
Brad Hefta-Gaub
ecb43a9589 Merge pull request #8523 from ZappoMan/fixAgentAvatarAudio
include the codec name in the agent avatar audio stream
2016-08-26 12:42:20 -07:00
James B. Pollack
53a2281918 better 2016-08-26 11:57:15 -07:00
James B. Pollack
f6bd04780d add a print to catch errors 2016-08-26 11:56:40 -07:00
Brad Hefta-Gaub
6e26916b65 Merge branch 'master' of https://github.com/highfidelity/hifi into fixAgentAvatarAudio 2016-08-26 10:57:27 -07:00
James B. Pollack
4c63ad1ac8 code cleanup 2016-08-26 10:19:31 -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
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
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
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
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
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
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