barnold1953
e0a33f129c
Updated oculus initialization
2014-06-23 15:55:54 -07:00
Brad Hefta-Gaub
19195f9119
Merge pull request #3056 from birarda/master
...
fix rounding of credit balance in application title
2014-06-23 14:48:37 -07:00
Stephen Birarda
ed5c05a61b
fix rounding of credit balance in application title
2014-06-23 13:25:32 -07:00
Brad Hefta-Gaub
18cd794542
Merge pull request #3055 from wangyix/master
...
Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets
2014-06-23 12:45:04 -07:00
Brad Hefta-Gaub
29a8307825
Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut
...
Fix fullscreen toggle shortcut
2014-06-23 11:42:20 -07:00
wangyix
e5d7d471e3
removed debug code
2014-06-23 10:55:30 -07:00
Ryan Huffman
0e6abe3359
Update inactive chat window opacity to 0.8
2014-06-20 16:31:22 -07:00
wangyix
a5457eb86b
fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet
...
added more debug stuff, other minor changes and fixes
2014-06-20 14:43:18 -07:00
David Rowe
633746ab16
Different fullscreen shortcuts for Mac and Windows
...
Revert to the original Mac OSX key combination and provide alternative for Windows.
2014-06-20 13:30:04 -07:00
Ryan Huffman
0c87f0aabc
Update chat window behavior
...
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
2014-06-19 19:45:43 -07:00
David Rowe
2dbf8d7daf
Fix fullscreen toggle shortcut
...
Remove the "Meta" modifier so that the shortcut works on Windows.
2014-06-19 11:08:21 -07:00
David Rowe
afab5f1cbf
Fix startup crash where Hydra controllers are not properly plugged in
...
Crash occurs if the left controller is plugged in but right one isn't.
2014-06-18 20:52:17 -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
Clément Brisset
7597191081
Merge pull request #3042 from ZappoMan/editModelFeatures
...
add support for changing the model URL of a model
2014-06-18 11:52:01 -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
ZappoMan
26075d9d26
add support for changing the model URL of a model
2014-06-18 11:29:56 -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
barnold1953
64725dd21b
Unneeded comment
2014-06-17 17:15:43 -07:00
barnold1953
fa32ad5b11
De-janked code by removing magic numbers
2014-06-17 17:14:26 -07:00
barnold1953
9f66eeb37f
Added a const variable for readability
2014-06-17 16:48:06 -07:00
barnold1953
7cbb19551a
Switched time query method and fixed horrifying bug
2014-06-17 16:38:19 -07:00
Brad Hefta-Gaub
df27de3c73
Merge pull request #3036 from huffman/19788
...
Code Review for Job #19788
2014-06-17 16:28:03 -07:00
barnold1953
6c74650552
Attempt to fix build errors
2014-06-17 15:40:11 -07:00
Stojce Slavkovski
591ab448a1
remove unused variable
2014-06-17 23:54:55 +02:00
Stojce Slavkovski
9824072300
remove unused parameter in AccountScriptingInterface::updateBalance
2014-06-17 23:51:02 +02:00
Stojce Slavkovski
8b5e3486a3
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-17 23:22:03 +02:00
barnold1953
bee84a064c
Dont render red border for mouse magnifier
2014-06-17 12:41:53 -07:00
barnold1953
2eda35ff1d
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7
Fixed NAN error with magnification windows
2014-06-17 12:19:15 -07:00
Andrew Meadows
b37b9fb097
remove warnings about unused variables
2014-06-17 11:59:26 -07:00
barnold1953
7bb8e4d571
Animated magnification opening and closing
2014-06-17 11:20:02 -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
dc663dedf8
Fixed compiler warnings
2014-06-17 10:45:59 -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
Brad Hefta-Gaub
5b62733a36
Merge pull request #3025 from talentraspel/19753
...
replaced usleep for windows
2014-06-16 17:40:01 -07:00
barnold1953
b0e89c5810
Made magnification use only button 3
2014-06-16 17:34:18 -07:00
Philip Rosedale
0084c36cd0
Merge pull request #3024 from Barnold1953/OculusOverlay
...
Exposed sixense mouse options and oculus UI angle to prefs
2014-06-16 16:42:33 -07:00
wangyix
e3db60d1ef
forgot to add "break;"s
2014-06-16 16:42:04 -07:00
wangyix
4d84e1fff1
added processNackPacket calls to DatagramProcessor
2014-06-16 16:41:00 -07:00
barnold1953
2b374470b0
Allow clicking on magnified controls
2014-06-16 15:24:53 -07:00
barnold1953
84d183b2bc
Switched Oculus magnify method to a manual mode
2014-06-16 14:46:40 -07:00
Ryan Huffman
9faf9d7749
Remove extra connect and disconnect for multipleDestinationsDecision
2014-06-16 11:43:04 -07:00
Ryan Huffman
a13810bd72
Merge branch 'master' of git://github.com/highfidelity/hifi into 19779
...
Conflicts:
interface/src/location/LocationManager.cpp
2014-06-16 11:35:55 -07:00
Ryan Huffman
978b7521db
Move connect call for multiple destinations to constructor
2014-06-16 11:30:47 -07:00
Ryan Huffman
af3b2a9d0f
Update LocationManager::goTo to use new addresses API
...
The new API address is now used for goTo when # or @ isn't present
Fixed the multiple locations popup to show when multiple locations are
found
2014-06-16 10:43:13 -07:00
barnold1953
031fe323ea
Got rid of some verbosity
2014-06-16 10:12:09 -07:00
barnold1953
94e58e9559
Fixed coding standard and made getCursorPixelRangeMultiplier more clear
2014-06-16 10:04:56 -07:00
