Stephen Birarda
f1ed7a2e78
initial changes needed for android interface cmake
2016-08-31 10:53:29 -07:00
Zach Pomerantz
441005bba0
use existing defaults for zoneless keylight
2016-08-31 09:47:53 -07:00
Ryan Downe Karpf
6c853ec77d
Merge pull request #8538 from AndrewMeadows/workaround-resolvePath
...
workaround for Script.resolvePath() bug
2016-08-31 08:59:14 -07:00
Andrew Meadows
12e6920a8d
fix syntax error
2016-08-31 08:15:00 -07:00
Zach Pomerantz
372c52fea5
restore default ambient skybox
2016-08-30 17:07:34 -07:00
samcake
47aaed491d
Merging with Blue
2016-08-30 17:06:29 -07:00
Zach Pomerantz
0e9ff04c4c
fix layered zone applications
2016-08-30 17:00:02 -07:00
Zach Pomerantz
bb39cdafda
fix applyPartial for last zone
2016-08-30 17:00:02 -07:00
Zach Pomerantz
abde84b068
fix async skybox tex loading
2016-08-30 17:00:02 -07:00
Brad Davis
3ca01a1e4b
Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler
...
restore onNewViewRequested
2016-08-30 15:21:27 -07:00
samcake
d8c883b0fb
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-30 15:14:22 -07:00
samcake
93aec28c7b
Less warning
2016-08-30 14:54:58 -07:00
samcake
af68a2550e
Remve dead code
2016-08-30 14:53:37 -07:00
howard-stearns
8824507523
new smaller WebView.qml
2016-08-30 14:37:08 -07:00
samcake
2a5ee5d6b1
Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots
2016-08-30 14:28:52 -07:00
howard-stearns
564769f7d3
move WebView.qml to baseWebView.qml
2016-08-30 14:07:34 -07:00
howard-stearns
232ac74b26
back to master version
2016-08-30 14:06:20 -07:00
samcake
c553e5f2fe
fine tune the scripts for proper presentation of the timing values
2016-08-30 13:57:47 -07:00
samcake
faef8a9930
Adding the timing for GPU support with a simpelr JobConfig
2016-08-30 12:22:21 -07:00
howard-stearns
c5b998a2a8
use new hook in marketplace code
2016-08-30 12:18:03 -07:00
Chris Collins
188f5d5ace
Merge pull request #8545 from ZappoMan/fbx2016
...
support for fbx2016 format
2016-08-30 11:36:25 -07:00
Brad Davis
eb0a8db0af
Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam
...
When trigger is pulled, snap search beam to correct length instead of animating
2016-08-30 11:13:58 -07:00
Stephen Birarda
74fac8c7c9
Merge pull request #8512 from birarda/shareable-address
...
add shareable address from default name, leverage for steam join/invite
2016-08-30 09:35:24 -07:00
Brad Hefta-Gaub
7397b884e7
support for fbx2016 format
2016-08-30 09:07:39 -07:00
Seth Alves
314b7617ac
Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events
...
Bug fix for click events received by entity scripts
2016-08-29 17:57:56 -07:00
samcake
7dc99e86b9
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-29 17:54:49 -07:00
samcake
3755a3fc32
Add batch timing information vs gpu
2016-08-29 17:54:17 -07:00
Andrew Meadows
2d8bb54b93
fix typo
2016-08-29 17:37:24 -07:00
James B. Pollack
ed2ebd122b
Merge pull request #8542 from imgntn/nobackspace
...
No more delete with backspace in edit.js
2016-08-29 17:31:44 -07:00
Andrew Meadows
99acc9045d
disable defaultScripts.js debugging by default
2016-08-29 17:15:01 -07:00
Andrew Meadows
b50d24fb00
don't use Script.resolvePath() in local functions
2016-08-29 17:11:29 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
howard-stearns
a48aced7bd
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-WebView-tab-handler
2016-08-29 15:43:42 -07:00
Stephen Birarda
a8272712bb
move forced client selection to apply to all installs
2016-08-29 15:40:45 -07:00
howard-stearns
11f00ed46c
add a hook so that clients can gain access to the new component, window,
...
and request
2016-08-29 14:44:48 -07:00
James B. Pollack
cceae50b90
no more delete with backspace
2016-08-29 14:28:05 -07:00
Zach Pomerantz
f30308b68c
add deeply nested skyboxes
2016-08-29 13:57:14 -07:00
Zach Pomerantz
1971063b9a
clean up Procedural::parseShader
2016-08-29 13:56:39 -07:00
howard-stearns
6272db42da
restore onNewViewRequested
2016-08-29 13:53:08 -07:00
Zach Pomerantz
1e7c00c0c8
fix Skybox::clear to set _empty
2016-08-29 13:40:56 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
Stephen Birarda
20777bd19a
force default selection of client on install
2016-08-29 13:13:35 -07:00
Stephen Birarda
87ecc65dce
set component requirement in cpack add componeent command
2016-08-29 13:13:35 -07:00
Stephen Birarda
fab2568624
always remove the resources dir, make client required
2016-08-29 13:13:35 -07:00
Stephen Birarda
0e4fb51d09
force cleanup section to be first
2016-08-29 13:13:35 -07:00
Stephen Birarda
c4ec02c4bf
add removal of resources folder during install process
2016-08-29 13:13:35 -07:00
Brad Davis
3890197efe
Merge pull request #8535 from zzmp/fix/skybox-black
...
allow black skybox
2016-08-29 13:11:46 -07:00
Andrew Meadows
b1d472c9ba
workaround for Script.resolvePath() bug
2016-08-29 12:28:59 -07:00
Anthony J. Thibault
dcd91d4398
removed debug flag
2016-08-29 12:04:48 -07:00
