Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 11:06:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13780 commits 76 branches 59 tags 1.2 GiB
Commit graph

7430 commits

Author SHA1 Message Date
matsukaze
a48f38b1d2 Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2." 
This reverts commit b4e9840865.
 2014-06-10 21:32:23 -04:00
Andrzej Kapolka
f677858891 Merge pull request #3009 from ZappoMan/bugFix 
fix some bugs in models
 2014-06-10 16:56:56 -07:00
David Rowe
39e3deb9b9 Add menu item that toggles VR display mode 
Toggles the display mode if a Rift is found connected at program start.
 2014-06-10 15:03:07 -07:00
ZappoMan
0ae7411bf0 fix some bugs in models 2014-06-10 13:37:53 -07:00
wangyix
b96b6c9857 added default constructor for NetworkPacket 
updated param comments in ReceivedPacketProcessor
 2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4 VoxelPacketProcessor -> OctreePacketProcessor 
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
 2014-06-10 11:05:51 -07:00
Andrew Meadows
c9ba71aa01 fix for broken neck on some body models 2014-06-10 09:38:38 -07:00
matsukaze
b4e9840865 Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2. 
Keep the scriptUrl internal to the ScriptEngine class and refer to it
externally by the file name string.

Change the ScriptEngine constructor to accept a filename QString,
instead of a QUrl. Resolve constructor ambiguity in Particle, which
creates anonymous ScriptEngine.
 2014-06-09 23:15:45 -04:00
Brad Hefta-Gaub
f3fb39574f Merge pull request #3007 from wangyix/master 
Added Developer menu option to disable nack packets.
 2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b var name change again 2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f nackdisable to disablenack 2014-06-09 17:41:20 -07:00
wangyix
de61029f05 Added dev menu option to disable nack packets 2014-06-09 17:30:09 -07:00
Andrew Meadows
589b2e8fb7 recover some code for one less magic vec3 2014-06-09 16:12:54 -07:00
Andrew Meadows
e8b6338de9 Fix IK for hydra hands. 2014-06-09 15:40:29 -07:00
matsukaze
c8c8bccbf3 Job #19766 BUG: Stop or reload all scripts crashes interface fixed. 
QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
 2014-06-09 17:52:50 -04:00
Brad Hefta-Gaub
6cf30cf9d1 Merge pull request #3002 from wangyix/master 
added code to nack and re-send dropped octree data packets
 2014-06-09 13:52:21 -07:00
wangyix
e45f2fed4b changed writelock to readlock 
plus a coding standard fix
 2014-06-09 13:42:45 -07:00
Brad Hefta-Gaub
2a4e6a1311 Merge pull request #3001 from Barnold1953/OculusOverlay 
Simple raypicking for scripts with oculus rift.
 2014-06-09 13:21:24 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
529dd827a2 moved around code in sendNack() a bit 2014-06-09 12:00:19 -07:00
barnold1953
936f04cece Simple raypicking for scripts with oculus rift. 2014-06-09 11:55:29 -07:00
Andrzej Kapolka
28490f9bbc Merge pull request #2994 from AndrewMeadows/ragdoll 
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
 2014-06-09 11:55:19 -07:00
Andrew Meadows
4f9da0cc37 fix whitespace formatting 2014-06-09 11:50:31 -07:00
wangyix
3bc457d4d2 added octree scene stats locking and unlocking 2014-06-09 11:14:02 -07:00
wangyix
5286090812 removed interface print statements 2014-06-06 17:52:48 -07:00
wangyix
b39559d860 packet recovery seems to be working 
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
 2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff Merge remote-tracking branch 'upstream/master' into packet_recovery_pull 2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c added random packet drops; ready to test 2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7 added write lock/unlock 
...for _octreeSceneStatsLock
 2014-06-06 14:33:53 -07:00
wangyix
5c47485562 client-side nack sending complete; ready to test 2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54 started work on sending nack packets from client 2014-06-06 11:50:34 -07:00
Stephen Birarda
b6b148cd9f resolve conflicts on merge with upstream master 2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6 tweak resample to handle 48 to 24 stereo, add stereo/mono byte 2014-06-06 10:27:59 -07:00
Stephen Birarda
7da091d2b4 initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
Andrew Meadows
7f25c3e011 merge upstream/master into andrew/ragdoll 2014-06-06 08:53:37 -07:00
Andrew Meadows
551029c2f5 slave SkeletonModel's collision shapes to RagDoll 2014-06-06 08:51:22 -07:00
Andrew Meadows
c689d826f4 fix for broken windows build with PrioVR libs 
The Model API changed but this code path was not updated.
 2014-06-05 15:48:18 -07:00
Clément Brisset
02452819c3 Merge pull request #2988 from AndrewMeadows/ragdoll 
RagDoll Part 1: basic data structure
 2014-06-05 14:44:36 -07:00
Andrzej Kapolka
8d908a12a3 Fix build. 2014-06-05 12:28:02 -07:00
barnold1953
f0f7d0c55f Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-06-05 12:17:09 -07:00
Andrew Meadows
4eb801b8e9 merge upstream/master into andrew/ragdoll 2014-06-05 11:32:18 -07:00
Andrew Meadows
1b2cd2e144 adding RagDoll scaffold 2014-06-05 11:07:35 -07:00
barnold1953
4e699c0f84 Fixed coding standard and build error 2014-06-05 10:34:06 -07:00
Andrzej Kapolka
47c71e2d3a Merge pull request #2983 from PhilipRosedale/master 
Added squeezeHands.js for open/close hand animation with controller trigger
 2014-06-04 17:35:43 -07:00
barnold1953
84cd200617 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-04 17:33:04 -07:00
barnold1953
e60c671c05 Switched Oculus UI to hemisphere. Added curved semicircle UI 2014-06-04 17:24:20 -07:00
Philip Rosedale
864db25f4f remove unused variables causing warning 2014-06-04 15:43:33 -07:00
Andrew Meadows
7807388b08 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-06-04 14:28:23 -07:00
Andrew Meadows
e1cb88471f add a comment 2014-06-04 14:19:45 -07:00
Andrew Meadows
f19b562e88 add JointState::setRotation(rotModelFrame) 2014-06-04 14:17:39 -07:00
Andrew Meadows
212ac13802 setRotation -> setJointRotationFromBindFrame 2014-06-04 14:10:28 -07:00
Andrew Meadows
323fa70cf3 remove last of "InModelFrame" qualifiers 2014-06-04 14:03:29 -07:00
Andrew Meadows
ccfd620c84 setJointPositionInModelFrame -> setJointPosition 2014-06-04 13:56:37 -07:00
Andrew Meadows
3af4b1b333 getJointPositionInModelFrame -> getJointPosition 2014-06-04 13:51:43 -07:00
Andrew Meadows
971268d4f2 setRotationInModelFrame -> setRotation 2014-06-04 13:46:08 -07:00
Andrew Meadows
b3cabb8156 applyRotationDeltaInModelFrame -> applyRotationDelta 2014-06-04 13:43:15 -07:00
Andrew Meadows
d8f5e10947 getPositionInModelFrame -> getPosition 2014-06-04 13:36:54 -07:00
Andrew Meadows
4a3fbfcdee getRotationInModelFrame -> getRotation 2014-06-04 13:34:58 -07:00
Andrew Meadows
4ae58153e0 computeTransformInModelFrame -> computeTransform 2014-06-04 13:31:31 -07:00
Andrew Meadows
d32e14ca04 renames of JointState data members 2014-06-04 13:27:28 -07:00
Andrew Meadows
b1b7f6bdc4 remove last world-frame transfoms from JointState 2014-06-04 12:03:01 -07:00
Andrew Meadows
d46a90d763 remove JointState::_combinedRotation 
instead use JointState::_rotationInModelFrame
 2014-06-04 11:56:20 -07:00
Andrew Meadows
19f0f453a5 remove JointState::setRotation() 
instead use JointState::setRotationInModelFrame()
 2014-06-04 11:52:07 -07:00
Andrzej Kapolka
f6395435cf Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-04 11:51:11 -07:00
Andrzej Kapolka
74afcf5626 Allow floating point start/end frames and negative play speeds. 2014-06-04 11:47:53 -07:00
Andrew Meadows
5d8e3d447a remove JointState::getRota/PositionInWorldFrame() 
instead: use getRotat/PositionInModelFrame() and do math
 2014-06-04 11:36:00 -07:00
wangyix
25e2f28b02 more cleanup 2014-06-04 11:30:35 -07:00
Andrew Meadows
729c01ddbf remove more getHybridTransform() calls 2014-06-04 11:25:38 -07:00
wangyix
b452d08495 cleaned up debug statements 
also reorganized MovingPercentile a little bit
 2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1 changed MovingMedian to MovingPercentile 2014-06-04 10:59:32 -07:00
Andrew Meadows
30d936c15b getJointPosition -> getJointPositionInWorldFrame 2014-06-04 10:52:10 -07:00
Andrew Meadows
14e782e439 remove some JointState::getHybridTransform() calls 2014-06-04 10:42:04 -07:00
Andrew Meadows
d3f51fe38e FinalOrientation -> FinalOrientationInWorldFrame 2014-06-04 10:41:17 -07:00
Andrew Meadows
aea517af46 fix for partial hand restore after hydra inactive 2014-06-04 10:19:27 -07:00
barnold1953
edf5d5bda1 Fixed bug that disabled cursor for windows 2014-06-04 08:38:01 -07:00
wangyix
50746a6540 extra commit of previous commit? 2014-06-03 16:19:12 -07:00
barnold1953
d4fd1e9515 Stopped Oculus UI from glowing. 2014-06-03 16:01:47 -07:00
Andrew Meadows
a1afcfd42c remove JointState::applyRotationDelta() 
(use JointState::applyRotationDeltaInModelFrame()) instead)
 2014-06-03 15:57:16 -07:00
Andrew Meadows
7f46e9d514 remove JointState::getJointRotation() 
(use getRotationModelFrame() instead)
 2014-06-03 15:42:38 -07:00
barnold1953
036bdf5d07 Removed pointless 1.0f 2014-06-03 15:26:12 -07:00
barnold1953
611c68d0d8 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-03 15:23:58 -07:00
barnold1953
d1b7882c6f Mouse input and magnification for Oculus Overlay 2014-06-03 15:23:17 -07:00
Andrew Meadows
e7f32c211b remove world-frame hand/palm set methods 2014-06-03 14:48:57 -07:00
Andrew Meadows
05af993262 Add more model-frame methods 2014-06-03 14:24:04 -07:00
Andrew Meadows
03bf1fe69d Add joint manipulations in model-frame 2014-06-03 14:04:09 -07:00
Brad Hefta-Gaub
03f0ff111f Merge pull request #2976 from talentraspel/19751 
dynamically malloc/free arrays to avoid stack overflow on windows.
 2014-06-03 12:10:44 -07:00
Kai Ludwig
23b56bf174 start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows. 
this fixes restarted servers not getting properly recognized by the interface - at least on windows.
 2014-06-03 20:10:55 +02:00
barnold1953
75bee69ef8 Fixed coding standard 2014-06-03 10:49:54 -07:00
Andrew Meadows
f99489c157 rolling back previous change for IK instability 2014-06-03 10:40:30 -07:00
Kai Ludwig
162939fda1 dynamically malloc/free arrays to avoid stack overflow on windows. 
starting with 0 for array index will give a reasonable value for 'first'.
 2014-06-03 19:11:53 +02:00
Brad Hefta-Gaub
6061330826 Merge pull request #2973 from matsukaze/master 
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
 2014-06-02 22:41:02 -07:00
barnold1953
f4391bcdbe _distance variable 2014-06-02 17:23:32 -07:00
barnold1953
10d0b6af03 Fixed Oculus overlay color bug 2014-06-02 16:47:51 -07:00
barnold1953
4ed03e996a Added Oculus Options menu 2014-06-02 16:15:51 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
Andrew Meadows
d7be5faa9d unravel rotation code by giving proper names 
The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
 2014-06-02 14:43:25 -07:00
Andrew Meadows
9b3773fa3b remove 'fromBind' argument to getJointRotation() 2014-06-02 14:20:13 -07:00
Brad Hefta-Gaub
6f5d2ba233 Merge pull request #2970 from Barnold1953/master 
Mirror mode fix, particleBirds.js
 2014-06-02 13:02:05 -07:00