NissimHadar
|
4f5895cb16
|
Added MD file to autoTester.
|
2018-04-03 13:17:37 -07:00 |
|
samcake
|
2dc4630e68
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-04-03 12:55:21 -07:00 |
|
samcake
|
efd2b2720b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-03 12:46:10 -07:00 |
|
Seth Alves
|
a1ce9481bb
|
Merge pull request #12739 from druiz17/fix-mapping-mistake
map flying down back to C key
|
2018-04-03 12:39:46 -07:00 |
|
Seth Alves
|
5f13df4102
|
Merge pull request #12722 from druiz17/fix-entities-outline
fix ContextOverlayInferface highlighing unspecified entities.
|
2018-04-03 12:29:19 -07:00 |
|
Seth Alves
|
249a97b5d0
|
don't move or rotate children if a parent is being changed by the same action
|
2018-04-03 12:14:59 -07:00 |
|
Seth Alves
|
08b7326bd1
|
when moving a group of selections, don't move a child if a parent is being moved
|
2018-04-03 12:14:40 -07:00 |
|
Cristian Luis Duarte
|
cbf13c9f8c
|
Merge remote-tracking branch 'hifi/master' into android_jump
|
2018-04-03 16:12:17 -03:00 |
|
Cristian Luis Duarte
|
1ea056a8a9
|
Android - Initial Jump button implementation
|
2018-04-03 16:07:40 -03:00 |
|
Alexander Ivash
|
ccea3efe1e
|
FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links
|
2018-04-03 21:43:40 +03:00 |
|
Sam Gateau
|
987aa40783
|
Merge pull request #12566 from jherico/bindless
Bindless Textures
|
2018-04-03 10:14:12 -07:00 |
|
samcake
|
5bfaa84258
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-03 09:16:07 -07:00 |
|
John Conklin II
|
53a5261905
|
Merge pull request #12712 from zfox23/newUpdateCertLocation
Fix cert location for content sets; handle .content.zip content sets
|
2018-04-03 09:10:11 -07:00 |
|
David Rowe
|
ab55f20976
|
Fix text sizing per text3d overlay lineHeight property
Makes text size correct for multiple lines of text.
|
2018-04-03 16:54:07 +12:00 |
|
David Rowe
|
63603ff97c
|
Fix window height reported by Window.geometryChanged() signal
|
2018-04-03 14:21:15 +12:00 |
|
Sam Gateau
|
2afd5f9813
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-02 19:11:02 -07:00 |
|
samcake
|
54e2ad06b8
|
GOing over the jet lib ui and the nightmare that is the js/qml family
|
2018-04-02 17:59:28 -07:00 |
|
samcake
|
077b2dab30
|
Code review fixes
|
2018-04-02 16:09:43 -07:00 |
|
Seth Alves
|
71d6dbf9bf
|
allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree
|
2018-04-02 15:52:28 -07:00 |
|
samcake
|
5a1eac563b
|
Code review fixes
|
2018-04-02 15:50:18 -07:00 |
|
John Conklin II
|
9dcef996c5
|
Merge pull request #12684 from vladest/assetserver_wrong_dialog
Fix invalid message if cancel adding asset to AssetServer
|
2018-04-02 15:28:46 -07:00 |
|
David Rowe
|
ab8ee20960
|
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
|
2018-04-03 10:00:19 +12:00 |
|
John Conklin II
|
74ca98dc81
|
Merge pull request #12727 from amantley/triggerRecenterBehaviour
Trigger Avatar Recenter Behaviour
|
2018-04-02 14:42:21 -07:00 |
|
Zach Fox
|
1f3063193a
|
Tweak right-click to inspect
|
2018-04-02 14:24:51 -07:00 |
|
samcake
|
d4bc61fb3d
|
Remove notifications and print outs for LOD changes because it was too much noise
|
2018-04-02 13:53:30 -07:00 |
|
John Conklin II
|
796bd069b2
|
Merge pull request #12659 from alexiamandeville/script_charcontroller
Updating char controller
|
2018-04-02 13:24:15 -07:00 |
|
Brad Davis
|
14ea168ab3
|
Merge remote-tracking branch 'upstream/master' into bindless
|
2018-04-02 13:13:28 -07:00 |
|
Zach Fox
|
5441767442
|
Better cert display
|
2018-04-02 12:22:41 -07:00 |
|
Zach Fox
|
7f3e9547cc
|
Handle the case when metaverse returns error for certificateInfo
|
2018-04-02 11:55:10 -07:00 |
|
John Conklin II
|
7ba05e3a5b
|
Merge pull request #12653 from vladest/bubblu_button_blink_fix
Bubble button blink fix
|
2018-04-02 11:12:12 -07:00 |
|
Dante Ruiz
|
a9a53c7d64
|
make resquested changes
|
2018-04-02 10:51:39 -07:00 |
|
Anthony Thibault
|
dc9c9fd0ee
|
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping
Reduce avatar elbow fluttering by disabling pole vectors
|
2018-04-02 10:51:28 -07:00 |
|
John Conklin II
|
aceb3d13b4
|
Merge pull request #12749 from samcake/rc66-mirror
RC66: Fix crash on Macos when looking at a mirror or when secondary camera is enabled
|
2018-04-02 10:16:04 -07:00 |
|
Sam Gateau
|
dada0b9024
|
Exploring better task job config api that work
|
2018-04-02 01:09:35 -07:00 |
|
Sam Gateau
|
9e2295525d
|
merging with upstream workload after it s been updated with master
|
2018-03-31 13:31:20 -07:00 |
|
Sam Gateau
|
cb2e41f2d0
|
Merge pull request #12752 from samcake/upstream-workload
Update Upstream workload branch with upstream master
|
2018-03-31 12:49:28 -07:00 |
|
samcake
|
59a081bcdb
|
merge with upstream
|
2018-03-30 18:08:38 -07:00 |
|
Andrew Meadows
|
59abc1d5b5
|
DRY sendBid() and sendUpdate()
|
2018-03-30 17:04:31 -07:00 |
|
Sam Gateau
|
8178ee7f34
|
Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror
|
2018-03-30 17:00:11 -07:00 |
|
Sam Gateau
|
d5496d68fd
|
FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly
|
2018-03-30 16:58:41 -07:00 |
|
Andrew Meadows
|
766077204e
|
fix typo inside assert()
|
2018-03-30 16:35:16 -07:00 |
|
Seth Alves
|
e8a62d2943
|
Merge pull request #12740 from druiz17/fix-scope
Fix name conflict with c++ class and qml file(master)
|
2018-03-30 15:41:42 -07:00 |
|
Dante Ruiz
|
4b7e2cb331
|
made requested changes
|
2018-03-30 15:15:17 -07:00 |
|
Dante Ruiz
|
16749df83a
|
fix highlighting edge case
|
2018-03-30 14:14:13 -07:00 |
|
Livi Erickson
|
799963a009
|
fix syntax based on CR feedback
|
2018-03-30 13:50:46 -07:00 |
|
Liv Erickson
|
810930ff23
|
handle correct first time settings
|
2018-03-30 13:50:46 -07:00 |
|
Liv Erickson
|
ec0874be1a
|
fix for edit preferences not persisting
|
2018-03-30 13:50:46 -07:00 |
|
Dante Ruiz
|
c99676b510
|
atlernate fix for selected entities
|
2018-03-30 13:44:54 -07:00 |
|
Andrew Meadows
|
a924bd4eb0
|
set correct _bidPriority on first ownership update
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
5a5376c3d5
|
untangle 'bidding' from 'owned'
|
2018-03-30 13:18:32 -07:00 |
|