Zach Pomerantz
9d3abe5513
Release texs when models are cached
2016-03-31 17:02:40 -07:00
Zach Pomerantz
bc2901aa96
Fix model fetch delay
2016-03-31 12:54:23 -07:00
Andrew Meadows
74633ca8c8
Merge pull request #7522 from ZappoMan/optimizeFindZones
...
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-31 10:14:32 -07:00
Brad Hefta-Gaub
03f9a2b46f
more optimization in find best zone
2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
a7f93aa75c
Merge pull request #7519 from zzmp/fix/avatar-crash
...
Fix crash from updating/resetting avatar
2016-03-30 21:31:17 -07:00
Brad Hefta-Gaub
30cb62f1aa
Merge pull request #7517 from zzmp/fix/qml-renderer
...
Check for valid qml gl context creation
2016-03-30 19:52:03 -07:00
Brad Hefta-Gaub
b76f8509aa
Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones
2016-03-30 19:29:28 -07:00
Brad Hefta-Gaub
32a90b4709
Merge pull request #7521 from sethalves/fix-load-from-disk
...
fix script load from disk on windows
2016-03-30 19:29:11 -07:00
Brad Hefta-Gaub
28978c8adb
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3
Merge pull request #7491 from jherico/oculus_release
...
Update to latest Oculus SDK, add input device support
2016-03-30 17:42:32 -07:00
Seth Alves
651d2c8954
fix script load from disk on windows
2016-03-30 17:27:36 -07:00
Anthony Thibault
26b9469df5
Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix
...
Model: fix for crash when displaying collision mesh
2016-03-30 16:48:07 -07:00
Seth Alves
d9909fb7da
Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix
...
Model: Fix for equipped models not updating their matrices
2016-03-30 16:10:21 -07:00
samcake
c13e24438c
Merge pull request #7512 from zzmp/fix/light-buf-fmt
...
Correctly represent lighting framebuffer
2016-03-30 16:10:10 -07:00
Zach Pomerantz
6e0d6ee45b
Guard updateClusterMatrices from unloaded geo
2016-03-30 16:04:00 -07:00
Zach Pomerantz
00db095306
Guard against reset model geo on scene update
2016-03-30 15:49:45 -07:00
Brad Hefta-Gaub
84bbeef72b
Merge pull request #7511 from zzmp/guard/gl
...
Add GL checks
2016-03-30 15:47:16 -07:00
Brad Hefta-Gaub
eb61a4fee9
Merge pull request #7514 from zzmp/guard/model-tex
...
Add lock on model texs
2016-03-30 15:46:52 -07:00
Brad Hefta-Gaub
4a1e82892a
Merge pull request #7494 from sethalves/use-local-scripts
...
Use local scripts
2016-03-30 15:46:32 -07:00
Brad Hefta-Gaub
2381ab1cba
Merge pull request #7496 from kencooke/master
...
make self-reverb depend on wetDryMix
2016-03-30 15:44:20 -07:00
Zach Pomerantz
02273e067a
Add GL checks
2016-03-30 15:20:21 -07:00
Anthony J. Thibault
f6344c34e7
Model: Fix for equipped models not updating their matrices
2016-03-30 15:19:35 -07:00
Zach Pomerantz
530cb40528
Check for valid qml gl context creation
2016-03-30 15:11:54 -07:00
samcake
6213e0859d
Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned
2016-03-30 15:07:45 -07:00
Seth Alves
e8f26b675a
try to fix path to osx scripts
2016-03-30 15:04:29 -07:00
Zach Pomerantz
01db2be6b8
Avoid JSON parsing texs every render cycle
2016-03-30 14:48:57 -07:00
Anthony J. Thibault
103257493c
Model: fix for crash when displaying collision mesh.
...
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.
The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
2016-03-30 14:24:28 -07:00
samcake
f09593e106
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-30 14:16:16 -07:00
Zach Pomerantz
54b8a9278d
Guard model texs
2016-03-30 14:11:45 -07:00
Zach Pomerantz
e4f12c81e0
Get remap textures through getter
2016-03-30 14:11:36 -07:00
Seth Alves
065c238dd0
Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts
2016-03-30 14:02:21 -07:00
Seth Alves
62372415be
get this working on windows
2016-03-30 14:01:35 -07:00
Seth Alves
f5333423ff
remove unused variable
2016-03-30 13:43:06 -07:00
Seth Alves
bb43347599
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd
rewrite a bunch of path/url mangling code
2016-03-30 13:33:49 -07:00
Zach Pomerantz
1234514e8f
Correctly represent light fbo fmt
2016-03-30 11:22:44 -07:00
samcake
0ee1f039e9
Telling like it is...
2016-03-30 11:15:10 -07:00
Brad Hefta-Gaub
699b3a9dd7
Merge pull request #7499 from birarda/udt-fixes
...
fix an overflow in portable high resolution clock on windows
2016-03-30 10:54:00 -07:00
Brad Davis
f569cbf70e
Add debugging output, fix timewarp
2016-03-30 10:40:32 -07:00
Brad Davis
d056c41e25
Update to latest Oculus SDK, add input device support
2016-03-30 10:40:28 -07:00
samcake
11b6952eff
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-30 09:49:17 -07:00
samcake
b492c4b52c
DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region
2016-03-30 09:32:40 -07:00
Brad Hefta-Gaub
d99dcf5450
Merge pull request #7487 from hyperlogic/tony/animated-culling
...
Improved render bounding boxes for animated models
2016-03-30 09:27:43 -07:00
Brad Hefta-Gaub
6fdedb8f34
Merge pull request #7508 from howard-stearns/import-export-parents
...
Make export/import and copy/paste be parent/child-clean.
2016-03-30 09:06:33 -07:00
Brad Hefta-Gaub
c64b2bb236
Merge pull request #7495 from Atlante45/fix/audio-client
...
Fix crash in Audio Client
2016-03-30 09:00:07 -07:00
Brad Hefta-Gaub
32308c7810
Merge pull request #7501 from zzmp/fix/parse-tex
...
Respond to error from free in texture parsing
2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub
15a042cef1
Merge pull request #7506 from zzmp/fix/gl-reset-pipelines
...
Fix ordering of GL backend state reset commands to Field key
2016-03-29 23:29:14 -07:00
Brad Hefta-Gaub
92ddf9d7ac
Merge pull request #7507 from AndrewMeadows/broken-time-machine
...
fix "deadlock" when setting clock backwards
2016-03-29 19:38:45 -07:00
Seth Alves
bd5757d586
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-29 18:33:22 -07:00
Seth Alves
7c0bb72aff
started on making ~ mean the application directory in script paths
2016-03-29 18:32:46 -07:00
