David Rowe
|
8de93d9651
|
Fix typo noticed in passing
|
2017-05-30 15:53:58 +12:00 |
|
Seth Alves
|
a45b5599c9
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-19 17:37:03 -07:00 |
|
Clément Brisset
|
6e89f7d2f9
|
Merge pull request #10512 from Atlante45/fix/running-marker
Fix "Reset Settings" window poping up every time
|
2017-05-19 17:36:00 -07:00 |
|
Seth Alves
|
40c8261111
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-19 17:14:58 -07:00 |
|
Seth Alves
|
5c93dbd20d
|
be more careful about fixing up entities which arrived before their parents
|
2017-05-19 13:48:29 -07:00 |
|
Ryan Huffman
|
64bf5784e6
|
Fix FileStorage to not close files after they are opened
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
|
2017-05-19 11:16:20 -07:00 |
|
Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
Seth Alves
|
ec02887ae6
|
attempt to get imported entities into the correct octree-element
|
2017-05-18 13:20:44 -07:00 |
|
Brad Hefta-Gaub
|
fbc32e5ba1
|
Merge pull request #10485 from samcake/orange
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-18 08:47:58 -07:00 |
|
Brad Hefta-Gaub
|
014fd710de
|
Merge pull request #10490 from Atlante45/feat/settings-map
Enable Map/List storage in the settings
|
2017-05-17 21:24:04 -07:00 |
|
Zach Pomerantz
|
e8ab780899
|
include details in critical variantMap parsing error
|
2017-05-17 21:32:13 -04:00 |
|
Stephen Birarda
|
2ac5fbf91d
|
set wireless scan interval to -1
|
2017-05-17 15:33:52 -07:00 |
|
samcake
|
ab3ea65d54
|
Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-17 12:36:12 -07:00 |
|
Atlante45
|
0d77977936
|
Enable Map/List storage in the settings
|
2017-05-17 12:11:15 -07:00 |
|
Brad Hefta-Gaub
|
764bfe94f5
|
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
Feature/snap turn smoothing 21270
|
2017-05-16 21:05:38 -07:00 |
|
Brad Hefta-Gaub
|
254c6e9292
|
Merge pull request #10441 from Atlante45/feat/launch-sandbox
Launch the Sandbox as early as possible
|
2017-05-16 20:52:23 -07:00 |
|
Brad Hefta-Gaub
|
36c7821e1e
|
Merge pull request #10455 from ZappoMan/TriangleSetOptimizations
TriangleSet optimizations - ~80% improvement in Ray picking against models
|
2017-05-16 20:47:50 -07:00 |
|
Atlante45
|
201f81f20a
|
Don't wait on the sandbox
|
2017-05-16 14:41:57 -07:00 |
|
ZappoMan
|
149750fe21
|
make the octree sparse
|
2017-05-14 08:36:54 -07:00 |
|
ZappoMan
|
5065c7c5c4
|
more warning fixes
|
2017-05-13 10:17:59 -07:00 |
|
ZappoMan
|
da404ce2ce
|
fix warning
|
2017-05-13 09:29:32 -07:00 |
|
Vladyslav Stelmakhovskyi
|
49a45f0300
|
Merge branch 'master' into market-crash-fix
|
2017-05-13 14:23:26 +02:00 |
|
Vladyslav Stelmakhovskyi
|
20c27fc133
|
Fix crash on save Map data settings from scripts
|
2017-05-13 14:20:28 +02:00 |
|
ZappoMan
|
dcb70aa504
|
more cleanup
|
2017-05-12 19:03:08 -07:00 |
|
ZappoMan
|
4af3c760e6
|
more cleanup
|
2017-05-12 18:57:33 -07:00 |
|
ZappoMan
|
f1bd06cfa0
|
cleanup some unneeded class
|
2017-05-12 18:33:28 -07:00 |
|
ZappoMan
|
89b6a79f68
|
make sure to exit early if box intersection is already larger than best triangle intersection
|
2017-05-12 17:56:45 -07:00 |
|
ZappoMan
|
eb3b27849c
|
only keep one copy of Triangles
|
2017-05-12 17:07:47 -07:00 |
|
ZappoMan
|
ea8330e4e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations
|
2017-05-12 13:00:14 -07:00 |
|
Brad Hefta-Gaub
|
a88f72024d
|
Merge pull request #10243 from birarda/bake-textures
Add an internal tool for domain/model/skybox KTX texture baking
|
2017-05-12 12:26:33 -07:00 |
|
Clément Brisset
|
1658ced671
|
Merge pull request #10437 from Atlante45/feat/faster-startup
Use baked default skybox
|
2017-05-12 11:35:51 -07:00 |
|
Seth Alves
|
4aa683363c
|
back out previous changes, do compressionOptions.setPitchAlignment(4) instead
|
2017-05-11 16:22:12 -07:00 |
|
Atlante45
|
6378b96b4c
|
CR
|
2017-05-11 14:41:02 -07:00 |
|
Seth Alves
|
ac2bc39a27
|
try, try again
|
2017-05-11 14:10:03 -07:00 |
|
Seth Alves
|
a26f9c7887
|
make _size const
|
2017-05-11 13:36:05 -07:00 |
|
Atlante45
|
e0863aa50f
|
Only open files for write if necessary
|
2017-05-11 11:54:52 -07:00 |
|
Seth Alves
|
dfb9fecf17
|
pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts
|
2017-05-11 07:11:40 -07:00 |
|
Seth Alves
|
c9868640c1
|
force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D
|
2017-05-10 18:14:50 -07:00 |
|
ZappoMan
|
a15c5999b5
|
first cut at octree storage of Triangle Set
|
2017-05-10 16:58:51 -07:00 |
|
trent
|
a3545661dc
|
Merged hifi/master into this PR and resolved merge conflicts.
|
2017-05-09 15:09:53 -04:00 |
|
Andrew Meadows
|
2835a73c6b
|
Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
|
2017-05-08 18:17:16 -07:00 |
|
Andrew Meadows
|
a31a861e19
|
fix typo: physcis --> physics
|
2017-05-05 09:33:50 -07:00 |
|
Seth Alves
|
92966377fb
|
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-04 19:05:57 -07:00 |
|
Seth Alves
|
51cb579773
|
function to turn nestable-type into a string
|
2017-05-04 19:05:01 -07:00 |
|
Seth Alves
|
960bab6e4e
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-04 16:42:57 -07:00 |
|
Brad Davis
|
2d0bbf70ae
|
Migrate core avatar rendering functionality to library
|
2017-05-04 14:08:59 -07:00 |
|
Seth Alves
|
69944cc76d
|
add a way to get a SpatiallyNestable's name without knowing what its type is
|
2017-05-03 21:32:49 -07:00 |
|
trent
|
557a8fffd7
|
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
|
2017-05-02 19:56:47 -04:00 |
|
Brad Davis
|
425405f72d
|
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
more cleanup in preparation for moving Avatar class to lib
|
2017-05-02 10:37:22 -07:00 |
|
Anthony J. Thibault
|
2120e63e3a
|
Merge branch 'master' into feature/head-standard-action
|
2017-04-27 17:51:13 -07:00 |
|
Andrew Meadows
|
75b563d598
|
restore rendering of avatar receive stats
|
2017-04-27 13:16:50 -07:00 |
|
Andrew Meadows
|
442080dec7
|
remove unused RenderArgs::_cameraMode hack
|
2017-04-27 13:16:50 -07:00 |
|
Stephen Birarda
|
49e7ae6dbc
|
call image library for texture baking
|
2017-04-26 18:37:35 -07:00 |
|
Stephen Birarda
|
425385d982
|
leverage settings to remember paths used before
|
2017-04-26 18:37:35 -07:00 |
|
Ryan Huffman
|
60ba874e2e
|
Fix implementation of mutableData in non-File Storage classes
|
2017-04-26 18:02:23 -07:00 |
|
Ryan Huffman
|
8d03d50d35
|
Cleanup progressive ktx debugging
|
2017-04-26 10:48:57 -07:00 |
|
Ryan Huffman
|
20f4d14e07
|
Add compressed KTX size evaluation
|
2017-04-26 10:48:23 -07:00 |
|
Ryan Huffman
|
b20fcbfcdb
|
Add a way to write data to a storage object
|
2017-04-26 10:45:50 -07:00 |
|
Ryan Huffman
|
00cbfa0f70
|
Add start of progressive ktx-loading
|
2017-04-26 10:45:50 -07:00 |
|
Anthony J. Thibault
|
dc19f37726
|
input/controller routing thru skeleton model and rig.
|
2017-04-25 15:04:47 -07:00 |
|
Andrew Meadows
|
5a458c9923
|
remove last qApp usage from Avatar class
|
2017-04-18 11:52:21 -07:00 |
|
Andrew Meadows
|
685a01482c
|
remove Camera argument from Avatar::render()
|
2017-04-18 11:52:21 -07:00 |
|
Thijs Wenker
|
6f58e91d76
|
Merge pull request #10121 from birarda/bug/recording-cache
cleanup Agent RSI handling, make loadRecording async
|
2017-04-14 21:35:51 +02:00 |
|
Andrew Meadows
|
e64e2614e3
|
Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter
Kinect hand filter
|
2017-04-12 14:27:05 -07:00 |
|
Al Bernstein
|
c628b23895
|
removed whitespace
|
2017-04-06 17:21:58 -07:00 |
|
Al Bernstein
|
e737456dcd
|
used thread safe moving average for the quaternions
|
2017-04-06 16:56:03 -07:00 |
|
Al Bernstein
|
de1fdfacca
|
made requested changes in PR10147
|
2017-04-06 16:18:40 -07:00 |
|
samcake
|
5629cf425e
|
Cleaning up the files updated
|
2017-04-05 13:49:07 -07:00 |
|
samcake
|
6122155880
|
Renaming the PendingCHanges class to Transaction
|
2017-04-05 13:10:31 -07:00 |
|
Stephen Birarda
|
c7a28a527a
|
cleanup Agent recording handling, make loadRecording async
|
2017-04-04 10:56:25 -07:00 |
|
David Rowe
|
405e8cfc9e
|
Fix typo noticed in passing
|
2017-04-02 12:58:24 +12:00 |
|
Seth Alves
|
4516ddf855
|
Merge pull request #9847 from highfidelity/tablet-ui
Tablet ui
|
2017-03-28 14:48:02 -07:00 |
|
Seth Alves
|
1cf6945bf2
|
pass radials argument to AABox::touchesAAEllipsoid as const reference
|
2017-03-28 11:12:00 -07:00 |
|
Seth Alves
|
9789476a73
|
handle case where AAEllipsoid is entirely inside the AABox
|
2017-03-28 10:57:03 -07:00 |
|
Seth Alves
|
9e675d4c93
|
Merge pull request #9990 from hyperlogic/bug-fix/sliders
Added inputMode property to Web3DOverlay
|
2017-03-28 10:07:37 -07:00 |
|
Seth Alves
|
59da607d07
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-24 15:08:23 -07:00 |
|
Seth Alves
|
8f7f5efade
|
new javascript call: Model.newMesh()
|
2017-03-24 12:51:00 -07:00 |
|
Seth Alves
|
902e3d41d6
|
merge from upstream
|
2017-03-24 08:20:35 -07:00 |
|
Brad Hefta-Gaub
|
9a38b36f59
|
Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
|
2017-03-24 08:12:11 -07:00 |
|
Anthony J. Thibault
|
bab9890fea
|
Added inputMode property to Web3DOverlay.
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
|
2017-03-23 13:54:18 -07:00 |
|
Seth Alves
|
f5680def55
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-23 09:55:41 -07:00 |
|
Seth Alves
|
ff3fc244d1
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:53 -07:00 |
|
Seth Alves
|
df875ab504
|
make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches
|
2017-03-22 16:21:45 -07:00 |
|
Triplelexx
|
b7980569cc
|
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
|
2017-03-21 22:13:33 +00:00 |
|
Brad Davis
|
e482eac437
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-20 16:22:13 -07:00 |
|
Brad Davis
|
14c8c3f4db
|
Return existing textures when matching hash for a previously found live texture
|
2017-03-20 09:39:29 -07:00 |
|
Chris Collins
|
308c134119
|
Merge pull request #9686 from humbletim/21114-part3
CR 21114 -- Implement modules/require support into hifi
|
2017-03-20 06:22:35 -07:00 |
|
Seth Alves
|
424af2255b
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-19 21:17:30 -08:00 |
|
humbletim
|
758c07c7d4
|
Merge branch 'master' into 21114-part3
|
2017-03-16 14:29:17 -04:00 |
|
humbletim
|
366c90ef6a
|
add Q_ASSERT to IS_THREADSAFE_INVOCATION
|
2017-03-16 01:28:50 -04:00 |
|
samcake
|
0399249a03
|
Expeand the wireframe to the primitive entities and the polyvox
|
2017-03-15 16:58:31 -07:00 |
|
Seth Alves
|
b5919d89a5
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-15 08:26:10 -08:00 |
|
Brad Davis
|
eab91d061d
|
Merge pull request #9868 from zzmp/ktx/local-not-roaming
Use Local for WIN32 FileCache
|
2017-03-13 15:52:11 -07:00 |
|
Brad Davis
|
3bef5ad528
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-13 14:30:25 -07:00 |
|
Zach Pomerantz
|
808973d7d2
|
use QStandardPaths instead of hardcoded paths
|
2017-03-13 17:26:42 -04:00 |
|
Zach Pomerantz
|
172a638ef0
|
move resource paths to PathUtils
|
2017-03-13 17:26:34 -04:00 |
|
Andrew Meadows
|
546f32431d
|
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
|
2017-03-13 11:52:16 -07:00 |
|
Brad Hefta-Gaub
|
a38965d628
|
add more audio stats
|
2017-03-11 09:50:30 -08:00 |
|
Brad Davis
|
399270d243
|
Still trying to fix OSX build
|
2017-03-08 09:03:59 -08:00 |
|
Bradley Austin Davis
|
62fcd238ae
|
Fix shared pointer usage in storage abstraction
|
2017-03-08 09:03:58 -08:00 |
|