Andrew Meadows
0d92e2de0a
remove bits from other-avatar collision mask
2018-08-01 11:21:54 -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
NissimHadar
49821e37fb
Merge branch 'exportToTestRail' of https://github.com/NissimHadar/hifi into exportToTestRail
2018-08-01 09:26:16 -07:00
NissimHadar
bb737f5b1e
Merge branch 'master' of https://github.com/highfidelity/hifi into exportToTestRail
2018-08-01 09:21:34 -07:00
Dante Ruiz
478bb88c69
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-01 08:48:15 -07:00
NissimHadar
36d131592d
WIP
2018-07-31 22:23:10 -07:00
Simon Walton
ed75fe673e
Replace int+bool with single atomic int
2018-07-31 18:28:14 -07:00
Anthony J. Thibault
fd780845bb
Code review feedback
2018-07-31 18:25:04 -07:00
Simon Walton
6f61642cb0
Call setFinished() if script engine hasn't started up
2018-07-31 18:10:49 -07:00
NissimHadar
121f5e0129
Set window modality in UI files.
2018-07-31 17:58:11 -07:00
NissimHadar
431db7c40f
Added new window for Runs (not used yet).
2018-07-31 17:47:55 -07:00
David Back
e8068fea0a
block selecting overlays with other hand
2018-07-31 17:18:35 -07:00
NissimHadar
0cf10a649f
WIP - implementing creation of TestRail runs.
2018-07-31 16:25:13 -07:00
Simon Walton
5a92032bdd
ThreadedAssignment::stop no longer deprecated
2018-07-31 16:14:00 -07:00
Simon Walton
ecfba312ef
Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent
2018-07-31 15:54:54 -07:00
Simon Walton
33a46a6a82
Make ThreadedAssignment::setFinished() protected
2018-07-31 15:46:43 -07:00
Liv Erickson
acf1afea01
fix audio files playing swapped input, trying to amplify audio playback
2018-07-31 15:41:59 -07:00
Simon Walton
d991dd230f
Remove call to aboutToFinish from AssetServer
2018-07-31 15:39:38 -07:00
Simon Walton
64fc3e1091
ThreadedAssignment calls virtual stop() upon domain disconnect
2018-07-31 15:30:33 -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
NissimHadar
3f91c55223
Corrected window title.
2018-07-31 15:20:43 -07:00
Zach Fox
4b41804326
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
2018-07-31 14:52:01 -07:00
Dante Ruiz
0b7d6cb720
start interstitial page work
2018-07-31 14:10:19 -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
NissimHadar
b3c84408d0
oopsy
2018-07-31 13:49:39 -07:00
NissimHadar
22953e6ab0
Fixed appearance of dual tests.
2018-07-31 13:48:17 -07:00
NissimHadar
87e7eb78a8
Corrected links to MD files.
2018-07-31 13:30:30 -07:00
Clement
3a140145ae
Fix angleBetween potential NaN return value
2018-07-31 13:30:13 -07:00
Thijs Wenker
74343c71d8
CR fixes
2018-07-31 22:29:53 +02:00
NissimHadar
453e84f0a5
Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail
2018-07-31 13:06:32 -07:00
NissimHadar
c98d43bb32
Problem = last test is created twice.
2018-07-31 13:06:04 -07: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
NissimHadar
3402d7836a
Added milestones to TestRail cases.
2018-07-31 11:17:53 -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
