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

22273 commits

Author SHA1 Message Date
Dante Ruiz
78268001c4 reverting logic change 2018-10-03 15:13:42 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
Dante Ruiz
b28c375ad3 better loading check logic 2018-10-03 09:57:32 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace 
Better deadlock crash
 2018-10-02 16:03:20 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup 
Android signup
 2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast 
Fix for bad static_pointer_cast on exit.
 2018-10-02 11:31:47 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Gabriel Calero
13e2b99dfa Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-02 09:24:09 -03:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465 
Fix case 18465: redirect to domain after login
 2018-10-01 16:48:27 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix 
Fix avatar warp into floor when navigating to a saved bookmark
 2018-10-01 16:36:31 -07:00
Gabriel Calero
1422c178a4 Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-01 20:36:27 -03:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build 
get interface building and working with clang-7 on ubuntu 18
 2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2 updating interstitialmode 2018-10-01 15:26:56 -07:00
Dante Ruiz
652ec2210d fixing loading issues 2018-10-01 13:58:14 -07:00
sabrina-shanman
b988382918 Remove smaller RayPick constructor 2018-10-01 11:07:02 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
sabrina-shanman
7a89f959d1 Fix not mentioning pick parenting in all pick parenting jsdocs for 
parentID
 2018-10-01 09:34:21 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
sabrina-shanman
0cf7e954cc Simplify a RayPick and StylusTip constructor 2018-10-01 09:20:59 -07:00
sabrina-shanman
f0de3ef31c jsdocs: Do not list scaleWithAvatar as separate property, and document 0 as default for parentJointIndex 2018-10-01 09:18:52 -07:00
sabrina-shanman
728f8aeecd Scale Parabola Pick acceleration before rotating it 2018-10-01 09:02:46 -07:00
David Rowe
9dfbaa9201 Remove "Reset Sensors" button from Settings > Controls 2018-09-29 14:17:55 +12:00
Anthony Thibault
58df72af60 Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast 2018-09-28 16:32:12 -07:00
sabrina-shanman
f3f9976cfb Cache ParabolaPick speed 2018-09-28 16:10:17 -07:00
sabrina-shanman
b60a62da8f Move pathWidth variable in PathPointer back down to specialized classes 2018-09-28 16:04:34 -07:00
sabrina-shanman
0c3f55d6ef Code style for floating point literal 2018-09-28 15:39:37 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Gabriel Calero
b7c421ba47 Fixes according to review 2018-09-28 14:39:15 -03:00
sabrina-shanman
8f2d3b17d3 Fix parabola scaling issues and raypick velocity denormalization due to transform affecting direction scale 2018-09-28 09:27:38 -07:00
David Rowe
1c4bde3e84 Fix build warnings 2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
f2c13f193c Don't jump in HMD mode unless option is set 2018-09-28 16:05:20 +12:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
sabrina-shanman
e7c70705b2 Actually make the result transform of a collision pick just a position, as documented 2018-09-27 17:33:52 -07:00
sabrina-shanman
44efe648e0 Add scaleWithParent option to collision pick creation 2018-09-27 17:29:42 -07:00
sabrina-shanman
e176143025 Make scaleWithParent true by default for parabola picks 2018-09-27 17:29:42 -07:00
sabrina-shanman
2dd8140158 Make scaleWithAvatar an alias for scaleWithParent in PointerScriptingInterface and make true the default for parabola pointers 2018-09-27 17:29:42 -07:00
sabrina-shanman
bc861c1368 Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar 2018-09-27 17:29:37 -07:00
luiscuenca
195df9e0ec compute feet position offset in situ 2018-09-27 17:18:43 -07:00
sabrina-shanman
bfa270375a Simplify PickRay calculations in RayPick::getMathematicalPick 2018-09-27 14:33:29 -07:00
sabrina-shanman
9e0d35e40d Combine PickScriptingInterface::getPickJointState and createTransformNode into one function 2018-09-27 14:28:10 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
sabrina-shanman
ed987ffe9e Improve style/compatibility for default position/direction when creating parabola pick 2018-09-27 11:42:19 -07:00
sabrina-shanman
12a755310f Fix wrong velocity in ParabolaPick::getMathematicalPick 2018-09-27 11:37:30 -07:00
sabrina-shanman
3ac9478101 Assign _mathPick in the Pick constructor 2018-09-27 11:30:57 -07:00
sabrina-shanman
bb38efa061 Set joint state for the mouse RayPick of the EntityTreeRenderer 2018-09-27 10:58:28 -07:00
sabrina-shanman
b68031b969 Add simpler RayPick constructor with position/direction values set to default 2018-09-27 10:53:10 -07:00
luiscuenca
bbe836ee88 Remove smooth teleport and set/get API methods 2018-09-27 10:38:45 -07:00
Wayne Chen
747aab2097 persisting signed values 2018-09-27 10:16:11 -07:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
Gabriel Calero
fba3b48923 Merge remote-tracking branch 'upstream/master' into android_signup 2018-09-27 11:38:52 -03:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
Wayne Chen
813defebfc Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged 2018-09-26 16:45:22 -07:00
John Conklin II
7701cfd9c8
Merge pull request #14084 from luiscuenca/appearOnFloorFix 
Fix avatars loading below the ground bug
 2018-09-26 16:00:53 -07:00
Gabriel Calero
3163ae5997 Fix case 18465: redirect to domain after login 2018-09-26 19:41:43 -03:00
John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002 
fix MyAvatar-vs-OtherAvatar collisions
 2018-09-26 15:21:18 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only 
Prevent thread issues with PickResults modified by Pointers
 2018-09-26 12:12:58 -07:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester 
Marketplace item tester interface
 2018-09-26 11:25:53 -07:00
Dante Ruiz
7e138ebfff update to new enabling method 2018-09-26 10:52:45 -07:00
sabrina-shanman
4011660435 Merge branch 'master' into stt_parenting2 2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master 
fix for deadlock in other avatar entity removal from tree
 2018-09-26 09:58:26 -07:00
Seth Alves
ff2a47e7e6 fix several uninitialized reads 2018-09-26 09:33:12 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
David Rowe
b98bd741b8 Indent and reword jumping and flying checkbox 2018-09-26 18:14:02 +12:00
David Rowe
053ae0e0ed Use radio buttons for VR advanced movement options 2018-09-26 17:42:44 +12:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect 
Toggle going to 404 redirect domain
 2018-09-25 20:44:57 -07:00
luiscuenca
754653b093 Fix warnings 2018-09-25 17:31:18 -07:00
luiscuenca
82b08f1a93 Wait until skeleton is loaded to locate the avatar 2018-09-25 16:21:05 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test 
Working on Vive shutdown issues
 2018-09-25 15:41:32 -07:00
Roxanne Skelly
cbb4bff2db Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-25 14:16:43 -07:00
sabrina-shanman
55ab0a394b Return std::make_shared 2018-09-25 12:21:22 -07:00
sabrina-shanman
6e83e96d1c Check type in Pointer::getPickResultCopy 2018-09-25 12:05:47 -07:00
sabrina-shanman
660bdf36d0 Check if pick result is null when building visual pick result 2018-09-25 09:56:51 -07:00
luiscuenca
1e34d3aa35 Remove not needed code 2018-09-25 09:22:33 -07:00
sabrina-shanman
8dd36e465b Merge branch 'master' into crash_ray-pick-dtor_pointer-only 2018-09-25 09:22:30 -07:00
sabrina-shanman
eca31e7a99 Fix instantiating abstract class when creating visual pick result for pointers 2018-09-25 09:20:57 -07:00
luiscuenca
af2935187b Fix warnings 2018-09-25 08:32:43 -07:00
luiscuenca
0676f25e31 Save transit preferences 2018-09-25 07:42:28 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
David Rowe
af1b4fef5d Modify layout of rotation mode settings options 2018-09-25 18:03:57 +12:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings 
make settings thread safe
 2018-09-24 17:24:50 -07:00
David Rowe
06b4f51a08 Misc fixes 2018-09-25 11:33:08 +12:00
Andrew Meadows
a3f946dee1 activate OtherAvarar in physics sim on position change 2018-09-24 16:27:37 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00