Seth Alves
028be0f830
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size
2016-11-17 14:14:08 -08:00
Seth Alves
1eb17b9786
fix bug that caused polyvox rendering to mishandle its gpu buffers
2016-11-17 14:11:09 -08:00
Brad Hefta-Gaub
36d8e6d64d
Merge pull request #9074 from hyperlogic/bug-fix/web-entity-limit-fix
...
Bug fix for blank webEntities during long sessions
2016-11-17 13:02:18 -08:00
Brad Hefta-Gaub
91f90400a9
Merge pull request #9088 from sethalves/fix-polyvox-memory-leak
...
fix polyvox memory leak
2016-11-17 12:23:13 -08:00
Seth Alves
1f9598f295
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak
2016-11-17 08:44:52 -08:00
Brad Hefta-Gaub
22303d8e5b
Merge pull request #9086 from jherico/disable_glow_line
...
Disable glow line temporarily while fixing implementation
2016-11-16 18:16:55 -08:00
Brad Hefta-Gaub
b0c87e9134
Merge pull request #9080 from jherico/buffer_leak
...
Fix buffer leak in line entity
2016-11-16 18:10:44 -08:00
Seth Alves
697369dece
avoid crash on startup
2016-11-16 16:11:17 -08:00
Seth Alves
e83922f9e4
Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak
2016-11-16 15:39:57 -08:00
Seth Alves
b9326affa3
Merge pull request #9087 from druiz17/parentID
...
Fix - When avatar's parent is deleted, avatar does not move
2016-11-16 15:30:52 -08:00
Seth Alves
a14ff22df3
update render-land bounds when polyvox moves
2016-11-16 15:10:43 -08:00
Dante Ruiz
66ff81f450
Another function name change
2016-11-16 22:32:15 +00:00
Seth Alves
d097fa7982
fix polyvox memory leak
2016-11-16 14:10:50 -08:00
Dante Ruiz
9c4ae9df5a
function name change
2016-11-16 22:09:22 +00:00
Chris Collins
44b2b090df
Merge pull request #9010 from samcake/orange
...
Improve Input Stage Format switching in GL45Backend
2016-11-16 14:00:17 -08:00
Dante Ruiz
ff7c11d48c
Fixed avatar parent delete issue
2016-11-16 13:03:34 -08:00
Brad Davis
fa841620ab
Disable glow line temporarily while fixing implementation
2016-11-16 12:50:47 -08:00
Ryan Huffman
75eafbb349
Add docs to Paths
2016-11-16 12:11:32 -08:00
Ryan Huffman
179eed5d11
Add Vec2 and Vec3 defiitions to jsdoc
2016-11-16 11:56:42 -08:00
Ryan Huffman
7e9df928f4
Add jsdoc comments to Menu
2016-11-16 10:49:50 -08:00
samcake
b74a1af5ba
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-11-16 10:48:30 -08:00
Anthony J. Thibault
066ddad25a
Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20.
2016-11-16 09:39:55 -08:00
Brad Davis
fda2cde006
Fix buffer leak in line entity
2016-11-15 14:16:54 -08:00
Brad Hefta-Gaub
84573d373b
Merge pull request #9070 from huffman/fix/docs
...
Add jsdoc to Camera
2016-11-15 13:46:16 -08:00
samcake
80240123b9
Merging with upstream
2016-11-15 10:01:06 -08:00
Seth Alves
d73fc1681c
Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race
2016-11-15 09:11:06 -08:00
samcake
9267f4eaaf
Fix the merge with upstream and the new stereo drawcall, fix the timer reporting on mac and fix the openGLChecker quicking on mac
2016-11-15 00:40:39 -08:00
Brad Hefta-Gaub
5dd33c8dce
fix for mac min openGL version
2016-11-14 20:58:09 -08:00
Brad Hefta-Gaub
86430e4121
Merge pull request #8960 from samcake/red-backup-many-stereo-paths
...
Introduce Instanced Stereo Drawcall
2016-11-14 18:30:42 -08:00
Anthony J. Thibault
eb401c125a
Bug fix for blank webEntities during long sessions
...
In prolonged sessions _currentWebCount would reach MAX_CONCURRENT_WEB_VIEWS and prevent new webEntities from being properly created and initialized.
The _currentWebCount inside of RenderableWebEntityItem would become inflated when buildWebSurface is called without a currentContext.
The early return did not properly take this into account. Instead we move the increment after the early return and right before the _webSurface is actually created.
2016-11-14 18:01:47 -08:00
Ryan Huffman
5fd1ae64b0
Begin adding entities jsdoc
2016-11-14 16:54:55 -08:00
samcake
07e8238b0e
REmove uneeded macros
2016-11-14 12:09:44 -08:00
samcake
f3e1ed4b88
Merging and cleaning up the code path for the 2 flavors of gl
2016-11-14 11:57:00 -08:00
samcake
b888af15e4
Fix merge
2016-11-14 11:15:27 -08:00
Seth Alves
43b73f0380
Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race
2016-11-14 10:00:46 -08:00
Chris Collins
e599e13809
Merge pull request #9063 from sethalves/fix-some-crash-on-exits
...
Fix some crash on exits
2016-11-14 09:20:03 -08:00
Brad Hefta-Gaub
cc6d68ffdf
Merge pull request #8973 from humbletim/fix-batched-script-keys
...
Use matching hash keys for input/output when batch-loading scripts.
2016-11-14 08:13:32 -08:00
Brad Hefta-Gaub
dd23fcc0c9
Merge pull request #9008 from hyperlogic/feature/debug-draw-marker-color
...
Add color support to debug draw marker rendering
2016-11-14 08:12:57 -08:00
Seth Alves
92e24e6ded
code review
2016-11-13 16:09:57 -08:00
Seth Alves
9868ddd602
global/static QStrings in plugins appear to cause crashes during shutdown
2016-11-13 10:22:14 -08:00
Seth Alves
804f25740d
these qDebugs happen too late and cause a crash
2016-11-13 10:21:27 -08:00
Seth Alves
5133ce0548
print a debug message when skipping evaluation of a previously included url
2016-11-12 10:50:21 -08:00
Seth Alves
55d894bd6f
Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race
2016-11-12 07:38:07 -08:00
Chris Collins
0876dbc809
Merge pull request #9050 from sethalves/last-edited-by
...
lastEditedBy property for entities
2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9
Merge pull request #9052 from davidkelly/dk/2226
...
Add ability to mute user
2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044
Merge pull request #9056 from Atlante45/networking
...
Protect against empty packet lists
2016-11-11 15:28:46 -08:00
Clément Brisset
e38da75115
Merge pull request #9053 from huffman/feat/whitelist-ac-ip
...
Add AC ip address whitelist to domain server
2016-11-11 15:03:21 -08:00
Atlante45
a38846aeed
Protect against empty packet lists
2016-11-11 14:32:52 -08:00
Chris Collins
b9b90cc646
Merge pull request #9047 from jherico/stutter
...
Add stutter tracking
2016-11-11 11:39:00 -08:00
Ryan Huffman
e1466c0d47
Fix NULL -> nullptr
2016-11-11 10:21:58 -08:00
