Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46263 commits 71 branches 56 tags 1.2 GiB
Commit graph

46263 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
elisa-lj11
aceddb0cf8 merge with james repo 2016-08-30 15:07:01 -07:00
howard-stearns
8824507523 new smaller WebView.qml 2016-08-30 14:37:08 -07:00
elisa-lj11
bbb80f4a55 hello again 2016-08-30 14:24:00 -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
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
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
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
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
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
howard-stearns
6272db42da restore onNewViewRequested 2016-08-29 13:53:08 -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
Brad Davis
3890197efe Merge pull request #8535 from zzmp/fix/skybox-black 
allow black skybox
 2016-08-29 13:11:46 -07:00
Howard Stearns
a1ae9eebf2 Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning 
Silence address bar log warning
 2016-08-29 11:48:43 -07:00
Brad Davis
179e3565ef More render-perf tweaks 2016-08-29 11:22:56 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Zach Pomerantz
5f699072d9 allow black skybox 2016-08-29 10:58:09 -07:00
howard-stearns
01af8899bf silence address bar dialog qml warning 2016-08-29 10:47:22 -07:00
Brad Davis
c3e345150b Merge pull request #8531 from jherico/gl_fixes 
(AMD) OpenGL Fixes
 2016-08-29 09:59:22 -07:00
howard-stearns
3aa387ddb9 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-08-29 09:44:06 -07:00
Brad Davis
92fa1d5776 Use stream draw for object position updates 2016-08-27 15:08:38 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Davis
0213dd0359 Don't bottleneck the render-perf tool on new frame creation 2016-08-26 19:08:50 -07:00
Brad Davis
e4334be0cf Use synchronous logging (may impact performance when debugging is enabled) 2016-08-26 19:08:15 -07:00
Brad Davis
1652965ac2 Destroy contexts properly 2016-08-26 19:07:44 -07:00
Brad Davis
02c79d9714 Fix the OpenVR issues on AMD 2016-08-26 19:05:29 -07:00
Brad Davis
95b5a23c7a Properly destroy GL programs 2016-08-26 19:04:46 -07:00
Brad Davis
7ffa212006 Don't use textures that are in the transfer pipeline 2016-08-26 19:04:24 -07:00
James B. Pollack
44d102d723 Merge pull request #8529 from imgntn/edit_fix 
Fix some edit.js bugs
 2016-08-26 15:43:14 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color 
fix skybox default
 2016-08-26 15:14:44 -07:00
James B. Pollack
264176dac6 css 2016-08-26 14:21:32 -07:00