Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 08:03:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45838 commits 76 branches 59 tags 1.2 GiB
Commit graph

45838 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
01fcaa024d Merge pull request #8463 from howard-stearns/html-user-story 
html drill-down user story
 2016-08-18 16:15:47 -07:00
howard-stearns
aab3b83ad9 open login if user tries to share and is not logged in, rather than 
messaging user that they cannot share
 2016-08-18 14:20:53 -07:00
howard-stearns
4492c4e64e Allow javascript to safely open the correct login window (or answer that 
it is unneded).
 2016-08-18 14:19:36 -07:00
howard-stearns
5e8722ccf5 persist "open feed after" checkbox setting 2016-08-18 12:58:00 -07:00
howard-stearns
0f415abd6b dual purpose address bar - switchable between html and qml 2016-08-17 16:56:52 -07:00
howard-stearns
d58cc8ddd9 use html card from user_story id, and close things when 
receiveHifiSchemeUrl
 2016-08-17 16:35:29 -07:00
howard-stearns
e75f950ac7 Signal receivedHifiSchemeURL 2016-08-17 16:34:59 -07:00
David Kelly
37dc324cec Merge pull request #8454 from howard-stearns/ux-improvements 
snapshot ux improvements
 2016-08-17 12:23:12 -08:00
howard-stearns
8823f48666 new snapshot review behavior 2016-08-17 10:00:20 -07:00
howard-stearns
17d9db487d adjust .qml for useFeed being a c++ property instead of qml. 2016-08-17 09:57:46 -07:00
howard-stearns
347b20e506 expose to scripts the ability to show dedicated qml windows such as 
preferences
 2016-08-17 09:54:15 -07:00
howard-stearns
2a099d5577 expose to scripts the ability to open the feed 2016-08-17 09:53:26 -07:00
howard-stearns
48ff26eeb7 provide a way to programmatically show the feed (showing address bar in 
feed mode).
 2016-08-17 09:50:38 -07:00
howard-stearns
a8fd92d2bf Hide reticle during snapshot 2016-08-16 12:35:49 -07:00
Howard Stearns
3f42e644de Merge pull request #8443 from howard-stearns/discovery 
update discovery from master
 2016-08-16 12:25:12 -07:00
howard-stearns
1aca43ea88 Merge branch 'discovery' of https://github.com/highfidelity/hifi into ux-improvements 2016-08-16 12:24:55 -07:00
howard-stearns
d764c363cc Merge branch 'discovery' into ux-improvements 2016-08-16 12:19:43 -07:00
howard-stearns
2ca1fda71b Re add fix for hmd after merge 2016-08-16 12:02:49 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
howard-stearns
4da2cb685c Set full url path to where the picture was taken. 
Expand width of scroll, but leave a margin at both ends.
Include an image at the end to indicate that the scroll is swipable.
Adjust ighlight color and border size.
 2016-08-16 10:43:05 -07:00
howard-stearns
2f114b9c92 fix image link. How did this ever work? 2016-08-16 10:38:00 -07:00
Chris Collins
2ec54c4fd7 Merge pull request #8439 from huffman/fix/transparent-against-procedural-skybox 
Fix transparent items not being rendered correctly against procedural skybox
 2016-08-16 09:19:51 -07:00
Ryan Huffman
1d2ea3be03 Fix transparent items not being rendered correctly against procedural skybox 2016-08-15 16:35:25 -07:00
Brad Davis
8fdecc6e56 Merge pull request #8438 from zzmp/fix/amd-cubemap 
fix cubemaps on AMD cards running GL 4.5
 2016-08-15 16:06:32 -07:00
Zach Pomerantz
af915c7923 replace cube tex DSA transfer with EXT 2016-08-15 15:31:04 -07:00
James B. Pollack
b4943a4c4b Merge pull request #8437 from huffman/fix/assets-example 
Fix assets example not using correct API
 2016-08-15 15:27:39 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded 
Threaded rendering
 2016-08-15 09:59:44 -07:00
James B. Pollack
8c7f89ce44 Merge pull request #8425 from imgntn/pistol_sensitivity 
Adjust pistol sensitivity
 2016-08-15 09:50:34 -07:00
Ryan Huffman
9773c58da6 Fix assets example not using correct API 2016-08-15 09:28:26 -07:00
Brad Davis
fdbbd70eed Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug 
sidestep linux gcc linker? bug
 2016-08-13 12:08:05 -07:00
Brad Davis
5b09748c00 Merge pull request #8431 from imgntn/assetbutton 
Open Asset Browser with Button from Edit.js Toolbar
 2016-08-13 12:04:21 -07:00
Brad Davis
438205b875 Fixing last buffer flush 2016-08-12 22:29:05 -07:00
Brad Davis
99009d8a2d Enable reprojection on OpenVR 2016-08-12 22:29:04 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
d34ac2cea8 Fix hand laser alignment 2016-08-12 22:29:03 -07:00
Brad Davis
511eb34e5f Fixing mac build 2016-08-12 22:29:02 -07:00
Brad Davis
0c990c621d Fix perf tool build 2016-08-12 22:29:01 -07:00
Brad Davis
58c7df115f Reduce API surface area, make render batches const correct 2016-08-12 22:29:01 -07:00
Brad Davis
cac529a1b1 Display plugins now use gpu::Context API 2016-08-12 22:29:00 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
ff24bc982c Re-disable reprojection in OpenVR 2016-08-12 22:28:58 -07:00
Brad Davis
82081d7d57 Address vsync weirdness 2016-08-12 22:28:58 -07:00
Brad Davis
39b424645a Cropping no-preview image 2016-08-12 22:28:57 -07:00
Brad Davis
e352883a88 Fix Gamma in Oculus display plugin 2016-08-12 22:28:56 -07:00
Brad Davis
719e555381 Restoring reprojection to OpenVR 2016-08-12 22:28:55 -07:00
Brad Davis
f9d522a1ae Re-remove web from render-perf tool, add frame timing stats 2016-08-12 22:28:55 -07:00
Brad Davis
39a47b7559 Fix Oculus compositing and gamma 2016-08-12 22:28:54 -07:00
Brad Davis
029721fd45 Restore screenshot 2016-08-12 22:28:53 -07:00
Bradley Austin Davis
f65b636a09 Re-disable HMD preview on OSX 2016-08-12 22:28:52 -07:00
Bradley Austin Davis
c303e1118a Only setup the debug logger once 2016-08-12 22:28:52 -07:00