Atlante45
69533c25c2
Fix script not being loaded at startup
2014-07-02 17:54:21 -07:00
Atlante45
e9826250cb
CR
2014-07-01 12:57:39 -07:00
Atlante45
958367f579
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
...
Conflicts:
interface/src/devices/OculusManager.cpp
2014-07-01 12:45:42 -07:00
Brad Hefta-Gaub
df51d26625
Merge pull request #3094 from wangyix/seqNumberStats
...
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -07:00
Brad Hefta-Gaub
a88c92ea17
Merge pull request #3099 from Barnold1953/OculusSDK
...
Oculus SDK Upgrade
2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b
Fixed warnings
2014-07-01 10:28:40 -07:00
Atlante45
2015861e13
Fixed spelling mistake
2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab
Comments + connectedDevice
2014-06-30 19:02:43 -07:00
wangyix
f51a77ce45
reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed
2014-06-30 18:00:29 -07:00
Atlante45
1a2fd4483b
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
2014-06-30 17:54:34 -07:00
Atlante45
d102795314
Added application version to logger
2014-06-30 17:18:49 -07:00
barnold1953
1cd2066e79
Added option to disable glow effect for 10fps boost for oculus
2014-06-30 17:13:47 -07:00
Atlante45
f33ad8a100
Adding logger calls
2014-06-30 17:10:17 -07:00
Atlante45
e9dffc0681
Removed testing code
2014-06-30 14:31:39 -07:00
Atlante45
ff8694d5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
2014-06-30 14:30:17 -07:00
wangyix
c789f3c6b9
merge with upstream
2014-06-30 14:13:34 -07:00
barnold1953
6e954e7f53
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-06-30 11:44:49 -07:00
barnold1953
ffab329af4
Made camera line up with eyes in mirror mode
2014-06-30 11:39:33 -07:00
barnold1953
d109ef6fe1
Proper mirror and third person mode in Oculus
2014-06-30 11:33:22 -07:00
David Rowe
9449ad7192
Add missing script engine hash key code changes
...
The script engine hash key changed starting at commit [62f85d] on 11 Jun.
2014-06-29 19:40:53 -07:00
Clément Brisset
9eba4b01f0
Merge pull request #3092 from ctrlaltdavid/19789
...
Code Review for Job #19789
2014-06-27 17:28:48 -07:00
wangyix
0ae58bd7f9
added senderUUID arg to seq stats
2014-06-27 15:39:11 -07:00
barnold1953
508fed9146
Add ability for FBO to have a different res than glWidget
2014-06-27 11:44:05 -07:00
barnold1953
67c5281205
Fixed CMake for oculus. Gave Oculus its own camera for minimum latency.
2014-06-26 17:10:53 -07:00
wangyix
cb48825561
added seq number to all Audio types, untested
2014-06-26 16:52:23 -07:00
Atlante45
8d00a8d535
Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
...
Conflicts:
libraries/networking/src/LimitedNodeList.cpp
2014-06-26 14:56:15 -07:00
Atlante45
9d393bbe8c
Added some functions to UserActivityLogger + made logAction public
2014-06-26 14:55:11 -07:00
Clément Brisset
463ac9cc74
Merge pull request #3078 from PhilipRosedale/master
...
Improved toy ball, JS calls for palm position, concertCamera.js
2014-06-26 11:03:48 -07:00
wangyix
2ec04fb756
replaced old seqnum tracking code with SequenceNumberStats
2014-06-25 17:20:57 -07:00
David Rowe
9fb64386aa
Fix stopping scripts in the script editor
2014-06-25 11:44:58 -07:00
Philip Rosedale
95a66a06af
Merge branch 'master' of https://github.com/worklist/hifi
2014-06-25 02:57:54 -07:00
Ryan Huffman
3bec59fd33
Fix unindented line
2014-06-24 20:38:46 -07:00
Ryan Huffman
5ece424a45
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
Stephen Birarda
5f4baaffa5
revert credit balance rounding
2014-06-24 16:25:41 -07:00
Philip Rosedale
81e7f8e0a5
Merge branch 'master' of https://github.com/worklist/hifi
2014-06-24 16:21:35 -07:00
Ryan Huffman
173be2c89d
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
2014-06-24 12:01:04 -07:00
Ryan Huffman
f249020d6d
Clean up redundant if statement
2014-06-24 11:50:54 -07:00
Ryan Huffman
652543cdca
Update _scriptEngineHash to work with duplicate running scripts
2014-06-24 11:46:35 -07:00
Philip Rosedale
556578b8dc
first pass - hair as vertlet strands
2014-06-24 09:30:11 -07:00
Stephen Birarda
ed5c05a61b
fix rounding of credit balance in application title
2014-06-23 13:25:32 -07:00
Ryan Huffman
108fa36d24
Disable the ability to load a script multiple times
...
It won't show up correctly in running scripts, and can cause it to end up running
in the background unnoticed.
Also added an error message for when a script doesn't load.
2014-06-20 16:32:42 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
wangyix
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
Ryan Huffman
7a08ac76d2
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/src/Menu.cpp
interface/ui/preferencesDialog.ui
2014-06-17 20:27:16 -07:00
Brad Hefta-Gaub
dead474e6b
Merge pull request #3034 from Barnold1953/OculusOverlay
...
New Oculus Magnification Windows
2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -07:00
wangyix
6e71523346
added OctreeEditPacketSender::nodeKilled(), no locks yet
...
also added nodeKilled() calls to the 3 editsenders in
Application::nodeKilled()
2014-06-17 10:58:44 -07:00
barnold1953
3052996a9e
Pressing trigger and bumper at same time toggles UI
2014-06-17 10:37:15 -07:00
Ryan Huffman
5843425db9
Fix scripts being loaded on start even if they don't exist
...
Application::loadScript should not store a reference to a script until
it has been successfully loaded. Previously if a script didn't exist it
would be "loaded" and show up in the running scripts window, but
wouldn't have been successfully loaded, and wouldn't be running anything
at all.
2014-06-17 09:18:58 -07:00
