SamGondelman
|
b5a2642b6a
|
updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
|
2018-12-22 00:55:10 -05:00 |
|
Sam Gondelman
|
097d2d9503
|
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
|
2018-12-20 16:53:33 -08:00 |
|
Shannon Romano
|
21ec4e0c53
|
Merge pull request #14524 from SamGondelman/NOverlays3
Case 20132, Case 16928: First class Image Entities
|
2018-12-20 21:20:49 +00:00 |
|
Shannon Romano
|
b6d1607acd
|
Merge pull request #14547 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities
|
2018-12-20 19:10:22 +00:00 |
|
Jeff Clinton
|
3d4311b7d4
|
Merge pull request #14613 from zfox23/MS20253_eventBridge
MS20253: Only emit screenChanged once screen has changed
|
2018-12-20 08:58:53 -08:00 |
|
Zach Fox
|
22c2954423
|
Merge pull request #14568 from zfox23/MS20187_itemTrash
Implement MS20187: Add trash can feature to Inventory
|
2018-12-19 18:19:29 -08:00 |
|
Zach Fox
|
b0ce3a54d5
|
Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash
|
2018-12-19 15:16:55 -08:00 |
|
Zach Fox
|
d0998174ff
|
Un-wear things when trashing them if worn
|
2018-12-19 15:16:48 -08:00 |
|
Zach Fox
|
46e00cf1b3
|
Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash
|
2018-12-19 15:03:36 -08:00 |
|
Wayne Chen
|
50d57e8b60
|
sending user to previous location on second launch
|
2018-12-19 12:37:08 -08:00 |
|
Sam Gondelman
|
e890fc6980
|
Merge branch 'master' into NOverlays3
|
2018-12-19 11:37:10 -08:00 |
|
Zach Fox
|
7fee0fc1e4
|
Fix MS20253: Only emit screenChanged once screen has changed
|
2018-12-19 09:50:52 -08:00 |
|
Zach Fox
|
116edcc224
|
I have no idea how this happened
|
2018-12-19 09:36:05 -08:00 |
|
Jeff Clinton
|
a7e7a2426e
|
Merge pull request #14538 from ElderOrb/FB19355
FB19355 - When I have avatar entities as children of my avatar, the A…
|
2018-12-19 09:09:54 -08:00 |
|
Jeff Clinton
|
c80b3dea52
|
Merge pull request #14611 from wayne-chen/fixScriptsNotBeingSaved-78
MS20356: Running Scripts list doesn't persist between Interface restarts
|
2018-12-19 08:52:40 -08:00 |
|
Jeff Clinton
|
16e3914cd7
|
Merge pull request #14598 from amantley/ripOutCruft
Fix for Camera-perspective-is-off-in-first-person-view, master branch
|
2018-12-18 17:15:58 -08:00 |
|
Zach Fox
|
f407042f3e
|
Quick polish fix to prevent UI flashing
|
2018-12-18 17:11:10 -08:00 |
|
Jeff Clinton
|
f51bdead20
|
Merge pull request #14606 from wayne-chen/fixFileLoginMenuButton
MS#20355: HMD persisting extra login windows
|
2018-12-18 17:04:46 -08:00 |
|
Wayne Chen
|
017eb9d1a3
|
adding fix for scripts not being saved
|
2018-12-18 16:32:44 -08:00 |
|
Wayne Chen
|
b82ba8c085
|
do nothing with file>login in login state
|
2018-12-18 12:51:01 -08:00 |
|
Jeff Clinton
|
2ff4905ed3
|
Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78
MS20352: Keep me logged in checkbox as on by default
|
2018-12-18 11:57:17 -08:00 |
|
Wayne Chen
|
b5c3d7c3ed
|
Merge pull request #14596 from wayne-chen/loginForSmallAvatars-master
MS20332: HMD Login Prompt-- small avatars cannot reach easily
|
2018-12-18 10:49:26 -08:00 |
|
Wayne Chen
|
50902080ce
|
fixing typos
|
2018-12-17 16:48:02 -08:00 |
|
Wayne Chen
|
816733b55f
|
reverting to master
|
2018-12-17 16:47:11 -08:00 |
|
Wayne Chen
|
302e314787
|
keep me logged in by default
|
2018-12-17 15:21:41 -08:00 |
|
Adam Smith
|
14ab53571f
|
Merge pull request #14564 from sabrina-shanman/hfm_prep
(case 20274) Create the HFM Preparation Step
|
2018-12-17 15:17:19 -08:00 |
|
amantley
|
3e1beb2dca
|
removed white space and stray semi colon
|
2018-12-17 15:05:51 -08:00 |
|
amantley
|
a81576f311
|
Merge remote-tracking branch 'upstream/master' into ripOutCruft
sync
|
2018-12-17 14:20:00 -08:00 |
|
Wayne Chen
|
5d89ed2a81
|
matching master
|
2018-12-17 13:46:55 -08:00 |
|
Wayne Chen
|
28fd1380df
|
adding target scale and default avatar to login state
|
2018-12-17 13:37:28 -08:00 |
|
Jeff Clinton
|
a5ae4081a5
|
Merge pull request #14588 from wayne-chen/loginInitiative2
MS20328: New login breaks nitpick
|
2018-12-17 10:14:09 -08:00 |
|
Wayne Chen
|
711457b2d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-12-17 09:12:29 -08:00 |
|
Angus Antley
|
77fa4e7d13
|
took out the unnecessary hfm.jointindex code
|
2018-12-16 17:29:16 -08:00 |
|
Wayne Chen
|
899918006f
|
fixing for autotester
|
2018-12-14 17:12:27 -08:00 |
|
Shannon Romano
|
78c9fb2b91
|
Merge pull request #14580 from wayne-chen/loginInitiative2
MS20319: fixing keyboard position offset
|
2018-12-15 00:51:03 +00:00 |
|
Shannon Romano
|
a89c53cc52
|
Merge pull request #14581 from zfox23/MS20308_unknownItems
Fix MS20308: Allow users to checkout uncertifiable items
|
2018-12-15 00:44:50 +00:00 |
|
Zach Fox
|
47a46c1d1b
|
Fix MS20308: Allow users to checkout uncertifiable items
|
2018-12-14 11:17:56 -08:00 |
|
Wayne Chen
|
befca68917
|
fixing keyboard position offset
|
2018-12-14 10:57:42 -08:00 |
|
Shannon Romano
|
131b53e4df
|
Merge pull request #14315 from wayne-chen/loginInitiative2
2nd initiative for encouraging login
|
2018-12-14 01:59:35 +00:00 |
|
Wayne Chen
|
e744f40d54
|
fixing url to login overlay
|
2018-12-13 16:43:12 -08:00 |
|
Wayne Chen
|
1d86f3816d
|
fixing build error
|
2018-12-13 15:43:42 -08:00 |
|
Wayne Chen
|
502de63d3f
|
fixing bug
|
2018-12-13 14:59:40 -08:00 |
|
Shannon Romano
|
3e10bea1ce
|
Merge pull request #14567 from davidkelly/dk/18639
Return more connections in pal
|
2018-12-13 22:48:00 +00:00 |
|
Wayne Chen
|
3806914e76
|
fixing variable names to match coding standard
|
2018-12-13 14:34:25 -08:00 |
|
Wayne Chen
|
0daa909192
|
more dev feedback
|
2018-12-13 14:25:52 -08:00 |
|
Wayne Chen
|
1ce7d8a31c
|
dev feedback
|
2018-12-13 13:47:07 -08:00 |
|
Wayne Chen
|
34130778ec
|
fixing merge bug
|
2018-12-12 18:41:28 -08:00 |
|
Wayne Chen
|
4116f6ca9a
|
Merge branch 'master' into loginInitiative2
|
2018-12-12 18:00:07 -08:00 |
|
Jeff Clinton
|
5a81d8c093
|
Merge pull request #14453 from danteruiz/keyboard-menus
Keyboard interaction menus
|
2018-12-12 17:53:59 -08:00 |
|
Wayne Chen
|
a2ebb67cd5
|
dev feedback/fixing keyboard in profile creation
|
2018-12-12 17:33:22 -08:00 |
|