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

70414 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
e0d14dd702 Works, but does not yet wait for completion of Python process. 2018-07-29 00:25:02 -07:00
NissimHadar
951b90d74c WIP - running Python process. 2018-07-27 21:40:18 -07:00
Simon Walton
3d1fe7da9f Reset known entity-state when leaving initial send state 2018-07-27 18:22:36 -07:00
Dante Ruiz
cf6850de48 better stuff 2018-07-27 17:53:21 -07:00
Dante Ruiz
887a416656 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 17:50:12 -07:00
Dante Ruiz
6320401308 somewhat better distance from bounding box 2018-07-27 17:49:49 -07:00
Simon Walton
2ac6ca3291 Remove old physics-enabling code 2018-07-27 17:32:35 -07:00
SamGondelman
3d4639bfdd CR 2018-07-27 16:36:22 -07:00
Thijs Wenker
ba8d445444 fix require by queueing content requests 2018-07-28 00:25:16 +02:00
NissimHadar
35464c4ca4 Can add tests (include only the preconditions) 2018-07-27 15:10:06 -07:00
Howard Stearns
e8e04673a4
Merge pull request #13683 from zfox23/MS17039_dontDeleteDDV 
Implement MS17039: Don't delete entities during DDV when Metaverse API call returns error
 2018-07-27 15:05:05 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
John Conklin II
9c37e30fe6
Merge pull request #13678 from ElderOrb/FB17023 
FB17023 - Make visible avatar url in the avatar app
 2018-07-27 14:57:25 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot 
Particles don't spin with head roll, new spin + rotateWithEntity properties
 2018-07-27 14:54:48 -07:00
Simon Walton
5315b020ec Use locking for the OctreePacketProcessor additions 2018-07-27 14:51:24 -07:00
John Conklin II
df917688b6
Merge pull request #13707 from AndrewMeadows/fix-ccd 
more correct continuous collision detection for thin objects
 2018-07-27 14:32:41 -07:00
Thijs Wenker
9dce1b64b6
Merge pull request #13695 from huffman/fix/create-focus-on-create 
Fix edit.js not being able to delete after creating entity
 2018-07-27 22:43:34 +02:00
NissimHadar
066b1acd94 Can write all the sections (sans tests themselves). 2018-07-27 13:35:31 -07:00
Ryan Huffman
103f9e04fa Fix duplication not working as expected on grabbed entities 2018-07-27 13:32:12 -07:00
Dante Ruiz
30b4815bf9 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 13:13:10 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash 
fix a crash when grabbing a non-dynamic entity with an overlay child
 2018-07-27 12:49:14 -07:00
John Conklin II
a1f9d87437
Merge pull request #13705 from ctrlaltdavid/M17068 
Maintain virtual and real world orientations when teleport
 2018-07-27 12:44:22 -07:00
NissimHadar
7bb6d8dc82 Can now create first level of sub-sections. 2018-07-27 12:41:11 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue 
Fix ScriptEngine begin held onto after script stopped runnning
 2018-07-27 12:31:31 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix 
Fix For Unnatural Hips Behaviour When Sitting In HMD
 2018-07-27 12:30:31 -07:00
Simon Walton
3d390203e2 More fixes for clang & gcc 
C++14 issues, I think.
 2018-07-27 11:34:08 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Sam Gateau
a95ddb0492
Merge pull request #13616 from AndrewMeadows/remove-cruft-001 
remove cruft for rendering collision shapes
 2018-07-27 19:19:44 +02:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings 
17016 flying settings
 2018-07-27 10:07:13 -07:00
Simon Walton
4d559bbaee Don't initialize an atomic; squelch gcc warning 2018-07-27 10:05:34 -07:00
David Back
1d8b7bea65 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-27 09:23:26 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create 
Fix computePickRay when in mirror mode
 2018-07-27 09:05:58 -07:00
NissimHadar
be79fa9e31 Added creation of a python stack class 2018-07-27 09:04:37 -07:00
Andrew Meadows
cf04a91a83 use smaller CCD spheres for thin objects 2018-07-27 09:02:19 -07:00
NissimHadar
78cf29619e Merge branch 'exportToTestRail' of github.com:NissimHadar/hifi into exportToTestRail 2018-07-27 08:09:22 -07:00
David Rowe
3bfdd3ff58 Maintain virtual and real world orientations when teleport 2018-07-27 15:18:40 +12:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
SamGondelman
f5364f752f fix scaling 2018-07-26 18:01:24 -07:00
David Back
cd842afc1c prevent both hands triggering same time, allow one to trigger after other 2018-07-26 17:52:25 -07:00
NissimHadar
91c04bb639 Working on creating sections in TestRail. 2018-07-26 17:21:43 -07:00
David Back
dcdf734114 remove unneeded 2018-07-26 16:43:07 -07:00
David Back
82e5d6ad29 use triggerClicks from controllers for edit handles 2018-07-26 16:38:25 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
Dante Ruiz
74bb2301b0 minimize diff 2018-07-26 16:05:56 -07:00
Dante Ruiz
31d31af941 minimize diff 2018-07-26 16:05:18 -07:00
David Back
7faec21b1d Merge branch 'master' of https://github.com/highfidelity/hifi into resetPropertiesNoSelection 2018-07-26 15:40:32 -07:00
David Back
ff6ed971d8 comments, re-org, submesh number 2018-07-26 15:40:27 -07:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
Dante Ruiz
02232daa58 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-26 15:26:24 -07:00