Commit graph

50873 commits

Author SHA1 Message Date
Anthony J. Thibault
c147b9bec0 Fix for tablets in third-person HMD mode. 2017-01-31 18:00:18 -08:00
Stephen Birarda
f03d2988c1 fix for checkbox name setting 2017-01-31 17:30:45 -08:00
Anthony J. Thibault
cf855391af Added jsdocs for all button properties 2017-01-31 16:54:15 -08:00
Anthony J. Thibault
8f362861eb tablet-ui: button icon images now work with http urls. 2017-01-31 16:53:25 -08:00
Thijs Wenker
b9ba8b5d80 Readme fix, default AC parameters example
Six ACs is minimum required for a full stack, using the --min --max parameters will not out-date the documentation as quick
2017-02-01 01:28:06 +01:00
Faye Li
59aea60be0 fill confirmation modal with data of the selected user 2017-01-31 16:16:40 -08:00
howard-stearns
e42853a96c cleanly log failed entity adds, and tell the client to delete his copy 2017-01-31 16:05:38 -08:00
Faye Li
fda20694b3 jump to user confimation modal 2017-01-31 15:47:51 -08:00
Stephen Birarda
d4a161041e drop empty parts when splitting script whitelist 2017-01-31 15:32:47 -08:00
Seth Alves
1f01a7d276 Merge pull request #9572 from sethalves/tablet-ui
put tablet version of users.js into a different file
2017-01-31 14:45:12 -08:00
Seth Alves
3a6a7bcc8a put tablet version of users.js into a different file 2017-01-31 14:44:09 -08:00
Faye Li
06d797bb3b load bootstrao 2017-01-31 14:27:17 -08:00
Thijs Wenker
174a7ad5bd Optimizations and style fixes from code review 2017-01-31 22:54:58 +01:00
Anthony J. Thibault
e2e19884bb Tablet should work even when not connected to any domain.
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.

I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.

There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08:00
Seth Alves
645aad7bb0 Merge pull request #9557 from hyperlogic/tablet-ui
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Seth Alves
d835de2fec Merge pull request #9547 from druiz17/tabletBug
Grabbing tablet while in edit mode
2017-01-31 13:37:11 -08:00
Seth Alves
ec67cabaf5 Merge pull request #9540 from fayeli/new-users-js
Rework Users.js for Tablet
2017-01-31 13:36:53 -08:00
howard-stearns
18f8c2b866 comment 2017-01-31 13:31:33 -08:00
Brad Hefta-Gaub
2fc6b4b0af Merge pull request #9544 from humbletim/fix-rightclick-menu
Hide webview context menus when clicked
2017-01-31 13:03:50 -08:00
howard-stearns
8d8b338c66 dry up custom setters, per code review 2017-01-31 12:07:48 -08:00
Thijs Wenker
3608998877 use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership 2017-01-31 21:01:03 +01:00
Thijs Wenker
1a36d9a698 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-01-31 20:59:21 +01:00
samcake
c88d070868 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-01-31 11:49:25 -08:00
samcake
04d5173328 Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda
compute Model's local bounds outside pending changes queue
2017-01-31 11:40:21 -08:00
Thijs Wenker
e445af74aa Merge branch 'master' of https://github.com/highfidelity/hifi 2017-01-31 20:39:39 +01:00
Brad Hefta-Gaub
3bbb57599b Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
Stephen Birarda
79cb0ba074 fix keyboard behaviour for category tables 2017-01-31 11:05:57 -08:00
howard-stearns
1ddc804e10 Merge branch 'master' of https://github.com/highfidelity/hifi into accept-forced-physics-values 2017-01-31 10:58:49 -08:00
samcake
0b139c906c Assigniing default textures that make sense 2017-01-31 10:56:30 -08:00
Stephen Birarda
1474f22fd7 don't validate category inputs for empty 2017-01-31 10:55:42 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Brad Hefta-Gaub
485973368e Merge pull request #9549 from kencooke/audio-wasapi-leakfix
Fix memory-leak in Windows audio stack (audiodg.exe grows without bound)
2017-01-31 10:38:24 -08:00
Stephen Birarda
015aafe0fb make table additions in DS settings clearer 2017-01-31 10:36:16 -08:00
Brad Hefta-Gaub
c1834a033c Merge pull request #9563 from birarda/entity-script-server
avoid recursion to unchanged octree elements with frustumless queries too
2017-01-31 09:40:20 -08:00
Anthony J. Thibault
0f75668923 Moved Model setting of _spatiallyNestableOverride to constructor 2017-01-31 09:36:21 -08:00
Seth Alves
6db9e7a0cf Merge pull request #9393 from highfidelity/tablet-ui
Tablet UI
2017-01-31 09:16:59 -08:00
Seth Alves
2ffdc213a9 Merge pull request #9567 from sethalves/tablet-ui
Tablet ui
2017-01-31 08:58:33 -08:00
Seth Alves
7c2957cfa7 merge from upstream 2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098 Merge pull request #9267 from AndrewMeadows/report-all-collision-events
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Dante Ruiz
7a4a769015 fix more editing bugs 2017-01-31 16:53:57 +00:00
Brad Hefta-Gaub
459b2da6c3 Merge pull request #9558 from zfox23/FILTERS_FixFilters1
ENTITY FILTERS: Improve zone filter; maxVelocity filter; documentation
2017-01-31 08:52:49 -08:00
Brad Hefta-Gaub
6b97db66d5 Merge pull request #9458 from zzmp/audio/threaded-local
local audio bypass
2017-01-31 08:49:49 -08:00
Brad Hefta-Gaub
5287c94786 Merge pull request #9555 from huffman/fix/entity-is-child-of-crash
Fix Entities.isChildOfParent crashing if given unknown ID
2017-01-31 08:42:45 -08:00
Brad Hefta-Gaub
619bcdeed8 Merge pull request #9553 from huffman/fix/polyvox-import
Fix importing of PolyVox entities
2017-01-31 08:42:28 -08:00
David Kelly
8f924e338e Merge pull request #9564 from davidkelly/dk/2708
Require password verification in domain-server settings
2017-01-31 08:35:36 -07:00
Seth Alves
7d80679652 Merge pull request #9566 from sethalves/tablet-ui
Tablet ui
2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-31 05:02:07 -08:00
Brad Hefta-Gaub
87805fe4eb Merge pull request #9559 from Atlante45/fix/animation-jitter
Fix animation jitter
2017-01-30 20:27:21 -08:00
Clément Brisset
3d3e03ec8d Merge pull request #9562 from highfidelity/AlanZimmerman-patch-1-1
Fix label typo in help graphic
2017-01-30 17:20:40 -08:00
Ken Cooke
2ce357db3a Fix bug that causes GCC not to detect AVX2 2017-01-30 17:11:48 -08:00