AndrewMeadows
cdeb6ce51d
Merge pull request #2070 from ey6es/master
...
Fix display name for own avatar, added ribbon.js example that I had lying around.
2014-02-24 14:05:46 -08:00
Jose Carlos
438131f3e9
Reverted myAvatar::render call to test if the decay effect is gone
2014-02-24 22:38:50 +01:00
Andrzej Kapolka
2cea83a599
Proper header on ribbon.js, show display name for own avatar.
2014-02-24 13:36:43 -08:00
Stephen Birarda
050d223b3a
add domain connection reset to NodeList reset
2014-02-24 13:33:52 -08:00
Stephen Birarda
27c779666b
add auth to assignment-client, fix refresh of static assignments
2014-02-24 13:29:32 -08:00
Andrzej Kapolka
1167ecdf77
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-24 13:21:25 -08:00
Andrzej Kapolka
40d9fffb7f
Fix for warning.
2014-02-24 13:19:32 -08:00
Jose Carlos
2bf3d2547a
Merge remote-tracking branch 'upstream/master' into 19489
2014-02-24 22:03:03 +01:00
Jose Carlos
c8c371b6f4
Changed the displayname background rect: instead of having squared
...
corners, they are bevel
Added some test code to prevent the decay effect in the text rendering
2014-02-24 22:02:06 +01:00
Leonardo Murillo
9ce4e424ef
Merge pull request #2069 from birarda/master
...
fix for assignment-client scripts with multiple instances
2014-02-24 14:46:09 -06:00
Andrzej Kapolka
8cb5c639fb
Added ribbon example that I had lying around.
2014-02-24 12:22:10 -08:00
Stephen Birarda
fcb36f0aca
switch to target specific username/pass
2014-02-24 12:07:07 -08:00
Stephen Birarda
9771e1bb12
resolve conflicts on merge with upstream master
2014-02-24 12:06:10 -08:00
AndrewMeadows
7f07d854cf
Merge pull request #2068 from ey6es/master
...
Fixes for camera transitions, seeing inside head.
2014-02-24 12:02:08 -08:00
Stephen Birarda
9dc460bab4
make multiple instances of scripted assignment use diff UUID
2014-02-24 11:56:14 -08:00
Andrzej Kapolka
e40fe85c36
Updating the camera mode every frame screws with the scripts, so revert to
...
updating it when the menu changes.
2014-02-24 11:42:47 -08:00
Andrzej Kapolka
8efc4d52ba
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-24 11:34:12 -08:00
Andrzej Kapolka
d80b52dc9f
Fixes for camera mode transitions, seeing inside head.
2014-02-24 11:33:52 -08:00
Stephen Birarda
a8493ecaa2
cleanup login/logout in menu, logout only when in
2014-02-24 11:11:36 -08:00
ZappoMan
4fc5444628
Merge pull request #2067 from ZappoMan/scriptreload
...
fix reload of scripts
2014-02-24 10:28:04 -08:00
ZappoMan
6ea2c81e68
fix reload of scripts
2014-02-24 10:10:00 -08:00
Stephen Birarda
dbefd81ba0
Merge pull request #2066 from birarda/master
...
changes to the bot script
2014-02-24 10:04:28 -08:00
Stephen Birarda
6cef72473d
changes to the bot script
2014-02-24 10:04:08 -08:00
Stephen Birarda
5b83b7c434
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-24 09:58:32 -08:00
ZappoMan
3d1c4251e3
Merge pull request #2064 from ZappoMan/more_edit_js
...
correctly shutdown slider
2014-02-24 09:36:54 -08:00
ZappoMan
6591a4b7fa
correctly shutdown slider
2014-02-24 09:36:18 -08:00
Philip Rosedale
246bb1fd2d
Physics test ‘buckyballs’ moved to application.cpp
2014-02-24 00:06:50 -08:00
Philip Rosedale
a9849c131f
EditVoxels: avatar follows orbit, mousewheel updates selection
2014-02-23 22:48:35 -08:00
Philip Rosedale
907740eb8e
Merge pull request #2047 from ey6es/metavoxels
...
Another metavoxel checkpoint: more work on streaming, editable attributes, changed to use existing session code, work on "spanners" (objects that span multiple octree nodes).
2014-02-23 21:39:44 -08:00
Philip Rosedale
26541e12b6
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-23 21:08:54 -08:00
Philip Rosedale
197b039a42
remove buckyballs physics testing code from hand code
2014-02-23 21:08:38 -08:00
Andrzej Kapolka
ba327232d5
Fixed another Window signed/unsigned mismatch.
2014-02-23 21:07:00 -08:00
Philip Rosedale
5cb3a77490
Merge pull request #2059 from ZappoMan/more_edit_js
...
editVoxels.js updates: clipboard support, multitouch orbit, and better support for "larger" voxels
2014-02-23 21:06:38 -08:00
Andrzej Kapolka
5cf6c43414
Fix for Windows build error.
2014-02-23 20:29:54 -08:00
Philip Rosedale
7f2fe14565
add mouseWheel to change voxel edit size
2014-02-23 20:23:31 -08:00
Andrzej Kapolka
8745ca3139
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-23 20:13:23 -08:00
Andrzej Kapolka
c4befbef38
Merge pull request #2060 from ey6es/master
...
Fix for Xcode warnings.
2014-02-23 20:12:46 -08:00
Andrzej Kapolka
f5fece5eb5
Fix for Xcode warnings.
2014-02-23 20:11:46 -08:00
Philip Rosedale
8c3b18f797
Finished audio input DC offset correction
2014-02-23 19:56:25 -08:00
ZappoMan
766a922fb3
add work around for voxel add of larger voxel on top of smaller voxels
2014-02-23 19:02:10 -08:00
ZappoMan
dad97cd52e
removed accidental code
2014-02-23 18:54:15 -08:00
ZappoMan
5b8d6ea314
removed unneeded code
2014-02-23 18:52:15 -08:00
ZappoMan
43f63781fc
removed files we don't need
2014-02-23 18:35:39 -08:00
ZappoMan
24a5cbfbfd
Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js
...
Conflicts:
examples/editVoxels.js
2014-02-23 18:32:53 -08:00
Philip Rosedale
9b463dd8cf
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78
Adding mouse wheel sizing voxel
2014-02-23 17:26:09 -08:00
Philip Rosedale
b0f3ab3ccd
Merge pull request #2057 from ey6es/master
...
I believe this is what was intended for the voxel edit orbit behavior. Yaw the body, pitch the head.
2014-02-23 17:22:07 -08:00
Philip Rosedale
1abf0926d3
Merge pull request #2051 from ey6es/bilbo
...
Simple avatar billboards distributed through avatar mixer.
2014-02-23 17:20:00 -08:00
ZappoMan
892cc01dd9
added Voxels.getVoxelAt() to inspect local tree
2014-02-23 13:18:36 -08:00
ZappoMan
a8b34ae756
removed some debug settings
2014-02-23 12:58:20 -08:00
