Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:33:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46395 commits 25 branches 0 tags 1.1 GiB
Commit graph

46395 commits

This branch
This branch
All branches
Author SHA1 Message Date
elisa-lj11
d16ef521f4 fixed merge conflicts from Howard's webview fix 2016-08-30 15:33:59 -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
elisa-lj11
aceddb0cf8 merge with james repo 2016-08-30 15:07:01 -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
elisa-lj11
bbb80f4a55 hello again 2016-08-30 14:24:00 -07:00
James B. Pollack
e4bdc2e86c cleanup 2016-08-30 14:17:27 -07:00
elisa-lj11
074f9e0688 test to merge to status_bar branch 2016-08-30 14:15:27 -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
James B. Pollack
a6a834f2c7 remember and work on toggle 2016-08-30 13:58:28 -07:00
samcake
c553e5f2fe fine tune the scripts for proper presentation of the timing values 2016-08-30 13:57:47 -07:00
samcake
b18c0d5325 Revert enabling sRGB for GLcontext pixel format 2016-08-30 12:44:35 -07:00
samcake
ba9a6b107f Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-08-30 12:24:52 -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
elisa-lj11
8b62c0e712 switching over to a fork 2016-08-30 11:49:49 -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
elisa-lj11
37cc50a14a Merge remote-tracking branch 'highfidelity/master' into marketplaces_html 2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b Merge remote-tracking branch 'origin' into marketplaces_html 2016-08-30 10:42:56 -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
elisa-lj11
6bd41d0dd5 added status bar to marketplace 2016-08-29 18:43:52 -07:00
elisa-lj11
f2e61aa504 added status bar to marketplace 2016-08-29 18:43:32 -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
James B. Pollack
2b2b2ecbac caps 2016-08-29 17:44:33 -07:00
James B. Pollack
d3aad53e0e cleanup 2016-08-29 17:43:32 -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
James B. Pollack
2a12f2feae marketplaces html 2016-08-29 17:27:39 -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
James B. Pollack
95c627aa71 dev 2016-08-29 14:24:36 -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