samcake
|
e8cdee71ed
|
avoid assertion on mac
|
2017-02-03 22:49:41 -08:00 |
|
samcake
|
3108360094
|
Merge branch 'blue' of https://github.com/samcake/hifi into purple
|
2017-02-01 16:36:40 -08:00 |
|
samcake
|
f34f1312ab
|
Few fixes
|
2017-02-01 15:53:49 -08:00 |
|
samcake
|
6bdf50f2db
|
moving mip map gen to cpu
|
2017-02-01 15:16:37 -08:00 |
|
samcake
|
23af56c41f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-02-01 09:27:21 -08:00 |
|
David Kelly
|
f25bbc9649
|
Merge pull request #9574 from howard-stearns/delete-failed-entity-adds
cleanly log failed entity adds, and tell the client to delete his copy
|
2017-02-01 10:12:17 -07:00 |
|
Brad Hefta-Gaub
|
0c7a181d33
|
Merge pull request #9573 from birarda/bug/whitelist-starts-with
drop empty parts when splitting script whitelist
|
2017-02-01 07:38:02 -08:00 |
|
Brad Hefta-Gaub
|
0f4bc1a7c1
|
Merge pull request #9554 from birarda/bug/domain-settings-save-row
make table additions in DS settings more obvious
|
2017-02-01 07:10:19 -08:00 |
|
Seth Alves
|
e7ec651bb1
|
Merge pull request #9576 from hyperlogic/bug-fix/tablet-ui-image-urls
tablet-ui: button icon images now work with http urls.
|
2017-01-31 21:03:05 -08:00 |
|
Chris Collins
|
42098edbeb
|
Merge pull request #9561 from thoys/entity-simulation-owner-fixes
Fix simulation owned entities not to go to origin after cache reload (+ small priority fix)
|
2017-01-31 20:54:52 -08:00 |
|
Chris Collins
|
8b94e64082
|
Merge pull request #9539 from huffman/feat/tealight-entity-server
Add tealight.js entity server script
|
2017-01-31 20:51:19 -08:00 |
|
Anthony J. Thibault
|
3c04f54e75
|
more fixes to third person tablet usage.
|
2017-01-31 18:22:38 -08:00 |
|
Anthony J. Thibault
|
008a58f9d7
|
Only reposition the tablet when camera mode changes, in HMD mode.
|
2017-01-31 18:03:48 -08:00 |
|
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 |
|
howard-stearns
|
e42853a96c
|
cleanly log failed entity adds, and tell the client to delete his copy
|
2017-01-31 16:05:38 -08:00 |
|
Stephen Birarda
|
d4a161041e
|
drop empty parts when splitting script whitelist
|
2017-01-31 15:32:47 -08:00 |
|
Thijs Wenker
|
174a7ad5bd
|
Optimizations and style fixes from code review
|
2017-01-31 22:54:58 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
samcake
|
586db3405a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
|
2017-01-30 22:08:51 -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 |
|