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

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniela
4c302b899d Fix teleport pad alignment 2017-09-07 17:52:09 +01:00
Olivier Prat
6b5ca0c6ce Optimized by removing unnecessary Z buffer copy 2017-09-07 18:33:00 +02:00
Daniela
0655264b44 Replace bytes for uint8_t. 2017-09-07 14:21:41 +01:00
vladest
9f8f28dd1e Merge branch 'master' into tablet_extended_sounds 2017-09-07 14:53:12 +02:00
Daniela
3ff707f27e Add Avatar resize compatible teleport pad alignment 2017-09-07 13:31:41 +01:00
Liv
930d59c53e add back first run to false and fix formatting 2017-09-07 14:14:11 +02:00
Liv
758fc53882 Remove unneeded handcontrollertype code from handle first run checks 2017-09-07 14:14:11 +02:00
Liv
7ee2ac736e Remove unused skipTutorial code 2017-09-07 14:14:11 +02:00
Liv
9e88a6ed8d Initial attempt at changing first run behavior 2017-09-07 14:14:11 +02:00
Olivier Prat
2003495166 Adjustments to half texel fix 2017-09-07 12:30:20 +02:00
Olivier Prat
b43514fb8b Modified outline shader to do fill branch on CPU. Fixed assymetric outline 
due to depth sample not offset by a half texel in shader.
 2017-09-07 12:15:38 +02:00
Olivier Prat
b9eb317d9b Fixed non working outline in stereo with new changes 2017-09-07 10:33:55 +02:00
Olivier Prat
796c59b9c2 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-07 10:13:53 +02:00
David Rowe
8fdc2313cc Tidying 2017-09-07 18:36:01 +12:00
samcake
e48c456d24 Trying to sync the render transform for overlay web at the right time... 2017-09-06 17:57:18 -07:00
druiz17
636e906191 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 17:15:18 -07:00
druiz17
cc7a222374 fixing Hifi-Hand-Drop for equipEntity 2017-09-06 17:15:05 -07:00
David Rowe
83a8cb5fe0 Merge branch 'master' into vr-edit-a 2017-09-07 10:53:41 +12:00
David Rowe
e94d2034c7 Don't grab entity behind entity just created and grip-click-deleted 2017-09-07 10:44:03 +12:00
David Rowe
8ca97d91c5 Make able to pick color from locked entities 2017-09-07 10:26:12 +12:00
druiz17
0d66bfca05 added far trigger 2017-09-06 14:58:04 -07:00
Howard Stearns
a0ae9ee747 Merge pull request #11311 from davidkelly/dk/walletCleanup 
wallet cleanup
 2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58 Merge pull request #11298 from ElderOrb/case7382 
7382 Create Menu does not Work on Tablet
 2017-09-06 14:09:41 -07:00
vladest
31a23acb1a Add flickable on mouse wheel to web pages 2017-09-06 23:04:58 +02:00
David Rowe
2661fb6647 Tidying 2017-09-07 08:48:03 +12:00
Stephen Birarda
c5f7c5d314 Merge pull request #11281 from huffman/feat/bake-meta-errors 
Add auto bake error handling to asset server
 2017-09-06 13:20:16 -07:00
Daniela
37f959d749 Add Avatar resize compatible teleport pad alignment 2017-09-06 19:45:58 +01:00
Daniela
0ac7e00612 Add Avatar resize compatible teleport.js pad scale 2017-09-06 19:45:03 +01:00
Daniela
608e4858fc Add Fix polyline crash and flicker 2017-09-06 19:06:05 +01:00
Anthony J. Thibault
2f850826f2 Allow override of near/far clip planes in Oculus and OpenVR plugins 2017-09-06 11:02:44 -07:00
Menithal
e1acf9dbc9 Merge remote-tracking branch 'upstream/master' into 21484-Fix 2017-09-06 20:42:47 +03:00
Olivier Prat
17e992bd14 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-06 19:08:37 +02:00
Olivier Prat
a83094d7c7 Still need to test this on mac 2017-09-06 19:08:31 +02:00
Olivier Prat
fe357671e1 Removed qmlc files 2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
Daniela
3c32171c15 Add pack and unpack optimization in Entity Properties 2017-09-06 18:02:36 +01:00
druiz17
6ffcf73d0e Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 09:47:54 -07:00
Olivier Prat
10643feb78 Working with specific zpass rendering for outline. Debug script needs relinking to correct config 2017-09-06 18:40:38 +02:00
Dante Ruiz
a5553d5e1c fixed text scale for notifications 2017-09-06 09:26:48 -07:00
Chris Collins
8563a05431 Merge pull request #11255 from misslivirose/feat/tablet-tutorial 
Removing tutorial paths for first run experience
 2017-09-06 09:23:45 -07:00
Dante Ruiz
b4f7cb961a Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man 2017-09-06 08:38:08 -07:00
Olivier Prat
d6ea01c4f3 Created outline task but still need to create specific render job with z-pass shaders 2017-09-06 17:34:29 +02:00
Dante Ruiz
15c853567d Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 08:34:28 -07:00
Olivier Prat
75e06b691f Simplified version that works directly with metas 2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43 First working version of outline working with selection interface. 2017-09-06 15:47:10 +02:00
vladest
e17f05a337 Correct UI 2017-09-06 14:52:08 +02:00
Cain Kilgore
d429bd0b01 Changed the Interface text to say 'Task bar' instead of 'system tray' 2017-09-06 13:42:13 +01:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
Cain Kilgore
2a6b523542 Again 2017-09-06 13:09:43 +01:00
Cain Kilgore
14e5cf31f2 Apparently I didn't need 'em 2017-09-06 12:42:17 +01:00