Brad Davis
bccc06d2fe
Fix resource texture memory usage tracking
2017-04-19 10:35:19 -07:00
Chris Collins
889b054085
Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations
...
Fix Entities.setLocalJointTranslations
2017-04-19 09:32:28 -07:00
druiz17
57f6529ce6
Merge pull request #10239 from druiz17/edit-model
...
Fix issue of tablet proxy not choose the correct root
2017-04-19 09:19:46 -07:00
David Rowe
00b6b2a2c0
Implement desktop recordings browser dialog
2017-04-19 12:34:59 +12:00
samcake
5af171f69f
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-04-18 17:08:02 -07:00
samcake
63fe579022
simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'
2017-04-18 17:05:40 -07:00
Dante Ruiz
1cf9485143
fixed compile issue
2017-04-19 00:23:05 +01:00
Brad Davis
2a2102c7fe
Recompute memory pressure state after each promote / demote call
2017-04-18 15:12:34 -07:00
Dante Ruiz
ce8dba21a0
fix tablet proxy choosing wrong root
2017-04-18 22:49:43 +01:00
Dante Ruiz
5cd4007aaa
got input recording working
2017-04-18 21:53:23 +01:00
kunalgosar
ffdbc12968
copy into new vector
2017-04-18 12:20:03 -07:00
Seth Alves
0807e036e8
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-18 11:59:23 -07:00
Seth Alves
21ca767b7c
remove setPosition and setRotation for actions because they were never finished and never used.
2017-04-18 11:59:16 -07:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -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
kunalgosar
06c5fa0585
correctly resizing blendshapes vector
2017-04-18 11:44:59 -07:00
kunalgosar
d215856b23
cleanup to blendshapes
2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258
setBlendshapes will presist
2017-04-18 11:44:59 -07:00
samcake
f8a59aa255
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-18 11:04:16 -07:00
David Rowe
dae6d6fb69
Stub desktop dialog to select recording to play from ATP assets
2017-04-18 11:43:42 +12:00
Dante Ruiz
cd095915ef
removed emacs junk file from my repo
2017-04-18 00:32:30 +01:00
Dante Ruiz
6d44cd4d1e
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-18 00:18:55 +01:00
Dante Ruiz
c298886896
hooking up the input playback
2017-04-18 00:17:14 +01:00
Zach Fox
e13000410e
Whoops
2017-04-17 11:02:27 -07:00
druiz17
4bf3fa56f8
saving work
2017-04-16 21:26:09 -07:00
Seth Alves
fbd4677a9a
add a way to set hinge-constraint motor speed from javascript
2017-04-15 21:10:02 -07:00
Seth Alves
b4ff3a8691
don't destroy and recreate constraints when reinserting rigid body
2017-04-15 21:08:59 -07:00
Seth Alves
d42970d480
fix hinge-constraint constructors to use otherAxis
2017-04-15 08:51:08 -07:00
Sam Cake
61ed5c3ce9
THank you mac
2017-04-15 01:35:28 -07:00
Sam Cake
2b97171061
Avoiding temp variable reference to appease mac and fixing a warning
2017-04-15 01:06:01 -07:00
Sam Cake
038d01ce04
Avoiding temp variable reference to appease mac and fixing a warning
2017-04-15 00:45:50 -07:00
Sam Cake
96960a505d
COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side
2017-04-14 23:22:45 -07:00
Seth Alves
41fb05ecf7
bump protocol version
2017-04-14 16:26:54 -07:00
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Seth Alves
f08fecbfa7
make sure new constraint data gets transmitted over network
2017-04-14 16:25:27 -07:00
David Rowe
2731c13a5c
Merge remote-tracking branch 'upstream/master' into 21249
2017-04-15 09:51:16 +12:00
Seth Alves
708008d8a5
cleanups
2017-04-14 13:43:48 -07:00
Sam Gateau
3519a72f8a
Merge pull request #10190 from samcake/ambient-bis
...
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Seth Alves
07b23b8235
expose other hinge-constraint parameters to javascript
2017-04-14 13:28:25 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110
avatar-action-far-grab works now
2017-04-14 12:44:54 -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
Stephen Birarda
7b48feca66
address code review comments
2017-04-14 11:53:53 -07:00
Seth Alves
b1dc5be316
make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar
2017-04-14 11:48:06 -07:00
Sam Cake
f991475004
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-14 11:33:21 -07:00
Seth Alves
2dab3069da
fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.
2017-04-14 11:06:40 -07:00
Seth Alves
f5a5369055
attempt to remove dynamics associated with a rigid-body before removing the rigid-body
2017-04-14 07:06:53 -07:00
Seth Alves
52aee63e05
keep track of objectDynamics per rigidBody
2017-04-14 06:08:58 -07:00
Sam Cake
bb15b8c701
ANd fixing the gl41 rendering
2017-04-14 00:46:41 -07:00
Sam Cake
29545f0918
FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend
2017-04-13 23:53:56 -07:00
David Rowe
c2d8755b15
Merge branch 'master' into 21249
2017-04-14 15:32:45 +12:00
Seth Alves
afa8fc161b
allow hinge constraint between two entities
2017-04-13 15:37:28 -07:00
Andrew Meadows
e364b8d33e
avatar-mixer resends to avoid stale avatar
2017-04-13 13:35:59 -07:00
Seth Alves
7695d2ac05
put the protocol version back to what's in master, for now
2017-04-13 11:29:40 -07:00
Sam Cake
3b385772c3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-13 09:51:27 -07:00
Sam Cake
78bfc006f1
Prototyping the ResourceBuffer with the DrawBounds Job, yeah
2017-04-13 00:51:02 -07:00
samcake
d41f34ce8d
Adding support for the resource buffer
2017-04-12 19:07:27 -07:00
Seth Alves
1ab3a1eb60
bump entity-protocol version
2017-04-12 16:36:04 -07:00
Seth Alves
9b12956909
formatting
2017-04-12 16:34:34 -07:00
Seth Alves
0eb9507a10
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:25:50 -07:00
Brad Davis
b2aa3271f7
Adding support for variable allocated textures to the GL 4.1 backend
2017-04-12 15:09:20 -07:00
Andrew Meadows
e64e2614e3
Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter
...
Kinect hand filter
2017-04-12 14:27:05 -07:00
Seth Alves
507f658a5f
update comment
2017-04-12 07:37:41 -07:00
Seth Alves
9f252f04e7
cleanups
2017-04-12 07:25:23 -07:00
Seth Alves
53cb192af1
fixed names of pivot and axis
2017-04-12 07:22:27 -07:00
Seth Alves
cc77fce95f
hinge is sort-of working
2017-04-12 07:12:05 -07:00
Seth Alves
2b0315645c
actions work again
2017-04-11 21:11:03 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
David Rowe
0d9e0ebfec
Merge branch 'master' into 21249
2017-04-12 08:45:01 +12:00
Chris Collins
b07ed13023
Merge pull request #10184 from druiz17/snapshot-fix
...
snapshot bug fixes
2017-04-11 13:00:46 -07:00
Chris Collins
c86acfafef
Merge pull request #10120 from huffman/feat/stick-default-avatar
...
Change default avatar to ball and stick avatar
2017-04-11 12:56:25 -07:00
samcake
5daf365784
Avoiding warning maybe
2017-04-11 12:15:30 -07:00
Chris Collins
3a603e7ced
Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject
...
change handling of life-time of TabletProxy QObjects
2017-04-11 11:53:47 -07:00
Zach Fox
6569de697d
Merge pull request #10187 from zfox23/fix/getAvatar_Fix
...
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
samcake
612acbc6d5
Avoid pointers on temp var
2017-04-11 10:56:58 -07:00
Seth Alves
077a4fe4ae
change handling of life-time of TabletProxy QObjects
2017-04-11 10:56:47 -07:00
samcake
79bcf95792
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-11 10:00:34 -07:00
druiz17
b7daf8c80b
Merge pull request #10191 from sethalves/fix-collision-hull-munging
...
fix -- munge collision-hull at last minute rather than store munged url as a property
2017-04-11 09:09:54 -07:00
Dante Ruiz
d823093ddb
fixed merge conflict
2017-04-11 16:58:25 +01:00
Seth Alves
bf16309917
Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002
...
avoid invisible avatars redux
2017-04-11 07:07:03 -07:00
Seth Alves
938fab6f59
Merge pull request #10061 from humbletim/fix-cached-ResourceCache
...
Fix cached ResourceCache::prefetch() state updates
2017-04-11 07:04:06 -07:00
Seth Alves
b99959c73d
munge collision-hull at last minute rather than store munged url as a property
2017-04-11 07:00:22 -07:00
Sam Cake
1dd98af1dd
And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue)
2017-04-11 01:21:45 -07:00
Sam Cake
80c781bcdc
Fixing warning on mac and more description of the Task class
2017-04-10 22:17:12 -07:00
Stephen Birarda
db6fc40277
fix ScriptAvatar promotion of AvatarData
2017-04-10 22:15:45 -07:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Stephen Birarda
6c49db0f1b
add missing include for qScriptRegisterMetaType in Agent
2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a
add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts
2017-04-10 22:15:45 -07:00
Zach Fox
0aa1e633fe
Fix overrides and warnings (finally?)
2017-04-10 22:15:45 -07:00
Zach Fox
2561d38d93
Fix GCC warning
2017-04-10 22:15:45 -07:00
Zach Fox
04792bf3bc
Typo fix.
2017-04-10 22:15:45 -07:00
Zach Fox
16be0ca70c
Birarda's CR changes
2017-04-10 22:15:44 -07:00
Zach Fox
1984d5bc0c
Cleanup
2017-04-10 22:15:44 -07:00
Zach Fox
3832abffee
Almost theregit add -A
2017-04-10 22:15:44 -07:00
Zach Fox
4489c34e84
I'm on fire
2017-04-10 22:15:44 -07:00
Zach Fox
5edd5d2b30
It's working...it's workinggit add -A!
2017-04-10 22:15:44 -07:00
Zach Fox
a16e261735
Checkpoint before a number of confusing changes
2017-04-10 22:15:44 -07:00
Zach Fox
297da90118
Semicolons lol
2017-04-10 22:15:44 -07:00
Zach Fox
bc75ff4462
Checkpoint
2017-04-10 22:15:44 -07:00
Zach Fox
177445c371
Does this work?
2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac
move audio loudness to AvatarData, change AvatarData to ScriptOwnership
2017-04-10 22:15:44 -07:00
Zach Fox
1ed53113a9
Commit for birarda - testing QSharedPointer instead; doesn't work right now
2017-04-10 22:15:44 -07:00
Zach Fox
6ddd7a612c
Initial pass at fix looks promising
2017-04-10 22:15:44 -07:00
Ryan Huffman
af11f5f327
Update avatar mixer packet version for stick+ball avatar
2017-04-10 21:27:47 -07:00
Sam Cake
5d7accca2b
Avoiding the mac compilation problem maybe
2017-04-10 21:12:00 -07:00
samcake
4a47737d0b
REfining the Config behavior, trying to pr next
2017-04-10 19:01:49 -07:00
Stephen Birarda
602d65a71a
Merge pull request #10001 from birarda/cleanup-ebp
...
cleanup EncodeBitstreamParams to use nodeData when possible
2017-04-10 15:54:30 -07:00
Ryan Huffman
8463fffc8c
Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures
...
Revert "fix relative/absolute path handling for external FBX textures"
2017-04-10 15:30:40 -07:00
Seth Alves
b9afcd3f0a
Merge pull request #10178 from sethalves/fix-compound-collision-hulls
...
Fix compound collision hulls
2017-04-10 15:28:48 -07:00
Stephen Birarda
e86db26224
Revert "fix relative/absolute path handling for external FBX textures"
2017-04-10 14:31:02 -07:00
Seth Alves
8a3a52cbcf
make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool
2017-04-10 13:54:24 -07:00
Seth Alves
6bd841857f
added a comment
2017-04-10 13:50:36 -07:00
Dante Ruiz
e0f19944bc
Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix
2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8
finished allowing to go back to previous app
2017-04-10 20:58:10 +01:00
Seth Alves
05bf1930ca
Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame
...
Added accessor to get Avatar default pose in avatar space
2017-04-10 12:55:02 -07:00
David Rowe
0a19b502fd
Merge branch 'master' into 21249
2017-04-11 07:04:05 +12:00
Andrew Meadows
e20fcca959
Merge pull request #10179 from jherico/avatar_rendering
...
Creating new avatar rendering library, prepping for crowd rendering project
2017-04-10 11:29:08 -07:00
Bradley Austin Davis
0ca0874c52
Creating new avatar rendering library, prepping for crowd rendering project
2017-04-10 10:55:04 -07:00
Seth Alves
717436e0fd
use QUrl rather than just munging the url with a string-append
2017-04-10 10:54:30 -07:00
Seth Alves
554b23357c
add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls
2017-04-10 10:14:36 -07:00
samcake
16e6f0900d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-10 10:12:23 -07:00
Seth Alves
36940b4dfe
revert commit that broke sendToScript
2017-04-10 09:11:23 -07:00
Sam Cake
e7fb18bd2f
MOving forward with the TaskConcept and TaskModel, all working
2017-04-10 02:51:19 -07:00
Sam Cake
a458828590
MOving forward with the TaskConcept and TaskModel, all working
2017-04-10 02:30:13 -07:00
Seth Alves
0ae8a20b53
Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls
2017-04-09 18:08:02 -07:00
Seth Alves
a1cab2c0d1
working toward fixing compound hulls
2017-04-09 17:23:56 -07:00
David Rowe
6896fe3ac6
Merge branch 'master' into 21249
2017-04-10 09:05:57 +12:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
Brad Hefta-Gaub
0d4649ded8
Merge pull request #10079 from jherico/entity_thread_safety
...
Thread safety for property getter/setters on entities
2017-04-07 19:01:07 -07:00
samcake
e6844f4294
Cleaning up the basic jobs of render
2017-04-07 18:35:27 -07:00
Dante Ruiz
86c67a3017
tablet pages
2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb
Merge pull request #10153 from druiz17/goto-fix
...
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
Seth Alves
8d00f0ab8f
allow obj reader to either combine meshes or keep parts separate
2017-04-07 15:59:01 -07:00
David Rowe
ebe3561582
Merge branch 'master' into 21249
2017-04-08 10:46:16 +12:00
Anthony J. Thibault
a06df1a400
Bug fix for passing quats from script to C++ via the animationStateHandler
2017-04-07 14:13:00 -07:00
Seth Alves
03065ee6c8
Merge pull request #9938 from kunalgosar/jsRenderBug
...
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
samcake
58cec3fb96
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-07 11:55:08 -07:00
Andrew Meadows
662c34c266
fix avatar scale animation and avatar render debug
2017-04-07 11:06:16 -07:00
Andrew Meadows
b9c7d6351f
Merge pull request #10135 from samcake/ambient
...
Rename render::PendingChanges to render::Transaction
2017-04-07 09:54:10 -07:00
samcake
f82310545c
Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65""
2017-04-07 02:03:58 -07:00
samcake
ab3d39951e
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:31 -07:00
samcake
ac9b181786
Merge pull request #10157 from samcake/brown
2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b
Introducing a fix to the graphics bug
2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32
Introducing a fix to the graphics bug
2017-04-07 01:03:07 -07:00
Triplelexx
27a404d0ea
remove extra lines
2017-04-07 07:09:18 +01:00
Triplelexx
279997d905
change display plugin to deactivate when window minimized
2017-04-07 06:49:28 +01:00
samcake
aae7349c40
trying to understand the bug with nvidia new driver
2017-04-06 18:31:03 -07:00
samcake
cb94e1009d
Adding a job...
2017-04-06 18:10:28 -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
samcake
0254c3372f
Merge pull request #10143 from jherico/ktx_crash
...
Don't crash if KTX file is invalid
2017-04-06 16:28:19 -07:00
Al Bernstein
de1fdfacca
made requested changes in PR10147
2017-04-06 16:18:40 -07:00
David Rowe
68901c8af5
Merge branch 'master' into 21249
2017-04-07 11:04:43 +12:00
Chris Collins
4e9e3cccea
Merge pull request #10116 from birarda/bug/rel-ext-textures
...
fix relative/absolute path handling for external FBX textures
2017-04-06 15:58:02 -07:00
Dante Ruiz
22521526ec
removed stray space
2017-04-06 23:41:30 +01:00
David Rowe
0400e5a1f2
Report error status in setMapping() callback
2017-04-07 10:31:52 +12:00
Seth Alves
b1a015affd
Merge pull request #10117 from huffman/fix/unlock-propagation
...
Fix entity "unlock" edits not being propagated to clients
2017-04-06 15:28:05 -07:00
samcake
6fc965072c
Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer
2017-04-06 15:19:55 -07:00
Dante Ruiz
a89081601c
fix merge issues
2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3
Merge pull request #10103 from vladest/master-qml-bugfixes
...
Master qml bugfixes
2017-04-06 14:22:06 -07:00
Chris Collins
494c8d868e
Merge pull request #10126 from samcake/brown
...
Fixing the rendering of Image3D overlay when drawn in the scene
2017-04-06 13:40:09 -07:00
samcake
158084369a
Merge branch 'ambient' of https://github.com/samcake/hifi into ambient-bis
2017-04-06 11:34:35 -07:00
samcake
19d080c4cc
Merging
2017-04-06 11:33:41 -07:00
samcake
91f315f9ce
Adding the concept of selection to the scene
2017-04-06 11:27:48 -07:00
David Kelly
34a2cefb98
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
...
initial analytics for connections
2017-04-06 10:45:39 -07:00
samcake
b8cb79113e
Nitpicking on the correct name maybe...
2017-04-06 10:30:24 -07:00
Brad Davis
057a9feaf1
Don't crash if KTX file is invalid
2017-04-06 10:09:57 -07:00
David Rowe
5676364aec
Fix missing return value in Recording.saveRecordingToAsset()
2017-04-06 18:50:15 +12:00
samcake
3de760abcb
Introduucing the tag to the scene
2017-04-05 18:35:06 -07:00
Anthony Thibault
be2fdd9388
Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
...
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
Stephen Birarda
e4021c168e
add special handling for abs drive letter paths from windows
2017-04-05 16:52:22 -07:00
Dante Ruiz
90f5d02c99
goto toggle option
2017-04-06 00:13:53 +01:00
samcake
8267db6ce5
Add a description of the Transaction class
2017-04-05 14:19:00 -07:00
samcake
026e7bc249
Add a description of the Transaction class
2017-04-05 14:17:26 -07:00
samcake
5629cf425e
Cleaning up the files updated
2017-04-05 13:49:07 -07:00
samcake
309c6b8d9b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-05 13:11:12 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
Seth Alves
384f404602
Merge pull request #10109 from mittens/21240
...
OBJ Loader Rewrite to Support Multiple Materials
2017-04-04 15:56:44 -07:00
Brad Davis
15f7e895aa
More thread safety
2017-04-04 15:09:21 -07:00
Stephen Birarda
70eada0f76
replace backslashes in parsed fbx relative filepaths
2017-04-04 15:01:18 -07:00
Stephen Birarda
0b57b98970
change readFBX calls to use QUrl where possible
2017-04-04 14:53:14 -07:00
Stephen Birarda
137e73cf21
check absolute path before relative path
2017-04-04 14:42:03 -07:00
Stephen Birarda
0a7100e2d8
pass URLs to readFBX, not just URL path
2017-04-04 14:34:10 -07:00
Brad Davis
cd7c1643a3
More thread safety
2017-04-04 14:03:30 -07:00
Stephen Birarda
4e07a6a865
add new logic for absolute texture paths in FBX
2017-04-04 14:02:00 -07:00
Brad Davis
54200c03a7
Fixing deadlock
2017-04-04 13:53:49 -07:00
samcake
8b4696f4ec
Merge and solve conflicts
2017-04-04 13:28:03 -07:00
samcake
6385a702cd
FIxing the bug for image3D overlay drawn in scene
2017-04-04 12:56:43 -07:00
kunalgosar
19ab7526d3
apply profile to relevant entities
2017-04-04 11:54:21 -07:00
samcake
b18d82bd19
adding different shaders for transparent for simpel
2017-04-04 11:50:38 -07:00
Stephen Birarda
b9783d768e
remove fileOnUrl since it is no longer used
2017-04-04 11:08:30 -07:00
Anthony J. Thibault
c58fdb590a
Fix for sliding feet when leaning in HMD mode.
2017-04-04 11:00:34 -07:00
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -07:00
Brad Davis
fe84232ab4
More work on thread safety
2017-04-04 10:50:56 -07:00
Brad Davis
d89104f69c
Use getters instead of direct member access
2017-04-04 10:50:55 -07:00
Brad Davis
03c6275268
more thread safety
2017-04-04 10:50:54 -07:00
Brad Davis
172fab6789
Thread safety for property getter/setters on entities
2017-04-04 10:50:53 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1
Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings
2017-04-04 16:59:09 +02:00
trent
362ffba117
Fixes to OBJReader.cpp style inconsistencies.
2017-04-03 21:54:19 -04:00
samcake
a882beb2fd
Trying to fix the overlay Image3D shading pipeline used
2017-04-03 17:35:28 -07:00
Brad Davis
9942770761
Merge pull request #10105 from samcake/ambient
...
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 17:04:56 -07:00
trent
5cc87ccc4a
Fixed warning for subtly-stupid unused variable.
2017-04-03 19:38:34 -04:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Ryan Huffman
b9fffc10f8
Fix entity "unlock" edits not being propagated to clients
...
The lastEditedBy property was not being updated when changing the locked
property of entities from true to false.
2017-04-03 15:51:19 -07:00
Stephen Birarda
d4112f0e36
use full relative filepath for texture caching/referencing
2017-04-03 14:57:02 -07:00
trent
bec46747dd
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-04-03 16:46:36 -04:00
trent
2991332652
Rewrote the OBJ reader (again) to use FBXMeshPart instead of separate meshes. Works now! Multi-material support win.
2017-04-03 16:46:22 -04:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
samcake
c3c73b209a
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 11:49:00 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Vladyslav Stelmakhovskyi
990e1379e3
Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task
...
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi
7318ec468b
Fixed warning QObject::connect: No such signal Desktop_QMLTYPE_217::sendToScript(QVariant)
...
(cherry picked from commit ef4bea2cd4811364e65baec2c48ce2205a0e2cb3)
2017-04-03 19:33:41 +02:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
David Rowe
405e8cfc9e
Fix typo noticed in passing
2017-04-02 12:58:24 +12:00
Chris Collins
6fe210da66
Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login
...
fix login-screen for hmd+tablet
2017-03-31 17:17:30 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
Seth Alves
3cd134d138
fix login-screen for hmd+tablet
2017-03-31 16:41:21 -07:00
Andrew Meadows
0181783290
Merge pull request #10064 from samcake/ambient
...
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
2017-03-31 16:04:00 -07:00
samcake
467ea787c6
Adress Seth's review
2017-03-31 14:54:00 -07:00
Howard Stearns
0c07003768
Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars
...
Avoid invisible avatars
2017-03-31 13:48:41 -07:00
samcake
c8970dd704
Fixing the warning on windows
2017-03-31 11:34:03 -07:00
samcake
6a0c07a692
Fixing a bad counter for numFaces
2017-03-31 10:39:13 -07:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
Sam Cake
61d78bc931
BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things
2017-03-30 23:29:37 -07:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
samcake
47e9668b8f
improving the gl41 backend to mimic the gl45
2017-03-30 17:59:59 -07:00
Seth Alves
9ef4d01772
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-30 17:00:07 -07:00
trent
e9035a1efb
More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine.
2017-03-30 19:10:15 -04:00
trent
c5bb419bd1
Fixed OBJ reader crash, did not fix OBJ reader not working properly.
2017-03-30 18:16:55 -04:00
samcake
25edb44b75
Fix the problem with the cursor and scattering,
2017-03-30 15:15:14 -07:00
trent
864184a107
wip OBJ loader rewrite; wip because it crashes.
2017-03-30 17:11:40 -04:00
trent
5bf3da9a7f
Restoring hifi version of the OBJ files to get rid of my debug nonsense.
2017-03-30 16:14:42 -04:00
trent
dd2ed559b6
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-03-30 16:13:28 -04:00
samcake
26000288d7
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-30 11:45:12 -07:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
Seth Alves
36ad3af48e
attempt to avoid a hang on shutdown
2017-03-30 11:35:24 -07:00
David Kelly
e66c075f8e
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-30 10:14:29 -07:00
samcake
73a8ec3e72
Merge pull request #10068 from kencooke/audio-debugbuild-fix
...
Fix the crash in Debug builds
2017-03-30 10:12:37 -07:00
David Kelly
348674a267
Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
...
bad serialization of Avatar Entity parentID
2017-03-30 10:12:19 -07:00
Ken Cooke
69863dd735
Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*
2017-03-30 08:52:04 -07:00
humbletim
d02fd06305
mark joint translations dirty
2017-03-30 07:45:18 -04:00
Sam Cake
1c9bc2d71e
Trying to debug the crash on gl4.1
2017-03-29 23:28:06 -07:00
samcake
5584853340
Keep on cleaning
2017-03-29 18:22:21 -07:00
Anthony J. Thibault
d47c040768
Vive: Expose all 16 tracked poses to the controller system.
...
This is in preparation for the Vive hockey puck trackers...
2017-03-29 18:15:29 -07:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
humbletim
6f2f1d6452
call finished() when cached resource has already failed to load
2017-03-29 19:42:19 -04:00
