Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 19:25:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55936 commits 29 branches 28 tags 1.2 GiB
Commit graph

23104 commits

Author SHA1 Message Date
Sam Gateau
8a2837e1f7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 11:52:11 -07:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -07:00
Ryan Huffman
0d96f82888 Merge pull request #10592 from birarda/close-report 
Send a close event to API on shutdown
 2017-06-02 10:57:41 -07:00
Seth Alves
d91b3700a7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 10:07:50 -07:00
Seth Alves
bc2311cb35 Merge pull request #10561 from AndrewMeadows/sanity-check-physics 
fix crash in EntityMotionState::handleDeactivation()
 2017-06-02 09:55:20 -07:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble 
Add UserActivity calls for bubble usage
 2017-06-02 09:48:15 -07:00
Seth Alves
f47a49e631 Merge pull request #10597 from druiz17/record-standard 
Saved recording are officially g zipped and pose are played back to the standard endpoint
 2017-06-02 09:44:03 -07:00
NeetBhagat
6228ff19bf Resolve the reviewed comments of @ZappoMan 2017-06-02 15:23:21 +05:30
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
NeetBhagat
e08c3453a4 Merge branch 'master' into 21255 2017-06-02 12:36:07 +05:30
samcake
4a419f2d07 Merging with upstream 2017-06-01 18:25:24 -07:00
Ryan Huffman
86da91ac8d Remove the runningMarker timer 2017-06-01 18:19:13 -07:00
Ryan Huffman
aa48f3f063 Rename watchProcessShutdown to shutdownWith 2017-06-01 18:13:27 -07:00
samcake
14f9a9848e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-01 18:05:47 -07:00
samcake
c5e9551bab more cleanup 2017-06-01 18:05:18 -07:00
Stephen Birarda
6a89726a6a Merge pull request #10593 from birarda/log-api-session-id 
print the metaverse session ID to the debug log
 2017-06-01 18:02:17 -07:00
Andrew Meadows
29a05d7eb4 bid immediately when creating new entity 
also clear EntityMotionState::_numInactiveUpdates on new ownership
 2017-06-01 17:39:21 -07:00
Andrew Meadows
74827fc4c8 recently moved static objects added to changelist 
since static objects are not active this will make the interface
release ownership of recently changed static objects
 2017-06-01 17:39:21 -07:00
Andrew Meadows
e34f979ed9 add EntityMotionState::isLocallyOwned() for cleaner logic 2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8 minor formatting fix 2017-06-01 17:39:21 -07:00
Brad Davis
b9f9cddea0 Add versioning support to the KTX cache 2017-06-01 17:16:24 -07:00
howard-stearns
6b2e4c5abc zaru stuff 2017-06-01 17:08:22 -07:00
David Kelly
37b738ff8b initial cut at some UserActivities for the bubble 2017-06-01 16:46:31 -07:00
Seth Alves
48ee546545 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 16:15:03 -07:00
Brad Davis
3fdad14ca4 Merge pull request #10571 from jherico/ktx_tests 
FileCache refactoring and test, plus KTX unit tests
 2017-06-01 16:09:14 -07:00
Stephen Birarda
0f22b07026 move session ID logging later in app startup 2017-06-01 16:07:36 -07:00
Stephen Birarda
06b3ecfdc3 also log metaverse session ID during ctor of AccountManager 2017-06-01 15:50:56 -07:00
Anthony J. Thibault
3710637254 warning fix 2017-06-01 15:17:02 -07:00
Dante Ruiz
77eb75db95 add .json to extension 2017-06-01 22:48:59 +01:00
Dante Ruiz
6bc53388f8 Merge branch 'master' of github.com:highfidelity/hifi into record-standard 2017-06-01 22:34:57 +01:00
Dante Ruiz
725388043f removed double semi-colons 2017-06-01 22:30:50 +01:00
Dante Ruiz
2a5c43026a gzip recording data 2017-06-01 22:27:51 +01:00
Anthony J. Thibault
551426f46e Made computeSplineJointInfosForIKTarget more general 
It should now work for non-vertical oriented splines.
 2017-06-01 13:56:06 -07:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
Stephen Birarda
3d98f1b3ee print metaverse session ID to debug log 2017-06-01 13:46:37 -07:00
Anthony J. Thibault
f99b579c14 added some docs 2017-06-01 13:38:18 -07:00
Seth Alves
ac6135387c display plugins are never head controllers 2017-06-01 13:37:16 -07:00
Anthony J. Thibault
b9bf6f4c05 whitespace 2017-06-01 13:30:35 -07:00
Anthony J. Thibault
226855b2b9 Bug fixes and cleanup 
* Bug fix for problem when chest target is enabled but hips target is not.
* centralized the two computeSplineFromTipAndBase functions into one.
* Removed dead code
 2017-06-01 13:20:50 -07:00
samcake
9c1e99fe3f Removing cruft and organizing the stencil config 2017-06-01 13:06:22 -07:00
Ryan Huffman
aaf9b9ac7f Update server-console to watch interface via pid rather than marker 2017-06-01 11:20:36 -07:00
Dante Ruiz
9a8030cc09 Merge branch 'recorder-fix' into record-standard 2017-06-01 19:01:54 +01:00
Dante Ruiz
0e82b33d6d final changes 2017-06-01 19:00:31 +01:00
Dante Ruiz
e52765b641 playback recording back through the standard inputs 2017-06-01 18:51:24 +01:00
Dante Ruiz
c686acc071 fixing build issue 2017-06-01 18:20:56 +01:00
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -07:00
Dante Ruiz
23a9209285 Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix 2017-06-01 18:06:37 +01:00
Dante Ruiz
a1e0737928 saving work 2017-06-01 18:06:06 +01:00
samcake
257813ec38 comment the code 2017-06-01 09:19:02 -07:00
Anthony J. Thibault
813feeb8fd Limit spine spline compression/stretch to 15% 2017-06-01 08:56:42 -07:00
David Rowe
47e65e942e Gradually relax hands from controlled positions when lose tracking 2017-06-01 23:42:08 +12:00
Sam Cake
ea6be93c9c adding another flavor of the prepare stencil 2017-06-01 01:24:57 -07:00
NeetBhagat
d27ad061cb Merge branch 'master' into 21255 2017-06-01 12:46:14 +05:30
NeetBhagat
c7c07b28e9 Resolve the reviewed comments of @ZappoMan 2017-06-01 12:17:13 +05:30
Sam Cake
03fdc1396c Fixing the warnings 2017-05-31 23:20:10 -07:00
David Rowe
95aab28e91 Disable unused code 
Keep for future experimentation per other commented-out code in method
 2017-06-01 18:13:57 +12:00
Sam Cake
e02115bcda clearing up the stencil jobs 2017-05-31 23:00:05 -07:00
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
Sam Cake
b528c2fc60 Merged 2017-05-31 19:33:14 -07:00
Stephen Birarda
1d9d83b157 initial version of the ClosureEventSender using std::thread 2017-05-31 19:00:41 -07:00
howard-stearns
1e1dd3a633 checkpoint with working detector 2017-05-31 17:10:37 -07:00
Anthony J. Thibault
d3ca34956d Fix spline interpolation the wrong way when bending backward. 2017-05-31 16:58:17 -07:00
samcake
82d348a2ef Stencil rejection is working, and more cleaning 2017-05-31 16:46:20 -07:00
Dante Ruiz
cca0fa6600 fixed some input recorder design issue 2017-06-01 00:23:37 +01:00
Liv
8bcaacbe40 Removing incomplete torus function 2017-05-31 15:46:35 -07:00
Liv
f594fd6aa5 Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes 2017-05-31 15:14:04 -07:00
Brad Davis
a77491ccb1 FileCache refactoring and tests 2017-05-31 13:45:59 -07:00
samcake
5d32ed8589 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-31 09:35:37 -07:00
Sam Cake
32c5dac66a Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil 2017-05-31 00:55:28 -07:00
Anthony J. Thibault
cff42ab9b0 Working spline spline. 2017-05-30 19:01:52 -07:00
samcake
8559ed6260 Starting to add the stencil mask for hmd 2017-05-30 16:37:10 -07:00
Anthony J. Thibault
d4dbd94a35 Compute defaultSpineSplineto defaultPose offset 2017-05-30 14:25:32 -07:00
Anthony J. Thibault
39c23bfe2f revision of spine spline rotation calculation 2017-05-30 14:25:30 -07:00
Anthony J. Thibault
fc12d7547a Addition of CubicHermiteSpline helper classes. 2017-05-30 14:25:29 -07:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
Ryan Huffman
4a52f4090d Merge pull request #10552 from huffman/fix/multiple-nic-lockup 
Fix SendQueue not setting lastReceiverResponse when recv handshake ack
 2017-05-30 13:05:01 -07:00
Chris Collins
5db0975554 Merge pull request #10556 from highfidelity/RC-41 
Beta Release 41 - Includes up to Developer Release 6603
 2017-05-30 12:52:30 -07:00
Brad Davis
765bd3890e Improving test code for KTX library 2017-05-30 10:47:49 -07:00
Stephen Birarda
41716ec56b Merge pull request #10554 from seefo/master 
Moved audio asset processing to a separate thread
 2017-05-30 10:44:53 -07:00
David Rowe
8de93d9651 Fix typo noticed in passing 2017-05-30 15:53:58 +12:00
volansystech
212627bd5d Merge branch 'master' into 21255 2017-05-29 17:51:45 +05:30
volansystech
0920dbc1a8 Resolve the comments of @ZappoMan. 2017-05-29 15:53:33 +05:30
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
Stephen Birarda
0a7a42bdc3 fix force of BC3 instead of BC1a compression 2017-05-26 13:52:50 -07:00
Zach Fox
252298938b Update conditional to handle 'other unowned' case 2017-05-26 13:25:36 -07:00
Zach Fox
21d396bbb5 Pull out ownership bidding changes 2017-05-26 13:25:25 -07:00
Zach Fox
3ec73cc5e1 Changes after discussion with Brad 2017-05-26 13:25:13 -07:00
Zach Fox
ebe6ce9c8d Committing checkpoint changes, then testing 2017-05-26 13:25:05 -07:00
Zach Fox
8dec066c2b Revert 'dynamicChanged' to be a 'misc' physics property 2017-05-26 13:24:47 -07:00
Zach Fox
827daade1b Make this PR a protocol change 2017-05-26 13:24:38 -07:00
Zach Fox
64191ee20a Make the changes - big thanks to Andrew! 2017-05-26 13:24:17 -07:00
Stephen Birarda
cfbbf3183a Merge pull request #10560 from birarda/bug/zfox-teeth 
fix issue with textures with alpha as a mask
 2017-05-26 13:11:02 -07:00
seefo
1d29610dbb Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-26 12:49:56 -07:00
Brad Davis
952d3629ec Merge pull request #10559 from jherico/fix_compressed_ktx_loading 
Fix compressed KTX loading
 2017-05-26 12:46:11 -07:00
Stephen Birarda
07440e325f fix force of BC3 instead of BC1a compression 2017-05-26 12:04:35 -07:00
seefo
cc57d28ccc Made requested changes to PR10554 2017-05-26 11:49:43 -07:00
Brad Davis
f663573f19 Fix compressed KTX loading 2017-05-26 11:25:15 -07:00
Anthony Thibault
84901ba94b Merge pull request #10542 from druiz17/arm-pucks 
Added pucks calibration for upper arm/shoulders
 2017-05-26 11:17:15 -07:00
Liv
2808ab4865 Sort of making progress on torus vertex buffer 2017-05-26 10:45:29 -07:00
seefo
90d5b2a6d4 Removed SoundProcessor's dependence on Sound objects 2017-05-26 10:32:34 -07:00
seefo
74f0ac5b78 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-26 09:13:20 -07:00
Liv
06a5467b50 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-05-26 09:10:50 -07:00
Dante Ruiz
d317d9236f made requested changes 2017-05-26 16:40:21 +01:00
Clément Brisset
efe72e1b85 Merge pull request #10530 from Atlante45/fix/default-scripts 
Ensure user never loses its running scripts
 2017-05-25 18:33:11 -07:00
seefo
0e4fbe01dc Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-25 17:04:03 -07:00
seefo
32b5ac5020 Moved audio asset processing to a separate thread 2017-05-25 16:10:53 -07:00
Sam Gateau
5b0d2f32b4 Merge pull request #10458 from jherico/ktx_validation 
Add KTX validation routines
 2017-05-25 16:02:23 -07:00
Liv
10408a0fe4 basic circle function to be used as base for torus 2017-05-25 15:32:49 -07:00
Seth Alves
3c90177421 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 15:14:14 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
Brad Davis
aa5aba428a PR feedback 2017-05-25 15:03:39 -07:00
Zach Fox
6616a85be0 Merge pull request #10534 from zfox23/fixCollisionSignalEmission 
Fix collision signal emission for static objects
 2017-05-25 14:43:07 -07:00
Andrew Meadows
971855e6bf add asserts to catch dangling pointers sooner 2017-05-25 14:29:14 -07:00
Brad Hefta-Gaub
54bca1e53d Merge pull request #10551 from Atlante45/fix/infinite-loop 
Prevent Infinite loop in FBXReader
 2017-05-25 14:25:06 -07:00
Dante Ruiz
6687b99391 Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-25 21:59:18 +01:00
Andrew Meadows
c22e4ef883 rename method to clarify where it is called 2017-05-25 13:48:19 -07:00
Andrew Meadows
5378cbead6 make ObjectMotionState dtor virtual 2017-05-25 13:47:03 -07:00
Ryan Huffman
f0c3a0ac28 Fix SendQueue not updating lastReceiverResponse when recv handshake ack 2017-05-25 13:39:47 -07:00
Liv
fee26c3976 Remove not yet implemented comment from Cone shape 2017-05-25 13:12:08 -07:00
Liv
ffbe39df0a Refactor to add optional conical parameter to existing extrude polygon function 2017-05-25 13:06:24 -07:00
samcake
cba913c068 Fixing the case when the bound changes without the rest of the properties 2017-05-25 13:01:54 -07:00
Zach Fox
f2fab57187 Update conditional to handle 'other unowned' case 2017-05-25 13:01:40 -07:00
Zach Fox
b86b07c08f Pull out ownership bidding changes 2017-05-25 13:01:40 -07:00
Zach Fox
be39874999 Changes after discussion with Brad 2017-05-25 13:01:40 -07:00
Zach Fox
f6195cdb1e Committing checkpoint changes, then testing 2017-05-25 13:01:40 -07:00
Zach Fox
0ef507c037 Revert 'dynamicChanged' to be a 'misc' physics property 2017-05-25 13:01:40 -07:00
Zach Fox
acd85b379f Make this PR a protocol change 2017-05-25 13:01:40 -07:00
Zach Fox
4d791211ee Make the changes - big thanks to Andrew! 2017-05-25 13:01:40 -07:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Atlante45
ea870881ee Log warning when we detect a connection loop 2017-05-25 12:48:21 -07:00
samcake
6dbbd6c8d0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-25 11:25:46 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Seth Alves
3823ece153 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1 change some code to look at head-controller position rather than hmd position 2017-05-25 10:50:41 -07:00
Atlante45
babae456d2 Fix infinite loop in fbx reader 2017-05-25 10:42:33 -07:00
Clément Brisset
aa4059eb05 Merge pull request #10503 from birarda/bake-textures 
update baking tool to enable compression and re-baking
 2017-05-25 10:38:23 -07:00
Liv
362e08a90d Add extrudePolygon for cylinder 2017-05-25 10:23:28 -07:00
Brad Davis
65c4d31676 Merge pull request #10543 from jherico/mip_data_crash 
Do not allow divide by zero on assigning mip data
 2017-05-25 09:30:27 -07:00
Brad Hefta-Gaub
a0484c5f0b Merge pull request #10544 from birarda/bug/refresh-access-token 
require a valid access token and expiry to attempt token refresh
 2017-05-25 08:35:18 -07:00
Brad Hefta-Gaub
ca87b792de Merge pull request #10531 from Atlante45/fix/current-address 
Never store an address with an empty host
 2017-05-25 08:33:16 -07:00
Brad Hefta-Gaub
23af6294ab Merge pull request #10521 from sethalves/fix-locked-in-motion 
if something is locked but in motion, make it kinematic rather than static
 2017-05-25 08:32:30 -07:00
Brad Hefta-Gaub
5af95c8fdf Merge pull request #10476 from sethalves/fix-imported-children-querybox 
fix up queryAACubes before sending imported entities to server
 2017-05-25 08:29:23 -07:00
Brad Hefta-Gaub
756e00e9a9 Merge pull request #10502 from kencooke/audio-noisegate-new 
Advanced noise gate
 2017-05-25 08:21:49 -07:00
volansystech
a2851b5bcb Put proper comments and indentation. 2017-05-25 18:47:59 +05:30
volansystech
8d51be644d Merge branch 'master' into 21255 2017-05-25 17:48:48 +05:30
volansystech
1f24e38585 Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift. 2017-05-25 14:56:06 +05:30
Sam Cake
3eb95d2d19 cleaning the commented code 2017-05-25 01:16:45 -07:00
Stephen Birarda
d7b3ee9bcb check for cached ATP assets in right place 2017-05-24 19:22:44 -07:00
Stephen Birarda
a04fc41e17 don't capture strong pointer to stat tracker 2017-05-24 17:54:07 -07:00
Stephen Birarda
c37fd335e1 track the number of local socket changes 2017-05-24 17:41:52 -07:00