Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 21:12:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70303 commits 25 branches 0 tags 1.1 GiB
Commit graph

70303 commits

This branch
This branch
All branches
Author SHA1 Message Date
amantley
bac9d195be working on the hand blend alphas, something is wrong with the print out 2018-08-03 17:56:49 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
amantley
76b182f03b added the hmd strafe to the rig code 2018-08-03 12:12:01 -07:00
amantley
096cb0db81 working on strafe left and right transitions 2018-08-02 13:32:06 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
amantley
6b2c67e5bd more doug support 2018-08-01 18:22:51 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
Simon Walton
6f1487bbf8 Don't explicitly use data method of shared node pointer 2018-08-01 17:11:26 -07:00
Simon Walton
d7a49ee594
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources 
Raise POSIX descriptor-limit in AC Monitor if necessary
 2018-08-01 17:07:33 -07:00
Zach Fox
7905c91289
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing 
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
 2018-08-01 14:23:26 -07:00
John Conklin II
e321ee0cb6
Merge pull request #13721 from misslivirose/tutorial-rc-70 
Update bubble context for RC 71
 2018-08-01 13:14:24 -07:00
John Conklin II
f02e91806c
Merge pull request #13686 from huffman/fix/undo-create-entity 
Fix added entities not being undoable in Create
 2018-08-01 13:11:17 -07:00
John Conklin II
c444bb11ba
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit 
Avatarapp: base 'SquareLabel' on button from Uit
 2018-08-01 13:10:33 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
John Conklin II
082a3bca89
Merge pull request #13679 from ElderOrb/FB16840 
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
 2018-08-01 11:46:59 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352 
Fix HMD.mountedChanged() API signal
 2018-08-01 11:28:11 -07:00
John Conklin II
bda9ed7f1a
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix 
use 'light' color scheme
 2018-08-01 11:23:10 -07:00
John Conklin II
c67ef57ad3
Merge pull request #13713 from hyperlogic/bug-fix/leg-ik-bug-fixes-master 
Leg IK fixes
 2018-08-01 11:17:10 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue 
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
 2018-08-01 11:15:32 -07:00
Simon Walton
9d42a6e08f Change method name per coding standards 2018-08-01 10:37:28 -07:00
Thijs Wenker
50dfb4dd55
Merge pull request #13681 from ctrlaltdavid/M19690 
Fix ParticleEffect entity JSDoc
 2018-08-01 19:31:54 +02:00
Thijs Wenker
c562a6945d
Merge pull request #13671 from huffman/fix/create-copy-follows-user 
Fix duplication not working as expected on grabbed entities
 2018-08-01 19:25:33 +02:00
Simon Walton
b18c1f0e1e Use defined value for invalid sequence number 2018-08-01 10:10:45 -07:00
David Back
1b031ff065
Merge pull request #13703 from dback2/editHandleTriggerValues 
Edit handles trigger fixes
 2018-08-01 10:00:16 -07:00
Ryan Huffman
6369cee0d1 Fix added entities not being undoable in Create 2018-08-01 09:40:29 -07:00
Simon Walton
ed75fe673e Replace int+bool with single atomic int 2018-07-31 18:28:14 -07:00
amantley
02dd2f4f28 added velocity scaling for forward and back 2018-07-31 18:26:44 -07:00
Anthony J. Thibault
fd780845bb Code review feedback 2018-07-31 18:25:04 -07:00
David Back
e8068fea0a block selecting overlays with other hand 2018-07-31 17:18:35 -07:00
Liv Erickson
acf1afea01 fix audio files playing swapped input, trying to amplify audio playback 2018-07-31 15:41:59 -07:00
Thijs Wenker
003e826d60 move over definition so it could be linked in the assignment-client too 2018-08-01 00:23:34 +02:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -07:00
Ryan Huffman
bbdc7ba380 Fix Uuid null comparison and dangling comma in Create tool 2018-07-31 13:57:27 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
Thijs Wenker
74343c71d8 CR fixes 2018-07-31 22:29:53 +02:00
Alexander Ivash
6e6eae2160 Avatarapp: base 'SquareLabel' on button from Uit 2018-07-31 22:03:34 +03:00
David Back
ad9ec26781 print 2018-07-31 11:53:17 -07:00
David Back
7bf7663f09 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 11:51:26 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
Ryan Huffman
431cbf2694
Merge pull request #13699 from thoys/fix/create/triggerable 
MS16809: handle both triggerable and wantsTrigger in CreateApp
 2018-07-31 10:34:31 -07:00
John Conklin II
09d1964f1d
Merge pull request #13670 from ElderOrb/animate_get_more_avatars 
Avatarapp: hover animation for 'get more avatars' button
 2018-07-31 09:51:58 -07:00
John Conklin II
16940cc9b7
Merge pull request #13716 from r3tk0n/17170-flying-crash 
Remove deprecated flying setting from MyAvatar.cpp saveData()
 2018-07-31 09:48:01 -07:00
David Back
93335feba1 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 09:46:57 -07:00
John Conklin II
8e277758ad
Merge pull request #13700 from danteruiz/fix-grabbing-problem 
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
 2018-07-31 09:46:57 -07:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963 
Support rendering of 'about' URLs in web entities
 2018-07-31 09:44:31 -07:00
John Conklin II
221dd3ee88
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes 
FB16992 - Layout changes to the two lightboxes in the Avatar app
 2018-07-31 09:36:16 -07:00
David Back
03f0116b79 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 09:28:14 -07:00
Simon Walton
8c512ec19b Send spherical view from Interface rather than creating in ES 2018-07-30 18:03:45 -07:00
Liv Erickson
9ec14c1f0d update bubble context for RC 71 2018-07-30 18:03:26 -07:00
Seth Alves
1b47d3f274
Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities 
Revert "Allow empty web entities to be rendered"
 2018-07-30 15:24:17 -07:00