Brad Hefta-Gaub
211bed946f
Merge pull request #3232 from huffman/19783
...
Code Review for Job #19783
2014-08-01 16:34:50 -07:00
Ryan Huffman
d01d605b40
Add ModelItemProperties::copyFromNewModelItem
2014-08-01 13:52:00 -07:00
Ryan Huffman
3e2bb0f168
Add more complete error handling for import/export models
2014-07-31 10:40:45 -07:00
Stephen Birarda
453c37f4b9
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
2014-07-31 10:05:40 -07:00
Ryan Huffman
a39a7e2356
Update exportModels implementation
2014-07-31 01:13:17 -07:00
Ryan Huffman
01737e18b2
Update LocalModelOverlay to work prorperly with translations
2014-07-30 19:06:10 -07:00
Ryan Huffman
06294b403b
Add pasteModels
2014-07-30 18:31:58 -07:00
Stephen Birarda
db25cd9d2c
call PaymentManager when an OctreeEditPacketSender needs to pay
2014-07-30 18:07:08 -07:00
Brad Hefta-Gaub
d6e6cfd585
Merge pull request #3216 from wangyix/inbound_audio_stream
...
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
2014-07-30 18:00:17 -07:00
Stephen Birarda
9c1dd7c4a4
fix call to connect in Application
2014-07-30 17:35:49 -07:00
Stephen Birarda
99daa062c0
trigger domainSettingsReceived slot when connected to domain
2014-07-30 17:35:33 -07:00
Stephen Birarda
363cef6d8a
move satoshi costs to VoxelEditPacketSender
2014-07-30 17:33:37 -07:00
wangyix
daeb2a898d
added staticDesiredJitterBufferFrames feature; AudioMixer crashing
...
moved some callbacks from Application::updateAvatar() to
Application::update()
2014-07-30 15:35:40 -07:00
wangyix
d49970d010
maxFramesOverDesired added; settable from domain page and preferences
2014-07-29 15:57:32 -07:00
Zu
4016f8ca44
Merge branch 'master' into add_cara_face_tracker
2014-07-29 12:21:40 +08:00
wangyix
6fc5c74c0b
renamed ringbuffer variables to audiostream
2014-07-28 13:08:53 -07:00
Atlante45
1849ec8e07
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting
...
Conflicts:
examples/editVoxels.js
2014-07-25 16:39:39 -07:00
Ryan Huffman
d777e4be53
Merge branch 'master' of git://github.com/highfidelity/hifi into 19783
...
Conflicts:
interface/src/scripting/WindowScriptingInterface.cpp
interface/src/scripting/WindowScriptingInterface.h
2014-07-25 15:53:36 -07:00
Atlante45
72a31ec8fc
Removed magic number to use DEFAULT_NEAR/FAR_CLIP
2014-07-25 10:56:44 -07:00
AndrewMeadows
73ec862474
Merge pull request #3207 from PhilipRosedale/master
...
Velocity filter head position for less jitter in camera
2014-07-25 09:50:21 -07:00
Zu
2d921924bf
added: Cara Face Tracker
...
added: decode cara udp packets
added: head rotation
added: hook into hifi interface
2014-07-25 16:52:29 +08:00
Philip Rosedale
a5d6b2282e
Merge pull request #3201 from wangyix/master
...
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a
Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine
...
ScriptEngine now inherit from QScriptEngine
2014-07-24 21:38:13 -07:00
Philip Rosedale
a1b74c5272
remove unused code
2014-07-23 23:07:37 -07:00
Philip Rosedale
5aecbe690d
made calculateAverageEyePosition private, changed to getEyePosition() where used outside head
2014-07-23 22:56:59 -07:00
Philip Rosedale
00fdc37822
add velocity filtering to eyePosition to reduce camera jitter from faceshift
2014-07-23 22:45:50 -07:00
Philip Rosedale
f05855dcc2
Merge pull request #3199 from ey6es/master
...
Fix for shadows in close-up inset mirror.
2014-07-23 17:49:55 -07:00
wangyix
a36c9e872e
merged with upstream
2014-07-23 15:36:37 -07:00
Atlante45
e1365a2927
Forgot one change
2014-07-23 14:19:47 -07:00
Thijs Wenker
9d5c81bd67
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6
FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)
2014-07-23 16:55:59 +02:00
Andrzej Kapolka
9cf0d6c851
Fix for shadows in close-up inset mirror.
2014-07-22 19:19:13 -07:00
Philip Rosedale
4f52098da1
tuning tweaks to world and avatar lights
2014-07-22 20:23:23 -04:00
Andrzej Kapolka
be028c2b01
Fixes for local lights.
2014-07-22 14:13:51 -07:00
wangyix
847bc28990
Audio stats now reset when AudioMixer is killed
2014-07-22 10:27:26 -07:00
barnold1953
03bc3a9ff8
Added checkable menu option for laser toggle
2014-07-21 12:35:46 -07:00
barnold1953
c6bda4bf16
Moved sixense laser stuff to MyAvatar
2014-07-18 15:26:18 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
Andrzej Kapolka
3be00b972d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 18:11:54 -07:00
Andrzej Kapolka
e32bab5b04
Beginnings of some metavoxel scriptability, to create some test landscapes.
2014-07-14 14:32:55 -07:00
TonyPeng
1aa20dff60
Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager.
2014-07-14 13:59:57 -07:00
Andrew Meadows
456a3c3739
cleanup Leapmotion initialization removes warning
...
about unused variable
2014-07-14 09:26:42 -07:00
Andrew Meadows
8ffc3aa73d
merge upstream/master into andrew/thermonuclear (AKA samcake/19734)
...
Conflicts:
interface/src/Application.cpp
2014-07-14 09:10:27 -07:00
Brad Hefta-Gaub
a94e077a75
Merge pull request #3153 from wangyix/quick_audio_PR
...
Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg
2014-07-11 11:42:55 -07:00
wangyix
a7ef7647ed
application stats tracking and packing updated;
2014-07-10 16:54:26 -07:00
wangyix
b4c9e51011
Audio now periodically sends downstream audio stats to audiomixer
2014-07-10 14:14:29 -07:00
barnold1953
a785ceb3da
Restored UI fade animation
2014-07-09 17:33:41 -07:00
barnold1953
56ff74dd56
Removed ApplicationOverlay::resize()
2014-07-09 16:39:05 -07:00
barnold1953
6e92beeb1c
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.h
2014-07-09 16:32:02 -07:00
samcake
c6e308bc87
fixes after first review
...
- lots of cleaning of the syntax to respect the coding standard
- Fixed the device tracker singleton for clean destruction
- introduced the Factory for the Leapmotion itstead of a naked
constructor
2014-07-09 15:52:57 -07:00
