Andrew Meadows
48f28ecee7
Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion
...
Conflicts:
interface/src/Menu.h
interface/src/avatar/Avatar.cpp
2014-02-17 12:12:47 -08:00
ZappoMan
ab3e1af64d
fix the sometime voxels don't show when you move bug
2014-02-17 12:02:11 -08:00
Andrew Meadows
bca50a5b70
Split render options for head/body collision proxy
...
This makes the poor proxy shapes easier to see.
2014-02-17 11:23:01 -08:00
stojce
677e6f5ce9
windows build fix (2)
2014-02-17 20:19:35 +01:00
Andrew Meadows
d635ffaaba
Remove cruft: old avatar-avatar collision option
2014-02-17 10:40:32 -08:00
Andrew Meadows
6ce028bbab
Simplifiy API for camera mode transitions
...
Specify the "period" for the transition rather than the "rate".
2014-02-17 10:27:33 -08:00
stojce
2ba7426757
windows build fix
2014-02-17 19:25:53 +01:00
stojce
9e7597a6ad
bad merge fix
2014-02-17 19:06:55 +01:00
stojce
13485065a5
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-17 18:59:44 +01:00
Andrew Meadows
4848aa1d16
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-17 09:14:06 -08:00
Andrew Meadows
e4ef09e06d
Helper method for adding avatar collision submenu
2014-02-17 09:12:38 -08:00
matsukaze
32f0a81708
Backed out last change to recursion.
2014-02-17 00:27:24 -05:00
matsukaze
04b1c3e935
Fix occlusions between cousins. Recurse only to shouldRender or isLeaf voxel when inspecting for occlusions
2014-02-16 23:38:10 -05:00
matsukaze
1f7f4d2a22
Added id checking and remove try/catch
2014-02-16 23:25:06 -05:00
ZappoMan
dd0909659a
Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport
2014-02-16 19:20:06 -08:00
Philip Rosedale
37e1c00828
Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop
...
Automatically Adjust LOD
2014-02-16 18:14:24 -08:00
ZappoMan
d101f19e40
removed bounds properties from Overlay so it only lives in Overlay2D
2014-02-16 13:39:01 -08:00
ZappoMan
78f4df912d
added 3D line overlay support
2014-02-16 13:25:49 -08:00
Jose Carlos
73e0c0ccf5
Moving pow evaluation to const
2014-02-16 21:33:46 +01:00
ZappoMan
7c350b3acb
add 3D sphere overlay support
2014-02-16 12:30:15 -08:00
ZappoMan
5abf908874
added 3D cube overlay support
2014-02-16 11:36:06 -08:00
Jose Carlos
a8f1f9a00a
Added animation for fade out
2014-02-16 14:25:41 +01:00
ZappoMan
cb1c659e2e
fix windows
2014-02-15 21:25:20 -08:00
ZappoMan
ef11865d24
implement text overlay support
2014-02-15 21:13:44 -08:00
gaitat
e30cf33a03
Fix for Worklist Job #19503
...
Formatting errors
2014-02-15 23:04:58 -05:00
ZappoMan
0a9f9a7c7a
fix windows build
2014-02-15 19:20:08 -08:00
ZappoMan
37bb85fca6
tweaks to overlays
2014-02-15 19:15:30 -08:00
ZappoMan
f7f695d145
add support for detecting clicked on overlays
2014-02-15 17:45:42 -08:00
ZappoMan
1ddd856ca8
removed getProperties() which was not implemented
2014-02-15 16:31:09 -08:00
ZappoMan
f6adce255d
more work on image overlays
2014-02-15 16:26:34 -08:00
Jose Carlos
af48998cc7
Fixed position of display name: we take into account skeleton and head's height
...
Saved opengl state in renderDisplayName
Moved display data to AvatarData
Unified static chat function for chat and display name
2014-02-15 18:40:36 +01:00
gaitat
fcd44f5817
Fix for Worklist Job #19503
2014-02-15 08:16:05 -05:00
Andrzej Kapolka
3e40927d3a
More work on spanning objects.
2014-02-14 18:01:48 -08:00
gaitat
eee839f423
Merge branch 'master' of github.com:highfidelity/hifi
2014-02-14 20:12:39 -05:00
Andrew Meadows
2d1218d304
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-14 16:34:32 -08:00
Andrew Meadows
335141049c
Cleaning up collision check API's and re-enabling collisions with particles.
2014-02-14 16:33:19 -08:00
Andrew Meadows
b7352335f2
Adding collisions options to menu at a second location.
...
And adding CollideWithParticle option which will be working soon...
2014-02-14 16:31:53 -08:00
Jose Carlos
19cb20f0cd
Added rect around the display name with proper size, paying attention to
...
QFontMetrics data
Fully wired up the message sending and receiving from server
2014-02-15 01:05:21 +01:00
Andrzej Kapolka
5b1229e1d0
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-14 15:49:36 -08:00
ZappoMan
2eac9c293f
first working version of scriptable Overlays
2014-02-14 15:37:47 -08:00
Andrzej Kapolka
855bc19c5a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-14 15:36:13 -08:00
Andrzej Kapolka
af0d395751
Added sanity check for zero vertices.
2014-02-14 13:11:16 -08:00
Andrzej Kapolka
76142c92f2
Adjust offset when skipping parts that don't match the translucency setting.
...
Closes #2001 .
2014-02-14 13:04:17 -08:00
Jose Carlos
04c59b825e
merged from master
2014-02-14 20:52:22 +01:00
Andrzej Kapolka
8b3356f819
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-14 11:17:14 -08:00
Andrzej Kapolka
f4b47ea443
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-14 11:09:35 -08:00
ZappoMan
8e284a55b1
Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport
2014-02-14 10:50:35 -08:00
stojce
0ddc475928
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-14 18:30:54 +01:00
stojce
d5b87fbe8a
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-14 18:28:34 +01:00
gaitat
58e773340a
Worklist Job #19503
...
Exposing the average audio intensity to javascript through the MyAvatar
object.
2014-02-14 09:40:59 -05:00
ZappoMan
cd137b2b12
tweak to reload scripts
2014-02-13 21:00:20 -08:00
ZappoMan
9d841ce918
add Stop All Scripts and Reload All Scripts
2014-02-13 18:19:20 -08:00
Andrzej Kapolka
91fac4eebe
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 17:38:23 -08:00
Andrzej Kapolka
1afd3ab712
Fixes for OS X warnings.
2014-02-13 17:07:57 -08:00
Andrzej Kapolka
1fba28d45e
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
2014-02-13 16:51:44 -08:00
Andrzej Kapolka
b08d452749
Fix for head appearing at wrong position for a single frame.
2014-02-13 16:49:42 -08:00
Andrzej Kapolka
5f38c328d5
Removed debugging code.
2014-02-13 16:25:04 -08:00
Andrzej Kapolka
078b15c02d
Add some hysteresis on the LOD switching to prevent rapid switching back
...
and forth.
2014-02-13 16:20:43 -08:00
Jose Carlos
b899834c54
Show "displayname" in correct position
...
Show "displayname" when on mouse hover
Persistant displayname data
2014-02-14 00:23:21 +01:00
ZappoMan
601c155303
correctly lock arrays on init
2014-02-13 14:46:59 -08:00
ZappoMan
ed7fa6e311
added back setupNewVoxelsForDrawing() on changeTree()
2014-02-13 14:39:10 -08:00
ZappoMan
4fb5e68425
removed some debug
2014-02-13 14:33:23 -08:00
ZappoMan
caab3afb69
add menu item for auto adjust LOD
2014-02-13 14:26:30 -08:00
Andrzej Kapolka
ff01470850
Wait until each LOD level is actually requested before we start loading;
...
before a level is loaded, try to use the closest already-loaded level.
2014-02-13 14:25:01 -08:00
Andrew Meadows
50d864901e
Improved comment about limitation of collision check.
2014-02-13 14:02:25 -08:00
stojce
ab4164a6df
#19505 - Add domain & orientation parsing to hifi:// protocol handler
2014-02-13 22:44:10 +01:00
Andrzej Kapolka
684a43da64
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 13:40:17 -08:00
Andrzej Kapolka
6a39290bf5
Basic LOD switching based on distance to camera.
2014-02-13 13:37:29 -08:00
ZappoMan
3aba29b015
first working cut at recreateVoxelGeometryInView()
2014-02-13 13:26:31 -08:00
ZappoMan
cac67d7baa
add proper readWriteLocks around the VBO arrays to preven random triangles
2014-02-13 13:06:45 -08:00
Andrew Meadows
439cbe3f87
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Hand.h
interface/src/avatar/MyAvatar.cpp
2014-02-13 12:36:01 -08:00
Andrew Meadows
b75de42802
Making the lean recovery use more tuneable parameters.
2014-02-13 12:22:40 -08:00
Andrew Meadows
d9b50359a6
Hand-face collisions now work (sorta).
2014-02-13 12:21:28 -08:00
ZappoMan
e9259db944
Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop
2014-02-13 12:20:29 -08:00
stojce
08c8f47cd4
added SNAPSHOT_EXTENSION constant
2014-02-13 20:05:59 +01:00
ZappoMan
156fa6dc5a
more tweaks, removed old clouds
2014-02-13 11:03:35 -08:00
matsukaze
6c50491ee7
Fix compiler warnings on linux
2014-02-13 13:59:56 -05:00
ZappoMan
6d75efd2b0
tweaks to default menus for alpha, make Gravity false so we don't fall into abyss
2014-02-13 10:46:28 -08:00
Andrzej Kapolka
23169c098e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 10:27:36 -08:00
Andrzej Kapolka
9c91d3c2e7
Use the existing session stuff for metavoxels rather than a separate system.
2014-02-13 10:25:10 -08:00
Andrew Meadows
312bc7521f
Making arm restoration rate independent of FPS and easier to tune.
2014-02-13 10:04:58 -08:00
Andrew Meadows
9523ea7d03
Only do slaps for MyAvatar.
2014-02-13 10:03:39 -08:00
Andrew Meadows
e793c207f9
Minor whitespace removal.
2014-02-13 10:03:14 -08:00
stojce
fe6f5a341c
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-13 18:14:20 +01:00
stojce
e5072bc00f
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-13 18:12:40 +01:00
matsukaze
bf43db7c14
Merge remote-tracking branch 'upstream/master'
2014-02-13 11:37:53 -05:00
matsukaze
11a399ec82
Fix crash bug
...
Doh!! Renderer used before initialized.
2014-02-13 11:19:14 -05:00
matsukaze
0a7614ce21
Fix compiler warnings on linux
2014-02-13 11:18:10 -05:00
matsukaze
25f87093f2
Fixes for tyle conformance
2014-02-13 10:03:41 -05:00
ZappoMan
5ad74a04f1
Merge pull request #1989 from PhilipRosedale/master
...
Improved EditVoxels script, improve and cleanup noise reduction
2014-02-13 00:14:40 -08:00
Philip Rosedale
50df17dc10
fix windows build buster
2014-02-12 23:37:19 -08:00
Philip Rosedale
595eb38c72
comment out debug
2014-02-12 22:57:13 -08:00
Philip Rosedale
be7d1a5723
Adjustments to noise gate, commit to min sampling method
2014-02-12 22:53:46 -08:00
ZappoMan
20a6f4eea9
first cut at auto-LOD adjustment
2014-02-12 21:22:21 -08:00
Andrzej Kapolka
bb56e2847f
Global edits, edits use virtual function.
2014-02-12 20:00:07 -08:00
Philip Rosedale
3a807c1914
comment out debugging spam, improved EditVoxels
2014-02-12 17:57:52 -08:00
Andrzej Kapolka
5b207e4f8e
Work on creating new attributes.
2014-02-12 17:10:32 -08:00
Andrzej Kapolka
d6d95a586d
Working on deleting attributes.
2014-02-12 14:16:14 -08:00
stojce
0244ead5df
fixed glm::quat initialization
2014-02-12 21:06:30 +01:00
matsukaze
9e5c8b1634
Merging upstream master
2014-02-12 12:32:53 -05:00
stojce
f002cda1de
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-12 17:53:07 +01:00
Andrew Meadows
cc70e099bf
Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction
2014-02-12 08:31:05 -08:00
Andrew Meadows
04bc05cfe6
Moving hand-avatar collision trigger calls into MyAvatar
...
Also renaming some methods in Model to be more descriptive.
2014-02-12 08:29:22 -08:00
Philip Rosedale
0322c8b934
Added minimum sample counting method for noise reduction
2014-02-11 23:44:22 -08:00
Andrzej Kapolka
8206f8d2b3
Fixes for Windows. Compiles, but the license doesn't work yet.
2014-02-11 19:00:41 -08:00
ZappoMan
8e3e7c1537
first experimental cut at overlay image
2014-02-11 17:18:24 -08:00
stojce
83d1d54bc2
Merge branch 'master' of https://github.com/worklist/hifi into 19497
2014-02-12 02:13:04 +01:00
stojce
68584c654b
Allow drag-and-drop of snapshots into Interface
2014-02-12 02:12:52 +01:00
matsukaze
095f5292cd
Deprecated custom containers
2014-02-11 20:12:44 -05:00
Andrzej Kapolka
25066f8b4f
Starting on Visage integration.
2014-02-11 16:44:25 -08:00
matsukaze
5ce1b650e8
Replaced custom Queue with QStack
2014-02-11 19:27:05 -05:00
Andrzej Kapolka
9851d01411
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
2014-02-11 16:04:04 -08:00
Andrzej Kapolka
3b1b067418
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-11 16:03:41 -08:00
Andrzej Kapolka
e29d6210bb
Merge pull request #1981 from AndrewMeadows/avatar-interaction
...
Avatar body-body collisions
2014-02-11 16:02:43 -08:00
Andrew Meadows
66dc4e17ad
Fixing formatting to be KR
2014-02-11 15:59:35 -08:00
Jose Carlos
319d1f6795
Wired up the send of the display data to the servers
...
Added the renderDisplayName in Avatar
2014-02-12 00:54:50 +01:00
Andrew Meadows
6c4ecb0246
Splitting hand collisions between other avatars and ourself.
2014-02-11 14:38:31 -08:00
Andrzej Kapolka
edf8361cfc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-11 14:22:45 -08:00
Andrzej Kapolka
b6d77ec637
Switched from loading FBX and FST simultaneously to loading FST first, then
...
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model. Also fixed a bug with the fallback models (they were
invisible after second failure).
2014-02-11 14:20:52 -08:00
Andrew Meadows
3b3359abce
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-11 14:02:08 -08:00
Andrew Meadows
d0f9b78710
Adding avatar body-body collisions to prevent near-clipping.
2014-02-11 13:48:48 -08:00
ZappoMan
5688e22e6c
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-11 11:37:32 -08:00
stojce
9d58964fa8
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-11 19:25:19 +01:00
Andrew Meadows
887fa0c938
Only resolve our hand collisions that would not move the other avatar.
...
This helps us only penetrate the moveable parts of other avatars.
2014-02-11 09:23:40 -08:00
stojce
20026da6cd
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-11 18:14:42 +01:00
Andrew Meadows
861778347f
Fixing windows compile warnings about signed vs unsigned compare.
2014-02-11 08:54:40 -08:00
Andrew Meadows
ed610c0739
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-mouselook
2014-02-11 08:47:02 -08:00
Andrew Meadows
7840b351dd
Fix for #1968 : head does not roll
2014-02-11 08:43:56 -08:00
ZappoMan
07a2849b92
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 19:56:05 -08:00
Andrzej Kapolka
f9e9d62fe3
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-10 19:02:58 -08:00
Andrzej Kapolka
2071da2c8a
Provide a means to specify a fallback for when we fail to load a model. Also
...
added missing associated resources for default model. Closes #1960 .
2014-02-10 18:50:36 -08:00
Andrzej Kapolka
bbb8e2a45f
Ignore the =1's that Faceshift appends to our custom data in the FST.
2014-02-10 17:41:57 -08:00
ZappoMan
98211a832c
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 17:41:21 -08:00
ZappoMan
8b45e0e3a8
Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js
2014-02-10 17:34:35 -08:00
ZappoMan
991c72006c
moving the hydra grab behavior to JS
2014-02-10 17:25:14 -08:00
Andrew Meadows
8529858134
Remove experimental joining of hand-avatar and avatar-avatar collision logic.
2014-02-10 17:12:25 -08:00
Andrew Meadows
4edc6cd88b
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 15:42:56 -08:00
Philip Rosedale
ac9e2732b9
Merge pull request #1963 from birarda/authentication
...
default avatar head and body URLS
2014-02-10 15:42:53 -08:00
ZappoMan
8acb6d13d5
move hydra thrust and view code into JS example
2014-02-10 15:25:09 -08:00
Jose Carlos
665971c2ab
Merge remote-tracking branch 'upstream/master' into 19489
2014-02-10 23:56:10 +01:00
Jose Carlos
b42c2a9dbe
Centered text
2014-02-10 23:55:43 +01:00
stojce
38b5dbe4c3
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-10 23:53:01 +01:00
AndrewMeadows
c517675edb
Merge pull request #1931 from ey6es/master
...
Fix for textures on Blender FBX exports (such as jellyrob_blue_blender.fbx).
2014-02-10 14:27:44 -08:00
Andrew Meadows
e73c9f7095
It is now possible to "poke" moveable parts of the avatar skeleton.
2014-02-10 14:07:50 -08:00
Andrew Meadows
e2e02fc855
Removing bounding sphere measurement of hands -- not useful yet.
2014-02-10 14:04:32 -08:00
stojce
1ac583edca
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-10 22:57:55 +01:00
Stephen Birarda
3e90bcd523
use shorter default URLs, set as placeholder text in prefs
2014-02-10 11:28:22 -08:00
Stephen Birarda
712692f8bf
add fallback default URLs for head and body models
2014-02-10 11:15:35 -08:00
Stephen Birarda
27305c7a43
change default domain to root, don't double load domains on startup
2014-02-10 10:23:06 -08:00
Andrew Meadows
e5a700bf79
Fix crash -- use correct index.
2014-02-10 09:59:22 -08:00
Andrew Meadows
be1aaee359
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 09:05:08 -08:00
Andrew Meadows
10296577f4
More info when colliding with meshes + stubbery for poking avatar.
2014-02-10 09:02:29 -08:00
matsukaze
b1dd849a1a
Must drain the primitive construction queue during release
2014-02-10 09:03:53 -05:00
ZappoMan
bdf5c7a6b7
changed stopKeepLookingAt() to stopLooking()
2014-02-09 23:26:46 -08:00
ZappoMan
221a5c75c7
remove debug
2014-02-09 23:22:10 -08:00
matsukaze
a3ce69bcbb
Removed duplicate pathway to updateNodeInArrays from showAllSubTreeOperation
2014-02-10 01:44:27 -05:00
matsukaze
616ccd9172
Replaced iterator with const_iterator
2014-02-10 00:29:38 -05:00
ZappoMan
d5447452ae
more work on lookAt behavior
2014-02-09 21:06:32 -08:00
ZappoMan
c64a530be4
first cut at lookAt
2014-02-09 16:24:38 -08:00
Jose Carlos
4aa053befe
Constant size in 3D world billboard text
2014-02-09 23:59:51 +01:00
Jose Carlos
d05fb392e0
Always facing camera billboard
...
TODO: having constant fix size
2014-02-09 23:39:53 +01:00
ZappoMan
e35df7904b
cleanup bad merge
2014-02-09 12:32:12 -08:00
ZappoMan
fe1a6b8f29
improvements to rotating gesture detection
2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927
added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties
2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8
Merge branch 'master' of https://github.com/worklist/hifi into more_events
2014-02-09 10:32:14 -08:00
stojce
75ad4fdee9
Merge branch 'master' of https://github.com/worklist/hifi into 19494
2014-02-09 17:48:04 +01:00
stojce
b05967a514
Custom URL handler
2014-02-09 17:47:46 +01:00
Jose Carlos
128219b9f6
Merge branch '19489-2' into 19489
2014-02-09 15:51:07 +01:00
ZappoMan
d2b3e74f5d
added isPinching and isPinchOpening to touch events
2014-02-09 02:02:42 -08:00
Philip Rosedale
cfa7f5e6ca
Add drag to add more voxels, turn off hover orbit voxels until in the script as function key
2014-02-08 23:17:04 -08:00
Philip Rosedale
9655e93432
Remove re-coloring of voxels on hover or click, anticipating switch to scripted behavior
2014-02-08 19:13:43 -08:00
Philip Rosedale
c6bf11361e
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-08 16:52:28 -08:00
matsukaze
00e0ea9b0c
Use vector of primitives instead of associative map
2014-02-08 19:49:27 -05:00
Philip Rosedale
03bc5adf64
Add Audio Noise Reduction
2014-02-08 16:35:37 -08:00
matsukaze
18e219b5c0
Fixes for style conformance: tabs to spaces
2014-02-08 09:06:14 -05:00
matsukaze
61c48c525c
Fixes for style conformance: replace stl containers with Qt
2014-02-07 22:55:03 -05:00
matsukaze
ab0b7bba00
Fixes for style conformance: tabs to spaces
2014-02-07 22:52:08 -05:00
matsukaze
f15ddff7e0
Added new display mode to show culled faces.
2014-02-07 22:44:53 -05:00
matsukaze
984110790c
Added new display mode to show culled faces. More statistics.
2014-02-07 22:15:25 -05:00
ZappoMan
ef7dee4387
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
2014-02-07 18:34:43 -08:00
Andrew Meadows
6b2c7c556d
Fixing mouselook.
...
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
2014-02-07 17:46:14 -08:00
Andrew Meadows
8c3ba5b2de
Cruft removal. We don't use Head::YawRate stuff.
2014-02-07 17:45:25 -08:00
Andrew Meadows
3894fc0cb8
Minor comment change.
2014-02-07 17:44:43 -08:00
Jose Carlos
c957dcceb5
ADDED the fields in interface-preferences for display name editting
2014-02-08 02:21:00 +01:00
ZappoMan
802f72c732
more ray picking and intersection work
2014-02-07 15:06:32 -08:00
Andrzej Kapolka
a49ec2f11b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 14:45:03 -08:00
Andrzej Kapolka
f6ca042ffc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 14:33:25 -08:00
Stephen Birarda
a1a4a3db8a
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
2014-02-07 14:27:10 -08:00
Andrzej Kapolka
9c3624d0d9
Fix for texture on jellyrob_blue_blender.fbx; apparently you can map textures,
...
as well as materials, by polygon. Closes #1844 .
2014-02-07 14:25:48 -08:00
Stephen Birarda
dd4d944dea
ping inactive nodes in conjunction with domain server check in
2014-02-07 14:06:42 -08:00
Stephen Birarda
05f086ae74
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-07 13:48:28 -08:00
Stephen Birarda
455442088c
Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer
2014-02-07 13:45:14 -08:00
Stephen Birarda
3ad8e7260e
fix an accidental DOS and remove getNodeActiveSocketOrPing API
2014-02-07 13:42:52 -08:00
Andrzej Kapolka
3e2ba9fb7e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 11:26:55 -08:00
Andrzej Kapolka
67bef20f93
Have eyes converge on hovered avatar/voxel. Closes #1883 .
2014-02-07 11:26:15 -08:00
Philip Rosedale
72de486671
Merge pull request #1920 from ZappoMan/scriptable_camera
...
Scriptable camera
2014-02-07 11:21:12 -08:00
Stephen Birarda
66d4eeb805
enforce both a version and hash match for packets
2014-02-07 11:10:38 -08:00
Andrew Meadows
2e65592048
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-07 10:50:36 -08:00
Andrew Meadows
7a8186f1da
Adding ModelCollisionInfo struct to get more info about collisions against avatars.
...
Had to disable some collisions. Will go back and make them work again soon.
2014-02-07 10:48:30 -08:00
Stephen Birarda
fa1825fa32
repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID
2014-02-07 10:20:50 -08:00
Stephen Birarda
b988308a8d
leverage writeDatagram helper in NodeList, ping if no active socket
2014-02-07 09:49:54 -08:00
ZappoMan
2157349804
added Camera.computePickRay()
2014-02-07 09:40:52 -08:00
ZappoMan
41f6650b20
implement movable independent camera with hydra
2014-02-07 01:23:30 -08:00
ZappoMan
7379f9c923
tweaks to scriptable camera
2014-02-06 23:59:46 -08:00
ZappoMan
666393fdad
removed dead code
2014-02-06 20:05:48 -08:00
ZappoMan
77e7f336d5
scriptable camera
2014-02-06 20:03:57 -08:00
Andrzej Kapolka
0a6288bda4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-06 15:42:37 -08:00
Stephen Birarda
c1132726bf
use SharedNodePointer in place of Node where appropriate
2014-02-06 14:58:03 -08:00
Andrew Meadows
eae0f8b2e6
updateCollisionsWithAvatars() --> updateCollisionWithAvatars()
2014-02-06 14:49:25 -08:00
Andrew Meadows
d2d32d0ed9
Changing updateAvatarCollisions() to be updateCollisionsWithAvatars()
...
To agree with names of other similar methods.
2014-02-06 14:46:44 -08:00
Stephen Birarda
97a7369c76
remove senderWithAddress from NodeList
2014-02-06 14:43:46 -08:00
Andrew Meadows
082b7cf1a9
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
2014-02-06 14:37:19 -08:00
Stephen Birarda
a823722d27
add writeDatagram helper to NodeList to insert md5 hash
2014-02-06 14:28:58 -08:00
Andrew Meadows
802967512a
Splitting rendering of avatars and their collision proxies.
...
Also disabling old hand-avatar interactions and trying to use new stuff.
2014-02-06 14:14:48 -08:00
Andrew Meadows
64ca66a2b7
Making renderCollisionProxies() public and measuring bounding volumes of hands.
2014-02-06 14:09:08 -08:00
Stephen Birarda
e72f6d16cc
rename NodeList ownerUUID to sessionUUID
2014-02-06 11:43:23 -08:00
Stephen Birarda
6f638fa62c
have domain-server create a UUID for unidentified nodes, closes #1840
2014-02-06 10:34:34 -08:00
Stephen Birarda
f92f9ec0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-06 09:28:03 -08:00
Philip Rosedale
4d55f35b1b
Merge pull request #1903 from ZappoMan/delete_voxel_glitch
...
fix slight glitch in last child delete from larger voxel
2014-02-06 08:17:51 -08:00
Brad Hefta-Gaub
8fbce35944
fix slight glitch in last child delete from larger voxel
2014-02-06 03:44:21 -08:00
Brad Hefta-Gaub
a16b3a34e4
fix stutter while spinning
2014-02-06 02:18:28 -08:00
ZappoMan
1c47ab9fcb
Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache
2014-02-05 20:57:47 -08:00
ZappoMan
4410fbb3f2
Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache
2014-02-05 20:47:35 -08:00
Brad Hefta-Gaub
4f5a27796f
fix warning
2014-02-05 20:46:17 -08:00
ZappoMan
6e6eece814
Merge pull request #1894 from AndrewMeadows/issue-1880
...
fix for visibility of head geometry when in first-person
2014-02-05 20:34:05 -08:00
ZappoMan
f657a3efe9
remove local cache option
2014-02-05 20:02:01 -08:00
Andrew Meadows
4e8dd7c92a
Merge branch 'master' of ssh://github.com/highfidelity/hifi into issue-1880
2014-02-05 15:37:12 -08:00
Andrew Meadows
aa3a1a9a72
Stop rendering our head in first person camera mode.
2014-02-05 15:35:57 -08:00
ZappoMan
8cc4666f2a
fix spacing
2014-02-05 14:00:17 -08:00
ZappoMan
b0ccedd1a6
fix spacing
2014-02-05 13:59:17 -08:00
Brad Hefta-Gaub
a05e07460f
fix windows build errors and warnings
2014-02-05 13:54:17 -08:00
Stephen Birarda
96fd73a766
fixed wrapped read of samples from end of buffer
2014-02-05 11:39:03 -08:00
Stephen Birarda
cff4994c01
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes
2014-02-05 11:04:24 -08:00
Stephen Birarda
6b3b03228e
audio repairs so buffers do not climb
2014-02-05 10:22:07 -08:00
AndrewMeadows
42528be7ca
Merge pull request #1846 from ZappoMan/fixdebugoutput
...
fix debug to properly work with outputBufferBits()
2014-02-05 10:03:09 -08:00
ZappoMan
38c180065d
Merge pull request #1863 from AndrewMeadows/stable-camera
...
Fix #1862 camera should not follow head orientation when using faceshift
2014-02-05 09:58:05 -08:00
Stephen Birarda
c194ad1b2d
Merge pull request #1873 from ZappoMan/bugfixes
...
Fix corruption in voxel packets
2014-02-04 23:17:45 -08:00
ZappoMan
b0c41b086d
fix voxel packet corruption
2014-02-04 22:54:55 -08:00
ZappoMan
2f14b265a8
make sure SVO files with version details are supported
2014-02-04 20:24:08 -08:00
ZappoMan
305e34e834
more tweaks to particles with models rendering to make space invaders work
2014-02-04 20:18:45 -08:00
matsukaze
831a4a4e84
Fixes for style conformance: tabs to spaces
2014-02-04 22:58:05 -05:00
matsukaze
ef3d795938
Fixes for style conformance
2014-02-04 21:58:14 -05:00
Stephen Birarda
53170d3fe2
fix skeleton setting on parsing of identity packet
2014-02-04 16:49:21 -08:00
Stephen Birarda
6e0f484bdc
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-04 15:54:15 -08:00
Stephen Birarda
092c969e75
more repairs to face and skeleton model passing
2014-02-04 15:48:31 -08:00
Andrzej Kapolka
ca52d67041
Basic script guides now working.
2014-02-04 15:40:17 -08:00
Stephen Birarda
adaa36a51d
repairs to key-framed URL sending through avatar-mixer
2014-02-04 15:28:27 -08:00
Andrew Meadows
1ad2171952
Fix #1862 camera should not follow head orientation when using faceshift
2014-02-04 15:23:10 -08:00
Stephen Birarda
7e3442cbd0
repair to PacketType so interface parses AM packet
2014-02-04 14:57:14 -08:00
Stephen Birarda
3959209bc2
complete movement of URLs to AvatarData for re-usability
2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8
move face/skeleton model URLs to AvatarData
2014-02-04 14:40:41 -08:00
Stephen Birarda
26c961dc66
send identity packets when changes occur between keyframes
2014-02-04 14:24:13 -08:00
Stephen Birarda
06a3da2b25
store and load face/skeleton meshes in local settings
2014-02-04 14:06:08 -08:00
ZappoMan
055dae5f78
tweak modelScale to 2.0 for better space invaders
2014-02-04 14:04:21 -08:00
ZappoMan
468cd0d8bb
temporary hack to work around model scale data corruption
2014-02-04 13:21:31 -08:00
Stephen Birarda
e879a7f18d
remove some extra spacing
2014-02-04 13:04:51 -08:00
Stephen Birarda
8bf3b7586b
initial movement of mesh/skeleton URLs out of data-server through avatar-mixer
2014-02-04 13:02:33 -08:00
ZappoMan
2cf2e693b9
fix debug to properly work with outputBufferBits()
2014-02-04 12:29:55 -08:00
Andrzej Kapolka
a043278f03
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-04 11:25:18 -08:00
Andrzej Kapolka
7dfb83b6cc
Fix for obtaining values from editor.
2014-02-03 14:35:29 -08:00
ZappoMan
c739c2452a
Merge pull request #1832 from birarda/script-timer
...
hide ScriptEngine calls from JS
2014-02-03 12:45:41 -08:00
Andrew Meadows
cb186b10db
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
...
Conflicts:
interface/src/Application.cpp
2014-02-03 12:29:44 -08:00
Andrzej Kapolka
8df6d2bb6b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-03 11:21:44 -08:00
Andrew Meadows
466a43c77f
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-03 10:47:00 -08:00
Stephen Birarda
028eec7164
don't allow calls to init, run, evaluate from JS
2014-02-03 10:33:31 -08:00
matsukaze
259b285841
Merging upstream
2014-02-03 10:25:32 -05:00
matsukaze
bbf4f889d8
Completed worklist job #19486
...
Job #19486 Don't render the duplicate triangles between adjacent
voxels.
Added checkable item to "developer" menu to activate/deactivate cull
shared faces.
Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.
Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.
Added some useful classes for queue and lock management.
Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
2014-02-03 09:45:12 -05:00
Andrzej Kapolka
ca9e82e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-31 19:42:21 -08:00
Andrzej Kapolka
2b4876181a
Different take on the transform fix.
2014-01-31 19:38:45 -08:00
Andrzej Kapolka
ee0b6fad55
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-01-31 19:00:58 -08:00
Andrzej Kapolka
e1350f8e24
Trying out a transform tweak.
2014-01-31 19:00:24 -08:00
ZappoMan
ed3f7b9d28
Merge pull request #1822 from birarda/cleanup
...
application destructor cleanup, spacing cleanup
2014-01-31 18:03:19 -08:00
Andrew Meadows
32df731aae
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
2014-01-31 17:55:05 -08:00
AndrewMeadows
867b66e73e
Merge pull request #1817 from ZappoMan/more_scripting_work
...
More scripting work
2014-01-31 17:54:44 -08:00
Stephen Birarda
40a963cf92
some application destructor cleanup
2014-01-31 17:50:51 -08:00
Andrew Meadows
a5aff81881
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
2014-01-31 17:44:13 -08:00
Andrew Meadows
ed93d8db39
Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.
2014-01-31 17:42:48 -08:00
Stephen Birarda
d65a3ee174
spacing cleanup in Application and ScriptEngine
2014-01-31 17:38:53 -08:00
ZappoMan
289be04f0f
use tryLock in some cases where we don't want to block and pass already locked to the findParticleByID() in scripting interface
2014-01-31 17:12:50 -08:00
Andrzej Kapolka
ff2afca50e
Special handling for blendshapes in Blender exports. They're under the model,
...
like the geometry.
2014-01-31 15:24:54 -08:00
Stephen Birarda
8fc55bd196
add user UUID to application window title
2014-01-31 14:56:04 -08:00
Andrew Meadows
a7ffb7df1d
Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar.
2014-01-31 13:17:12 -08:00
Stephen Birarda
b16d03c42a
remove an unneeded todo
2014-01-31 12:46:03 -08:00
Stephen Birarda
2cc6d22181
fix push bytesRead when creating dummy Avatar packets, closes #1794
2014-01-31 12:44:09 -08:00
Stephen Birarda
4573eaebc6
fix multiple avatar parsing in AvatarManager
2014-01-31 12:02:24 -08:00
AndrewMeadows
f277e00780
Merge pull request #1785 from birarda/post-event
...
repairs to VoxelImporter to remove warning, closes #1758
2014-01-31 11:23:01 -08:00
Andrzej Kapolka
ba2ab7e83a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-31 11:06:10 -08:00
Stephen Birarda
217135a8d6
repairs to VoxelImporter to remove QCoreApplication warning
2014-01-31 11:00:44 -08:00
AndrewMeadows
fd698d7aba
Merge pull request #1784 from birarda/audio-render-crash
...
fix audio render crash when audio output setup failed
2014-01-31 10:45:31 -08:00
AndrewMeadows
bed63513a9
Merge pull request #1745 from ZappoMan/scripting_work
...
support for global collision callbacks in JS
2014-01-31 10:42:44 -08:00
Stephen Birarda
c70633e5d1
don't render any audio stats if no _audioOutput, closes #1783
2014-01-31 10:40:10 -08:00
AndrewMeadows
0badc02a93
Merge pull request #1776 from birarda/bent-avatars
...
repair ping packet parsing in creation of reply, fix AvatarMixer crash with UNIX client
2014-01-31 10:25:20 -08:00
ZappoMan
514c845b9a
Merge pull request #1764 from stojce/19493
...
Code Review for Job #19493
2014-01-31 10:20:43 -08:00
Stephen Birarda
a5b0675f24
sendPingPackets method need not be static
2014-01-31 09:58:29 -08:00
Andrew Meadows
1b99bc90cf
Removing AvatarManager::clear() as unecessary during class destruction.
2014-01-30 18:02:04 -08:00
Andrew Meadows
a8bdc874ee
MyAvatar doesn't need to be a friend of its base class Avatar.
2014-01-30 17:13:39 -08:00
Andrew Meadows
d0a4d6a614
Moving MyAvatar specific code out of Avatar and into MyAvatar.
2014-01-30 17:10:00 -08:00
Andrzej Kapolka
78d9b79805
Another fix for Blender exports. Closes #1762 .
2014-01-30 13:24:30 -08:00
stojce
21ab08b31a
Merge branch 'master' of https://github.com/worklist/hifi into 19493
2014-01-30 22:23:54 +01:00
stojce
d2464d89e3
#19493 - @ function can jump to locations as well as avatars
2014-01-30 22:23:31 +01:00