Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13936 commits 29 branches 0 tags 1.1 GiB
Commit graph

7470 commits

Author SHA1 Message Date
barnold1953
4a1307fa38 Killed two warnings 2014-06-13 10:54:50 -07:00
barnold1953
e4a0275f57 Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
John Grosen
14f56310f6 Changed AccountManager to only rely on a proper OAuth response. 
This involved making another request after the initial OAuth authorization.
Because of this now-two-step process, some methods and signals were renamed
to make their purpose more clear. Additionally, a _hasProfile member variable
was added to DataServerAccountInfo in order to allow for knowledge of whether
the profile elements had been fetched when being deserialized from disk.
Error handling for the whole process is still nonexistant.
 2014-06-12 23:28:43 -07:00
Brad Hefta-Gaub
e8ba3c8bb1 Merge pull request #3019 from ctrlaltdavid/19769 
Code Review for Job #19769
 2014-06-12 17:31:53 -07:00
Brad Hefta-Gaub
de40c3b7a3 Merge pull request #3020 from birarda/master 
fix bug in lookup for places with spaces
 2014-06-12 17:30:55 -07:00
Stephen Birarda
3e50443ea1 let QUrl do its automatic percent encoding for address lookup 2014-06-12 16:03:18 -07:00
barnold1953
16f9b8c3ed Removed some unused variables. 2014-06-12 15:49:00 -07:00
Stojce Slavkovski
1959768513 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-13 00:45:06 +02:00
barnold1953
12eb9114e8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-12 15:40:56 -07:00
barnold1953
91f23fcf2d Fix for click and drag with sixense 2014-06-12 15:39:40 -07:00
barnold1953
a13ef5c3bf Made applicationoverlay more readable 2014-06-12 13:19:02 -07:00
barnold1953
bc293071d6 Removed left handed menu option 2014-06-12 12:25:22 -07:00
barnold1953
18543ff313 Support for multiple oculus overlay magnifiers 2014-06-12 12:07:25 -07:00
Andrzej Kapolka
5c7e0cfd4c Merge pull request #3015 from ctrlaltdavid/build_warning_fix 
Fix build warning in Audio.cpp
 2014-06-12 11:23:52 -07:00
barnold1953
762751ef6a Store the last mouse move input type for application overlay 2014-06-12 10:47:11 -07:00
barnold1953
d0b1880ee4 Experimenting with ambidextrous sixense mouse input 2014-06-12 10:20:35 -07:00
David Rowe
1503946b7c Fix build warning in Audio.cpp 
\interface\src\Audio.cpp(309): warning C4018: '<' : signed/unsigned mismatch
 2014-06-11 21:11:49 -07:00
barnold1953
32a9eed88d Fixed build failure 2014-06-11 18:05:10 -07:00
barnold1953
14a591c5d8 Move to previous line 2014-06-11 17:35:50 -07:00
barnold1953
d993fd52f2 Cleaned up a small bit of code 2014-06-11 17:27:00 -07:00
barnold1953
84e01e6b25 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-11 17:22:30 -07:00
barnold1953
2fec7400e2 Added menu options for sixense mouse input 2014-06-11 17:21:59 -07:00
barnold1953
eff097638c Implementd sixense mouse emulation 2014-06-11 17:02:08 -07:00
Brad Hefta-Gaub
107fbf8c29 Merge pull request #3012 from wangyix/master 
added OctreePacketProcessor::nodeKilled to Application::nodeKilled instead of connecting it to NodeList::nodeKilled
 2014-06-11 16:00:59 -07:00
wangyix
ac0b037f0f removed connect(); put call into Application::nodeKilled 
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
 2014-06-11 15:25:00 -07:00
Stephen Birarda
82bf6002e2 only display the OAuthWebViewHandler when we need to ask user for authorization 2014-06-11 14:57:05 -07:00
wangyix
a8c9780004 updated connect() to qt5 format 2014-06-11 12:13:27 -07:00
Brad Hefta-Gaub
62f85d0794 Merge pull request #3004 from matsukaze/master 
Job #19766 BUG: Stop or reload all scripts crashes interface
 2014-06-11 11:51:03 -07:00
wangyix
fc07ceb412 added killNode() slot for _packetCounts garbage collection 2014-06-11 10:54:44 -07:00
wangyix
01005dc792 Merge remote-tracking branch 'upstream/master' 2014-06-11 10:09:49 -07:00
matsukaze
679846267e Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3 
Same comments as before, but without the local files changes mistakenly
checked in.
 2014-06-10 22:42:01 -04:00
matsukaze
1e1cc69287 Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3" 
This reverts commit 46f2ab73bc.
 2014-06-10 22:37:34 -04:00
matsukaze
46f2ab73bc Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3 
Move the conversion of scriptName to QUrl to the beginning of
Application::loadScript. Use the scriptURLString to query the
_scriptEngineHash map.
 2014-06-10 22:29:58 -04:00
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
Stojce Slavkovski
3a6cbc257c Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-10 00:08:28 +02: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
Stojce Slavkovski
939f8c49de return balance in satoshis 2014-06-08 15:55:16 +02:00
Stojce Slavkovski
b3279e03ca references fix 2014-06-07 23:27:51 +02:00
Stojce Slavkovski
8de2bdfb99 expose account details via AccountScriptingInterface 2014-06-07 23:17:49 +02:00
Stojce Slavkovski
6365f6b857 Extend TextOverlay to accept font size 
Fix TextRenderer color rendering
 2014-06-07 22:24:35 +02:00
Stojce Slavkovski
9810335adf Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 10:33:41 +02:00
Stojce Slavkovski
fea1433ced Add initial mybalance script 2014-06-07 10:32:36 +02: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