Andrzej Kapolka
631419d23c
Tweaks to heightfield conversion.
2014-10-22 18:22:21 -07:00
Andrzej Kapolka
9af1516c79
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-22 17:45:20 -07:00
Andrzej Kapolka
271c01ad03
Fix for digging into converted heightfields.
2014-10-22 17:44:56 -07:00
Philip Rosedale
246ff1614f
Merge pull request #3645 from birarda/avatar-by-name
...
fix for AvatarHashMap crash when erasing avatars
2014-10-22 17:43:44 -07:00
Clément Brisset
0525c562b0
Merge pull request #3643 from ctrlaltdavid/rift-calibration-countdown
...
Rift calibration countdown
2014-10-22 17:42:35 -07:00
Clément Brisset
bf9d467328
Merge pull request #3638 from huffman/entity-tools-updates
...
Entity tool fixes
2014-10-22 17:40:21 -07:00
Stephen Birarda
8e67c5f534
don't erase from the AvatarHashMap on the wrong thread
2014-10-22 17:35:28 -07:00
David Rowe
0e3495986d
Add countdown to HMD calibration billboard
2014-10-22 16:58:10 -07:00
David Rowe
38d50a76eb
Add IsFacingAvatar getter and setter to Text3DOverlay
2014-10-22 16:47:40 -07:00
Philip Rosedale
4c060dd6a7
Merge pull request #3641 from birarda/avatar-by-name
...
return an avatar to script by their display name
2014-10-22 16:41:19 -07:00
Philip Rosedale
d3fa3fbbac
Merge pull request #3640 from PhilipRosedale/master
...
can warp at any yaw angle
2014-10-22 15:43:12 -07:00
Stephen Birarda
7b0f1477a1
expose AvatarList to Interface SE, add avatarWithDisplayName method
2014-10-22 15:28:04 -07:00
Ryan Huffman
ac8d947cb1
Update ScriptUndoCommand to run on ScriptEngine thread
2014-10-22 15:18:49 -07:00
Philip Rosedale
70f72f9404
can warp at any yaw angle
2014-10-22 15:09:43 -07:00
Ryan Huffman
14555c4534
Add UndoStackScriptingInterface and support when editing entities
2014-10-22 14:54:04 -07:00
Andrzej Kapolka
345a9f02f7
Upload fix.
2014-10-22 14:30:20 -07:00
Andrzej Kapolka
e69bc22222
Fix for streaming crash.
2014-10-22 12:56:55 -07:00
Ryan Huffman
0bda7699a6
Disable properties menu with multi-selection
2014-10-22 10:38:24 -07:00
Ryan Huffman
5b9806dc0d
Fix deletion with multi-selection
2014-10-22 10:37:17 -07:00
Ryan Huffman
078d14ae58
Fix rotation overlay size with multi-selection
2014-10-22 10:36:58 -07:00
Ryan Huffman
52dacaab02
Update entity editing to force SPACE_LOCAL for single-selection
2014-10-22 10:36:44 -07:00
Brad Hefta-Gaub
0d77063e1e
Merge pull request #3634 from highfidelity/revert-3633-temp0
...
Revert "Record graphics API commands in a "gpu::Batch" to separate trave...
2014-10-21 20:31:15 -07:00
Brad Hefta-Gaub
f76d060de3
Revert "Record graphics API commands in a "gpu::Batch" to separate traversal from rendering"
2014-10-21 20:22:44 -07:00
Brad Hefta-Gaub
650660a0fc
Merge pull request #3632 from ey6es/metavoxels
...
Added network condition simulator for metavoxels, fixed crash issues with reliable deltas.
2014-10-21 18:36:11 -07:00
Brad Hefta-Gaub
1348523c95
Merge pull request #3633 from samcake/temp0
...
Record graphics API commands in a "gpu::Batch" to separate traversal from rendering
2014-10-21 18:36:00 -07:00
Sam Gateau
057c17fd2f
fix suseless spaces around parameters in functions
2014-10-21 18:14:26 -07:00
Sam Gateau
86819b9344
fix endline on Batch.cpp
2014-10-21 18:03:53 -07:00
Sam Gateau
f8f9383c43
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-10-21 17:57:38 -07:00
Sam Gateau
821284edfd
Introduce the gpu::Batch for the full Model::render call
2014-10-21 17:46:41 -07:00
Andrzej Kapolka
4840c44d7c
Time calculation fix.
2014-10-21 17:41:41 -07:00
Andrzej Kapolka
311d1332f1
Include a simple bandwidth limit option.
2014-10-21 17:29:28 -07:00
Andrzej Kapolka
9c0e3ead13
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-21 16:27:41 -07:00
Andrzej Kapolka
0f58b42795
Forgot these guys.
2014-10-21 16:27:26 -07:00
Brad Hefta-Gaub
af5a4da30e
Merge pull request #3631 from huffman/entity-tools-multi-selection
...
Entity Tool Updates
2014-10-21 16:24:27 -07:00
Andrzej Kapolka
3d43e86faa
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-21 15:49:06 -07:00
Andrzej Kapolka
bd4738d2c2
Reliable delta fix.
2014-10-21 15:48:53 -07:00
Ryan Huffman
d9029beaa4
Merge remote-tracking branch 'upstream/master' into entity-tools-multi-selection
2014-10-21 15:17:07 -07:00
Ryan Huffman
d5c7c60553
Update entity edit tools
...
Move editing functions into "tool" objects which contain onBegin,
onMove, and onEnd functions.
Add multi-selection
Add local and world editing modes
Fix XZ tool
2014-10-21 15:15:26 -07:00
Clément Brisset
9476154375
Merge pull request #3628 from ZappoMan/master
...
add 3D text overlay support
2014-10-21 12:39:30 -07:00
Brad Hefta-Gaub
308c1d9bbb
Merge pull request #3629 from PhilipRosedale/master
...
Improved version of headMove with timed target reveal
2014-10-21 12:29:37 -07:00
ZappoMan
228de963ab
CR feedback
2014-10-21 12:28:44 -07:00
Andrzej Kapolka
02c6b5a8bf
Fix for send delay, delay ordering.
2014-10-21 12:16:55 -07:00
Andrzej Kapolka
5efb108e6c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-21 11:45:43 -07:00
Philip Rosedale
2a5b2d8686
Improved version of headMove with timed target reveal
2014-10-21 11:40:16 -07:00
Sam Gateau
f090a1868c
qerge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
q Please enter a commit message to explain why this merge is necessary,
2014-10-21 10:51:46 -07:00
Sam Gateau
00dbe486d9
FIrst working version of the GLBatching system introduced in the MOdelrendering path
2014-10-21 10:50:53 -07:00
Brad Hefta-Gaub
d79b851cf4
Merge pull request #3627 from PhilipRosedale/master
...
First cut, Oculus headMove with warping
2014-10-21 10:03:34 -07:00
Stephen Birarda
1658f6cc03
Merge pull request #3624 from thoys/sdl2-find-hifi_libs
...
Allow "%HIFI_LIB_DIR%/SDL2" for SDL2 path on Windows
2014-10-21 08:46:46 -07:00
ZappoMan
1b9565e575
cleanup
2014-10-21 08:25:04 -07:00
ZappoMan
956d7c73b2
removed debug
2014-10-21 08:21:01 -07:00
