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
Stephen Birarda
1b1ae48650
don't recurse on octree elements that have not changed
2017-01-30 17:01:45 -08:00
Alan Z
6e7260207f
Fix label typo in help graphic
...
fixes #2748 in Fogbugz
2017-01-30 16:51:22 -08:00
Thijs Wenker
c3f9663ab0
- Fix for simulation owned entities moving to 0,0,0 after cache reload
...
- Fix for simulation priority, use SCRIPT_GRAB_SIMULATION_PRIORITY in EntityItem::grabSimulationOwnership()
2017-01-31 01:25:59 +01:00
howard-stearns
fe8fe816f4
accept forced physics results from entity server (e.g., when filtered)
2017-01-30 16:14:40 -08:00
David Kelly
eaf033107c
Require password verification in domain-server settings
...
If you modify the security settings to use a username/password for
access to the domain server settings, we now have a second password
field which must match the first one you entered.
2017-01-30 17:13:13 -07:00
Zach Fox
18fd965c33
Add note about floats?
2017-01-30 16:07:43 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
samcake
249ec80d74
Writting a better version of the no texture case
2017-01-30 15:48:48 -08:00
Zach Fox
740a0add8a
Updates
2017-01-30 15:47:04 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
samcake
3c56bd2960
Adding support for disabling texturing from the material
2017-01-30 15:03:04 -08:00
Anthony Thibault
5a0990fbe4
Merge pull request #9550 from hyperlogic/tablet-ui2
...
tablet-ui -> master, PR feedback
2017-01-30 14:20:28 -08:00
Ryan Huffman
e58c9326a0
Fix Entities.isChildOfParent crashing if given unknown ID
...
If an entity was not in the local tree a null deref crash would occur.
This commit makes sure the entity pointer is checked for null before it is used.
2017-01-30 13:48:33 -08:00
Ryan Huffman
f553656e36
Fix importing of PolyVox entities
...
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
2017-01-30 13:33:42 -08:00
Dante Ruiz
b264d84385
minimize git diff
2017-01-30 13:27:25 -08:00
Dante Ruiz
57a9d34cda
minimize git diff
2017-01-30 13:27:25 -08:00
Dante Ruiz
8879727d88
ability to grab tablet in edit mode
2017-01-30 13:27:25 -08:00
druiz17
74085452b4
Merge pull request #9551 from hyperlogic/tablet-ui
...
Improved legibility of tablet in desktop mode.
2017-01-30 13:25:40 -08:00
Andrew Meadows
6ef4420f37
remove commented out cruft
2017-01-30 13:21:23 -08:00
Andrew Meadows
31861d3192
use inverted collision for B-A event
2017-01-30 13:21:23 -08:00
Andrew Meadows
aa8e7d27db
move depth filtering closer to source
2017-01-30 13:21:23 -08:00
Andrew Meadows
b5537304a3
more correct CONTINUE collision event filter
2017-01-30 13:21:23 -08:00
Andrew Meadows
2541bfb1a8
only create collision events for owned entities
2017-01-30 13:21:23 -08:00
Andrew Meadows
0809149a8c
harvest collision events before disowning
2017-01-30 13:21:23 -08:00
Andrew Meadows
2162a364a9
minor cleanup
2017-01-30 13:21:23 -08:00
Andrew Meadows
8cf7aee009
fix bug: second collision event with bad data
2017-01-30 13:21:23 -08:00
Andrew Meadows
b7cd8827f9
collision events for owned objects only
...
also: fewer entityID lookups for scripted collision sounds and events
2017-01-30 13:21:23 -08:00
Andrew Meadows
ed17c4fa16
fix an old typo about when to send collision event
2017-01-30 13:19:38 -08:00
