Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13858 commits 71 branches 56 tags 1.2 GiB
Commit graph

13858 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
056db4ba7d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-12 11:45:51 -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
b05aa3405c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-12 10:41:57 -07:00
barnold1953
db94ae7449 Invert hydra move view and thrust controllers to match consoles 2014-06-12 10:27:54 -07:00
barnold1953
d0b1880ee4 Experimenting with ambidextrous sixense mouse input 2014-06-12 10:20:35 -07:00
Brad Hefta-Gaub
09dd2dfbb6 Merge pull request #3014 from Barnold1953/master 
Sixense Mouse Input
 2014-06-12 09:43:30 -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
Andrzej Kapolka
6c98248e50 More progress on generics. 2014-06-11 18:30:01 -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
Andrzej Kapolka
6260d661f3 More work on generic containers. 2014-06-11 16:54:35 -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
7aef5edb8f removed debug var 2014-06-11 15:27:24 -07:00
wangyix
0601c24b24 removed debug prints 2014-06-11 15:26:22 -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
Philip Rosedale
2bb6c3d023 Merge pull request #3013 from birarda/master 
only display the OAuth window when authorization required
 2014-06-11 15:23:50 -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
Andrzej Kapolka
c045595ccb More progress on refactoring. 2014-06-11 14:25:45 -07:00
Andrzej Kapolka
a529bc7e28 Refactoring. 2014-06-11 13:40:12 -07:00
wangyix
a8c9780004 updated connect() to qt5 format 2014-06-11 12:13:27 -07:00
wangyix
2080cc3dee removed debug variable 2014-06-11 11:59:15 -07:00
wangyix
decd6109fb made nodeKilled signatures match 2014-06-11 11:57:54 -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
Brad Hefta-Gaub
1c6b2a3f33 Merge pull request #3011 from Barnold1953/OculusOverlay 
growTrees.js
 2014-06-11 11:32:20 -07:00
Andrzej Kapolka
6b48554fdd Added explanatory comment. 2014-06-11 11:26:21 -07:00
Andrzej Kapolka
92b5d6037d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-11 11:19:21 -07:00
wangyix
760627003f killNode() to nodeKilled() 2014-06-11 11:11:04 -07:00
AndrewMeadows
d9b4032ca0 Merge pull request #3010 from wangyix/master 
NACK packets are not sent to nodes with unprocessed packets; re-sent packets will be counted towards PPS
 2014-06-11 11:10:47 -07:00
wangyix
fc07ceb412 added killNode() slot for _packetCounts garbage collection 2014-06-11 10:54:44 -07:00
Dev5
98bd7c02e9 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-11 10:10:43 -07:00
wangyix
01005dc792 Merge remote-tracking branch 'upstream/master' 2014-06-11 10:09:49 -07:00
AndrewMeadows
49a33ff46a Merge pull request #3006 from ey6es/metavoxels 
Streaming/delta-streaming for script values.
 2014-06-11 09:25:39 -07:00
Dev5
41b9c3b704 Removed empty update function 2014-06-11 09:06:00 -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
9aa152f43f More TypeReader refactoring progress. 2014-06-10 18:29:21 -07:00
Dev5
a9a455ca1d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-10 17:19:22 -07:00
Dev5
faa5b1d2f2 Added simple tree placement script that has a UI similar to edit voxels. It grows big trees, dont grow near something important. 2014-06-10 17:18:32 -07:00
Andrzej Kapolka
f677858891 Merge pull request #3009 from ZappoMan/bugFix 
fix some bugs in models
 2014-06-10 16:56:56 -07:00
Andrzej Kapolka
bdbed066a8 Merge pull request #3008 from AndrewMeadows/bug-fix 
fix for broken neck on some body models
 2014-06-10 16:54:06 -07:00
Andrzej Kapolka
69899f4d37 Edging towards generic container types. 2014-06-10 16:53:00 -07:00