Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:49:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58431 commits 75 branches 59 tags 1.2 GiB
Commit graph

18487 commits

Author SHA1 Message Date
Liv
6bde4db0d7 wrap in marketplace check and change landing point 2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00
Anthony J. Thibault
4d845bd208 Bug fix for HMD roll causing avatar yaw when standing still 
HMD roll should only cause the avatar to yaw when actively driving.
 2017-08-09 15:52:27 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
howard-stearns
f1ab91edd1 PR feedback 2017-08-09 12:41:16 -07:00
howard-stearns
7414bf0d9a oops. didn't test what I thought I did 2017-08-09 12:09:03 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez
17acf0520d Download from blocks in marketplace working 2017-08-09 11:08:14 -07:00
Liv
0784686450 small typo fix 2017-08-09 10:17:31 -07:00
howard-stearns
9349e72eeb Merge branch 'master' of https://github.com/highfidelity/hifi into buy 2017-08-09 10:00:36 -07:00
Liv
bd1619b1b2 update error message wording 2017-08-09 09:14:46 -07:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
Zach Fox
03729bf165 Actually fix context menu 2017-08-08 16:38:12 -07:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
Liv
ab8f5c1288 add user logging detail message 2017-08-08 13:55:07 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
Liv
3f30162215 Make spawning point not 0,0,0 and change error message 2017-08-08 09:44:36 -07:00
SamGondelman
6d253fcc5f cleaning up 2017-08-07 18:37:55 -07:00
SamGondelman
42147640e2 remove LaserPointerManager as a dependency 2017-08-07 14:18:56 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Seth Alves
af1e27dc36 Merge pull request #11053 from hyperlogic/feature/secondary-pose-support 
Improved support for Vive Trackers on biceps
 2017-08-07 13:11:48 -07:00
howard-stearns
9bad26c2db stub files 2017-08-07 12:51:30 -07:00
Zach Fox
07a4beac73 Fix the crash 2017-08-07 10:28:36 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag 
Zip drag (needs review)
 2017-08-07 03:17:31 -07:00
Seth Alves
8798e47f99 Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes 
Crash fixes for avatars without Hips, and web overlays
 2017-08-06 18:48:07 -07:00
vladest
134bad9534 fixed typo leads to lost touch or mouse release events 2017-08-06 19:09:40 +02:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
Elisa Lupin-Jimenez
a246c59277 changed debug print for unsupported entity files 2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez
8c9ce82986 Fixed Mac and Ubuntu platform build issue (hopefully) 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
692aa4c4b9 Clara download working again, still can drag in Blocks zip 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6 Removed extraneous print statements 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c3d943ff72 Drag zip folder works 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb Merge pull request #11110 from Armads/WL21423 
Camera mode on startup is determined by user settings and HMD status
 2017-08-04 13:16:34 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
Brad Hefta-Gaub
0d0a1af166 Merge pull request #11085 from jherico/script_console_crash 
Fix for potential crash in JS console
 2017-08-04 11:44:20 -07:00
Anthony J. Thibault
9fdc044ae1 Crash fix for web3d overlays that are not the tablet. 2017-08-04 11:19:59 -07:00
Anthony J. Thibault
85500841fb Crash fix for avatars that are missing "Hips", "Head" and other required joints. 2017-08-04 11:19:09 -07:00
Dante Ruiz
b72ac63662 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-04 17:19:06 +01:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
Armads
dff4e6e32c WL21423 Changing order of camera setup steps 2017-08-03 15:40:38 -04:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
Armads
24718e2424 WL21423 Camera mode on startup is determined by user settings and HMD status 2017-08-03 09:03:23 -04:00
Dante Ruiz
90db4aa9c0 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-02 18:18:17 +01:00
David Kelly
588afaaa85 unused variable... 2017-08-01 16:59:42 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
David Kelly
762b409814 unused variable 2017-08-01 16:20:33 -07:00
David Kelly
479d6abc58 Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 16:18:20 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
anshuman64
9bf4977e09 Merge pull request #11096 from humbletim/21487 
WL 21487: Fix Camera behavior in Mirror mode
 2017-08-01 14:59:06 -07:00
Dante Ruiz
51652482a4 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-01 20:51:56 +01:00
anshuman64
97b4fd4032 Merge pull request #11071 from vladest/fix_menu_landscape 
Fix Landscape mode, when menu pushed in Create mode
 2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
Brad Davis
bea91be521 Fix for potential crash in JS console 2017-07-31 17:50:30 -07:00
David Kelly
43c8079f03 temporary inspectionMode setting to turn ContextOverlays completely off/on 2017-07-31 13:55:43 -07:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Brad Davis
7d18d2e017 Restore corrected touch event simulation 2017-07-29 08:51:51 -07:00
vladest
3c9ab36416 Remove already already implemented fix 2017-07-29 12:00:41 +02:00
vladest
0333849aa8 Merge branch 'master' into fix_menu_landscape 2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07:00
Chris Collins
cfd9f8b64e Merge pull request #11077 from jherico/overlay_event_crashes 
Fix overlay event handling thread issues
 2017-07-28 15:56:09 -07:00
anshuman64
e11388f7f7 Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal 
Add a "dominant hand changed" signal
 2017-07-28 15:17:50 -07:00
Brad Davis
d42052a299 Fix overlay event handling thread issues 2017-07-28 14:56:21 -07:00
Stephen Birarda
17dd028ec7 make Paths available to desktop and tablet QML context 2017-07-28 14:23:18 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi 
Midi support for Entities
 2017-07-28 10:51:43 -07:00
Andrew Meadows
3ec9640ea1 fix calculation of walk motor for HMD 2017-07-28 09:22:47 -07:00
vladest
45934cb53e Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode 2017-07-28 18:04:29 +02:00
Brad Davis
bb57504498 Prevent deadlocks from Overlays update logic recursing into other Overlays calls 2017-07-27 19:39:22 -07:00
David Rowe
c1d179eba1 Add "dominant hand changed" signal 2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube 
update EntityItem bounding cube when on changed dimensions
 2017-07-27 18:21:06 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
SamGondelman
e3288a9004 fix flicker, scissor warning, and handControllerGrab sphere size 2017-07-27 11:17:30 -07:00
Anthony J. Thibault
bcb4cc32d2 another clang error fix 2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7 clang build error fix 2017-07-27 10:08:35 -07:00
Anthony J. Thibault
8f5c41af2d changed _controllerPoseMap from unordered_map to map 2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4 use ctrl rather than alt to activate camera-mode shortcuts 2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods 2017-07-26 15:54:57 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Liv
be860d6c87 small string fix 2017-07-26 10:20:29 -07:00
Liv
63d637c4db Add line to move user back to origin to be near new content 2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
SamGondelman
3a8ad8b631 switch to QUuids 2017-07-25 15:11:44 -07:00
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -07:00
SamGondelman
0117950546 can edit drawHUDLayer property 2017-07-25 12:57:52 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
2377e4a5db fix message formatting 2017-07-25 11:32:02 -07:00
Liv
89a1c7a697 code cleanup 2017-07-25 11:24:57 -07:00
Zach Fox
c71dca5b4b Missed a magic number 2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2 Handle the case when the camera is inside the bounding box of an entity 2017-07-25 11:06:54 -07:00
SamGondelman
3149c3e16c warnings 2017-07-25 10:16:50 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8 Move logic for confirmation into Application.cpp for handling files directly 2017-07-24 18:09:32 -07:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3 third person camera is alt+G rather than alt+O 2017-07-24 17:43:01 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Seth Alves
97756e6140 accidently deleted a break 2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753 use alt+h for mirror-mode 2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5 fix spelling typo in comment 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878 avoid unnecessary and expensive gets 2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b use alt+f for 1st person camera and alt+o for 3rd 2017-07-24 15:56:37 -07:00
Seth Alves
afc7eaff8d Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods 2017-07-24 15:21:37 -07:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
Andrew Meadows
a44b33ab11 Merge pull request #11023 from jherico/audio_deadlock 
Fix for audio deadlock & audio device selection
 2017-07-24 14:03:29 -07:00
SamGondelman
ee02a0bff4 fix build error 2017-07-24 12:44:54 -07:00
Cain Kilgore
9ff7891c88 Fixed reference error, Gustavo should build now. 2017-07-24 19:56:02 +01:00
Cain Kilgore
64ba159adf Updating Small Reference 2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9 removed duplicate 2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522 Merge pull request #10994 from vladest/avatar_default_speeds 
Change default mouse speeds for avatar
 2017-07-24 10:13:27 -07:00
Chris Collins
ceb218f4cc Merge pull request #10798 from humbletim/add-persistent-console-history 
Save JS "Console..." history across sessions
 2017-07-24 09:24:04 -07:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
humbletim
300b926464 only call QList::constFirst when history list isn't empty 2017-07-23 14:12:52 -04:00
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01:00
Dante Ruiz
7bf3f45e39 finished the locked default scripts 2017-07-21 23:32:25 +01:00
David Kelly
e7c6ba9ae2 unused var 2017-07-21 14:44:45 -07:00