Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 20:46:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14558 commits 25 branches 0 tags 1.1 GiB
Commit graph

7370 commits

Author SHA1 Message Date
Atlante45
0d18debd1b Moved UserActivityLogger to networking 2014-06-30 14:27:07 -07:00
wangyix
c789f3c6b9 merge with upstream 2014-06-30 14:13:34 -07:00
Andrzej Kapolka
110f90df0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 12:42:02 -07:00
wangyix
d2f86278b2 modified AudioStreamStats to per-stream with seq stats 
added AudioStreamStats info to interface overlay stats
 2014-06-30 12:31:58 -07:00
Ryan Huffman
123773a8e3 Add default background color and initialize property 2014-06-30 12:20:05 -07:00
Ryan Huffman
cda88bf4af Add backgroundColor to TextOverlay 2014-06-30 12:06:32 -07:00
barnold1953
ef57970510 Comments and code cleanup 2014-06-30 11:50:42 -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
wangyix
de3c1ebf0f changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream 2014-06-30 09:42:22 -07:00
Andrew Meadows
57c17eb972 remove unecessary clearRagdollConstraintsAndPoints() 2014-06-30 09:18:31 -07:00
Andrew Meadows
f33728b615 guarantee that ragdoll is clear before initialized 2014-06-30 09:13:42 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -07:00
David Rowe
c454c790fa Check script file for external changes when editor regains focus 
Prompt user whether to reload.
 2014-06-29 21:31:28 -07:00
David Rowe
3df43dc653 Catch any on-the-fly modifications made while script is restarting 2014-06-29 20:13:27 -07:00
David Rowe
742007892f Rework old fix for Script Editor Script.stop() crash 2014-06-29 19:57:26 -07:00
David Rowe
48fb156e28 Fix Script Editor run-on-the-fly crashing 
Wait for script engine to stop before restarting.
 2014-06-29 19:47:00 -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
Aleric Inglewood
37f0635024 Fix a (possible) crash in QObject::disconnect 
This is https://worklist.net/19827
 2014-06-30 02:07:26 +02:00
Philip Rosedale
93602328d9 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-28 11:22:22 -07:00
Andrzej Kapolka
4f9cf82335 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 17:53:50 -07:00
wangyix
c3f571745c removed more debug stuff 2014-06-27 17:42:22 -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
4587828a3a removed debug prints 2014-06-27 16:48:21 -07:00
wangyix
9ceac2c631 fixed Audio.cpp jitter buffer size clamp bug 2014-06-27 16:34:30 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
Clément Brisset
ae8997ec0d Merge pull request #3091 from AlericInglewood/master 
Compiler warning fixes.
 2014-06-27 15:36:13 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes. 
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
 2014-06-27 22:18:38 +02:00
Andrzej Kapolka
61c2ea40ae Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 12:34:50 -07:00
barnold1953
508fed9146 Add ability for FBO to have a different res than glWidget 2014-06-27 11:44:05 -07:00
Stephen Birarda
657bf6b3d5 repairs so OAuth flow doesn't get stuck after an error 2014-06-27 11:41:35 -07:00
wangyix
ff438a2434 added seq stats for Agent, 
fixed  AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
 2014-06-27 11:23:50 -07:00
Philip Rosedale
fd1e6b1b06 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-27 10:53:23 -07:00
barnold1953
1af2996cf2 Properly use body orientation for Oculus camera 2014-06-27 09:53:31 -07:00
Stephen Birarda
bb44d8b478 fix place lookup for new APIs 2014-06-27 09:36:47 -07:00
Philip Rosedale
f072c04b4c hair is a separate class 2014-06-27 09:30:51 -07:00
Andrzej Kapolka
7c046cb100 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-26 19:12:30 -07:00
Andrzej Kapolka
f16098daef Use the refactored endpoint/client classes in the actual client/server. 2014-06-26 19:11:54 -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
Andrzej Kapolka
4b2d122f3d Working on factoring out the common metavoxel endpoint/client code. 2014-06-26 16:12:11 -07:00
Ryan Huffman
33e11be3e0 Add user locations to menu 2014-06-26 16:06:49 -07:00
Ryan Huffman
cde36dc70d Add user locations 2014-06-26 16:06:28 -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
barnold1953
ea2d75addc Code cleanup 2014-06-26 13:05:10 -07:00
barnold1953
07f7cc42ad Made spacebar reconnect the oculus. Code cleanup. 2014-06-26 12:58:23 -07:00
wangyix
97139b0bd0 Merge branch 'master' into seqNumberStats 2014-06-26 11:47:00 -07:00
wangyix
ad05c53823 moved audiomixer jbuffer stats to expanded section 2014-06-26 11:33:54 -07:00
barnold1953
6fcfde1100 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-06-26 11:27:47 -07:00
barnold1953
634e0f38e8 Accurate Oculus frame timing 2014-06-26 11:27:17 -07:00
Mohammed Nafees
6be4633a97 Merge remote-tracking branch 'upstream/master' into 19801 2014-06-26 23:48:11 +05:30
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
Clément Brisset
cd53b727d0 Merge pull request #3080 from AndrewMeadows/bug-fix 
fix for avatar models with multiple roots
 2014-06-26 10:54:03 -07:00
barnold1953
adb6c445a2 Fixed camera FoV, code cleanup 2014-06-26 10:13:15 -07:00
barnold1953
61b20b2be0 Working 3.2 Oculus SDK 2014-06-26 09:56:19 -07:00
AndrewMeadows
dba9d33f86 Merge pull request #3075 from huffman/19644 
Code Review for Job #19644
 2014-06-26 09:39:20 -07:00
Andrew Meadows
0d18f2fbab fix for avatar models with multiple roots 2014-06-26 09:12:44 -07:00
Philip Rosedale
c72e41dcd2 added Oculus angular velocity, moved sit icon up 2014-06-25 22:27:54 -07:00
Andrew Meadows
c12c869cdf add "visible" transforms to JointState 
also stubbery for using them in Model and SkeletonModel
 2014-06-25 18:06:56 -07:00
wangyix
fe2eaa8e4a forgot to increment seqnum in Audio.cpp 2014-06-25 18:02:38 -07:00
wangyix
37ce693153 added seqnum stats to AudioMixerClientData; added seqnums to Audio.cpp 2014-06-25 18:01:34 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
Philip Rosedale
93b131d520 Fix build warning from wrong init order 2014-06-25 15:41:47 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Andrzej Kapolka
6480c678d2 Disable strict aliasing for safe type punning, fix potentially uninitialized 
variable warning.
 2014-06-25 13:46:13 -07:00
David Rowe
9fb64386aa Fix stopping scripts in the script editor 2014-06-25 11:44:58 -07:00
wangyix
591bfa14b9 added PacketTypeAudioStreamStats for j-buffer stats 
...instead of packing that info into audio packets.
 2014-06-25 11:38:56 -07:00
Andrew Meadows
1b24a111fe JointState::_rotationInParentFrame is now private 2014-06-25 09:56:18 -07:00
wangyix
1257e0595a moved jbufferstats class to PositionalAudioRingBuffers 2014-06-25 09:52:02 -07:00
Andrew Meadows
d78580adc4 remove warning about uninitialized variables 2014-06-25 09:38:12 -07:00
Andrew Meadows
81209c38ca fix warning about out of order initialization 2014-06-25 09:09:44 -07:00
Andrew Meadows
d3d8e4dc2d fix warnings about signed/unsigned comparisons 2014-06-25 09:07:10 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -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
Philip Rosedale
60c33c18c3 Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -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
Clément Brisset
b6a8949b4c Merge pull request #3069 from binaryking/19765 
Code Review for Job #19765
 2014-06-24 17:49:42 -07:00
wangyix
52f00769d4 merged with upstream 2014-06-24 17:22:30 -07:00
wangyix
e1d28dfe73 removed debug code 2014-06-24 17:14:20 -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
Philip Rosedale
9eb91e2b44 tweaking params 2014-06-24 16:15:16 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll 
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
 2014-06-24 15:47:18 -07:00
Mohammed Nafees
d5d2107b97 Merge remote-tracking branch 'upstream/master' into 19765 2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041 Change font size values from pt to px in Chat Window. 2014-06-25 01:49:17 +05:30
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
89f43acb7f Add a tooltip with the full path to running scripts 2014-06-24 11:47:14 -07:00
Ryan Huffman
652543cdca Update _scriptEngineHash to work with duplicate running scripts 2014-06-24 11:46:35 -07:00
wangyix
c2b22c0aa2 Merge remote-tracking branch 'upstream/master' 2014-06-24 09:34:07 -07:00
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00
wangyix
53e3f5a3b0 merged with upstream 2014-06-24 09:13:05 -07:00
David Rowe
c40c5d78c8 Fix default audio devices on Windows 
Windows 8 provides the full friendly device name, not just the first 31 characters.
 2014-06-24 08:50:39 -07:00
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -07:00
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
Andrew Meadows
415dfd98aa remove one line of cuft 2014-06-23 13:40:50 -07:00
Stephen Birarda
ed5c05a61b fix rounding of credit balance in application title 2014-06-23 13:25:32 -07:00
Andrew Meadows
b5aca45ab6 smaller timescale for slaving shapes to skeleton 2014-06-23 12:59:38 -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
Andrew Meadows
7f4ffb363b merge upstream/master into andrew/ragdoll 2014-06-23 12:33:21 -07:00
Andrew Meadows
add556719c fixed perf stats on phys simulation 2014-06-23 12:31:36 -07:00
Andrew Meadows
9713e3d513 remove some unused var warnings in Release build 2014-06-23 12:30:53 -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
Andrew Meadows
8ad2a679c4 move code to SkeletonModel::stepRagdollForward() 2014-06-23 11:16:18 -07:00
Andrew Meadows
9a2197a23c draw skeleton shapes at at correct positions 2014-06-23 10:55:34 -07:00
wangyix
e5d7d471e3 removed debug code 2014-06-23 10:55:30 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
Andrew Meadows
eba03ddb8a re-enable some basic avatar collisions 2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67 Update SkeletonModel::_boundingShape position 2014-06-23 09:39:14 -07:00
Andrew Meadows
b2ea8c0bf9 Compute more correct masses for ragdoll parts 
also pin root ragdoll shape at the local-frame origin
for stability
 2014-06-23 08:37:11 -07:00
Mohammed Nafees
803ea28f99 Do not close the Models Browser if double clicked on the loading message 2014-06-21 23:01:22 +05:30
Mohammed Nafees
1b186c3b92 Remove unnecessary lines of code. 2014-06-21 17:57:11 +05:30
Mohammed Nafees
1368c72725 Keep the filter line edit of the Models Browser disabled until the models list has been populated. This fixes interface from crashing in case the user types in the line edit and the list is not populated. 2014-06-21 17:55:19 +05:30
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
Andrew Meadows
c17b8fdb60 collisions update shapes 
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
 2014-06-20 16:31:39 -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
Andrew Meadows
4a0ce7a9ae support disabling collisions btw adjacent joints 2014-06-19 17:39:50 -07:00
Andrew Meadows
f0c2417206 Split PhysicsSimulation::stepForward() into parts 2014-06-19 15:50:16 -07:00
Andrew Meadows
716ae3e479 add MyAvatar's skeleton to its PhysicsSimulation 2014-06-19 12:32:17 -07:00
Andrew Meadows
fbafcb6fd8 Fix distance constraint lengths 2014-06-19 11:46:09 -07:00
Mohammed Nafees
a69c6f8e29 Change pt to px to solve the Windows font size issue 2014-06-19 23:58:31 +05:30
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
Andrew Meadows
2453e9c36a build ragdoll constraints again 2014-06-19 10:31:55 -07:00
Andrew Meadows
5e74ee8c05 VerletPoint has position, lastPosition, and mass 2014-06-19 09:54:32 -07:00
Andrew Meadows
10ee307752 merge upstream/master into andrew/ragdoll 2014-06-19 08:35:29 -07:00
Andrew Meadows
a8c2003fe6 namechange SimulationEngine --> PhysicsSimulation 2014-06-19 08:34:12 -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
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
Andrew Meadows
d4b5550cda Skeleton now creates VerletShape 2014-06-18 17:22:39 -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
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -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
Ryan Huffman
0877f9f159 Fix issues with running scripts window on Windows 
Replace running scripts table with a new widget that uses a proper
layout that doesn't rely on hard-coded sizing.  Custom painted lines
were replaced with a horizontal QFrame line.
 2014-06-17 20:19:49 -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
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll 
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
 2014-06-17 17:03:16 -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
Andrew Meadows
ecbf5043d7 code out of Model into base and derived classes 
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
 2014-06-17 16:22:18 -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
Andrew Meadows
118717d96a Shapes moved from Model into PhysicalEntity 2014-06-16 14:51:58 -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
Andrew Meadows
92159a7ed5 Shape::get/setCenter() instead of get/setPosition() 2014-06-16 08:43:27 -07:00
Andrew Meadows
d7a28e1441 enable shape collisions for MyAvatar skeleton 
also some stubbery for main simulation loop
 2014-06-15 18:07:47 -07:00
Andrew Meadows
7530f8ec1e add way to enable Model for collisions 2014-06-15 17:57:42 -07:00
Kai Ludwig
8c700d43f3 Modified CALLBACK_ACCELERATOR_RATIO for windows because some systems need larger input buffer to work fine. 2014-06-15 21:08:14 +02:00
Kai Ludwig
05900420a5 Replaced windows usleep version with a non busy waiting high accuracy version. This fixes the high CPU load for the windows servers too! 2014-06-15 21:07:03 +02:00
Stojce Slavkovski
f1e008853c Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-15 12:36:14 +02:00
barnold1953
bef625d237 Removed pointless Code 2014-06-13 16:14:03 -07:00
barnold1953
53d4cc795a Removed unused UI types that clutter code 2014-06-13 16:09:45 -07:00
barnold1953
587c0e5a9d Render Oculus pointers separate from texture for better quality 2014-06-13 16:01:59 -07:00
barnold1953
7e4317d5d2 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-13 15:06:11 -07:00
barnold1953
cb1669653d Mouse reticle bigger in oculus 2014-06-13 15:05:23 -07:00
barnold1953
c593117ac5 New reticle for sixense and oculus mouse movement 2014-06-13 15:03:09 -07:00
barnold1953
230af7f5a7 Stopped clamping the magnification 2014-06-13 13:49:35 -07:00
barnold1953
3747a5eeae update hemisphere VBO on ui size change 2014-06-13 13:38:28 -07:00
Andrew Meadows
158c7de76e Ragdoll not an Entity. SkeletonModel is a Ragdoll 2014-06-13 12:27:58 -07:00
Andrew Meadows
5bd37acdb8 Changed RagDoll to Ragdoll 2014-06-13 11:55:39 -07:00
barnold1953
422db14812 Fixed some improper logic and used better defaults 2014-06-13 11:34:57 -07:00
barnold1953
4a1307fa38 Killed two warnings 2014-06-13 10:54:50 -07:00