samcake
|
c13e24438c
|
Merge pull request #7512 from zzmp/fix/light-buf-fmt
Correctly represent lighting framebuffer
|
2016-03-30 16:10:10 -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 |
|
Brad Hefta-Gaub
|
e31546e172
|
Merge pull request #7509 from samcake/orange
Avoid the spot lights flickering in Home
|
2016-03-30 15:44:08 -07:00 |
|
Zach Pomerantz
|
02273e067a
|
Add GL checks
|
2016-03-30 15:20:21 -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
|
92981a6660
|
Merge pull request #7503 from sethalves/lock-tree-before-moving-av-children
lock entity-tree before moving entity-children of avatars
|
2016-03-30 15:05:38 -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 |
|
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 |
|
samcake
|
3cf2eeb4d5
|
IMproving the perfplot qml and adding 2 more info
|
2016-03-30 13:58:32 -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 |
|
Brad Hefta-Gaub
|
b72c28854c
|
Merge pull request #7510 from howard-stearns/end-audio-menu-pain
End audio devicer selection menu pain
|
2016-03-30 11:33:10 -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 |
|
howard-stearns
|
37e6fce30b
|
Disconnect menuItemEvent before setIsOptionChecked, and then reconnect.
|
2016-03-30 10:48:54 -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 |
|
Brad Hefta-Gaub
|
d63728bd55
|
Merge pull request #7502 from huffman/fix-asset-client
Fix bug where a pending asset request could receive a pending message after deletion
|
2016-03-29 18:15:03 -07:00 |
|
Brad Hefta-Gaub
|
8a47c5a35f
|
Merge pull request #7504 from zzmp/log/building-web-surface
Log OffscreenQml lifetime
|
2016-03-29 18:11:16 -07:00 |
|
samcake
|
be27eaff24
|
Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights
|
2016-03-29 17:51:24 -07:00 |
|
howard-stearns
|
5381be6902
|
Whitespace
|
2016-03-29 17:06:19 -07:00 |
|
howard-stearns
|
86a77d4f55
|
Remove unused/non-existent include.
|
2016-03-29 16:55:17 -07:00 |
|
howard-stearns
|
eef9de4d4f
|
Remove obsolete remapIDs.
|
2016-03-29 16:28:02 -07:00 |
|
howard-stearns
|
4ebf816166
|
cleanup
|
2016-03-29 16:17:19 -07:00 |
|
Zach Pomerantz
|
6ae03fe72e
|
Sync ordering of gl fields/reset commands
|
2016-03-29 15:52:29 -07:00 |
|
Seth Alves
|
537c6fa3c6
|
fix indentation
|
2016-03-29 15:39:42 -07:00 |
|
Seth Alves
|
2ad02941e4
|
lowercase filenames/paths before they go into _treeNodes to avoid scripts being unstoppable
|
2016-03-29 15:38:11 -07:00 |
|
Zach Pomerantz
|
ad9027f9d6
|
Log OffscreenQml lifetime
|
2016-03-29 15:26:22 -07:00 |
|
Brad Hefta-Gaub
|
a9995a8790
|
Merge pull request #7500 from zzmp/fix/queue-model-geo-get
Update model URL on render thread
|
2016-03-29 15:21:46 -07:00 |
|
howard-stearns
|
bcb729eac2
|
Abstract out globalizeProperties.
|
2016-03-29 15:21:06 -07:00 |
|
Seth Alves
|
9d8e01f2a5
|
lock entity-tree before moving entity-children of avatars
|
2016-03-29 15:01:23 -07:00 |
|
Zach Pomerantz
|
6c7b6cd62e
|
Return parsed tex directly as variant
|
2016-03-29 14:16:22 -07:00 |
|