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
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702
...
FB16702 - Avatar App does not save Animation JSON Override URL
2018-07-30 14:51:32 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent
...
MS15184: Remove deprecated functions in Agent API
2018-07-30 14:48:10 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you
...
pal refresh fixes
2018-07-30 14:38:24 -07:00
David Rowe
b36b981b55
Merge branch 'master' into M19690
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
2018-07-31 08:41:32 +12:00
David Back
b420ef8cf2
fix trigger clicks on vive
2018-07-30 13:21:09 -07:00
Anthony J. Thibault
58f95bd07b
assert fix
2018-07-30 13:14:32 -07:00
David Back
bec54cc182
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
2018-07-30 12:26:48 -07:00
Brad Davis
c991053c93
Support rendering of 'about' URLs in web entities
2018-07-30 11:56:31 -07:00
Seth Alves
a6aaa71d02
Revert "Allow empty web entities to be rendered"
2018-07-30 11:54:52 -07:00
Anthony J. Thibault
6a6ece8910
Warning fixes and whitespace cleanup
2018-07-30 11:49:44 -07:00
r3tk0n
63de16bac5
Remove deprecated flying setting from MyAvatar.cpp saveData()
2018-07-30 11:40:15 -07:00
Anthony J. Thibault
401995fb06
Leg IK fixes
...
Fixes for raising legs and sometimes squatting while in HMD mode.
2018-07-30 10:55:52 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
Thijs Wenker
d486a0721d
Merge pull request #13698 from dback2/resetPropertiesNoSelection
...
Reset entity property fields when no selection
2018-07-30 19:37:12 +02:00
Dante Ruiz
0f46001f9a
remove redundent variable
2018-07-30 10:29:53 -07:00
Simon Walton
be1bbc07c2
Don't wait for (nonexistant) ES when in serverless mode
2018-07-30 10:20:55 -07:00
Dante Ruiz
4caf613269
making requested changes
2018-07-30 10:19:27 -07:00
David Back
398c530214
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
2018-07-30 10:18:19 -07:00
Seth Alves
32ec984f82
Merge pull request #13577 from dback2/invisibleWebEntities
...
Allow empty web entities to be rendered
2018-07-30 10:12:32 -07:00
Thijs Wenker
92efc1a3b5
style and memory leak fixes
2018-07-30 18:51:19 +02: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
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
