Stephen Birarda
|
4c338a9950
|
handle possibility of HockeyApp inclusion
|
2015-01-27 17:08:57 -08:00 |
|
Stephen Birarda
|
bf454f3b57
|
add the oculus mobile sdk as an Android requirement
|
2015-01-27 16:02:01 -08:00 |
|
Stephen Birarda
|
730be964fe
|
add instructions for Oculus Mobile SDK
|
2015-01-27 16:00:58 -08:00 |
|
Stephen Birarda
|
d09b8f8c2e
|
remove enter VR mode and leave VR mode
|
2015-01-27 14:52:28 -08:00 |
|
Stephen Birarda
|
d420674edd
|
apply orientation change to listening position for audio
|
2015-01-27 14:50:02 -08:00 |
|
Stephen Birarda
|
54660dd1a2
|
resolve conflicts on merge with upstream master
|
2015-01-27 14:24:48 -08:00 |
|
Stephen Birarda
|
893ad0caa7
|
hack for vr mode, output sensor readings when docked
|
2015-01-27 14:23:40 -08:00 |
|
Brad Hefta-Gaub
|
2403533e0e
|
Merge pull request #4178 from huffman/fix-mesh-textures
Fix failing QMetaObject::invokeMethod call
|
2015-01-27 14:00:58 -08:00 |
|
Ryan Huffman
|
7ececd793a
|
Fix failing QMetaObject::invokeMethod call
|
2015-01-27 13:59:46 -08:00 |
|
Grayson Stebbins
|
e290fa2e7f
|
Small changes, removed VS section
Removed the Visual Studio section -- now that we have a better Visual Studio 2013 section it was unnecessary.
|
2015-01-27 13:42:24 -08:00 |
|
Grayson Stebbins
|
acb1494e3e
|
Small edits to links
|
2015-01-27 13:38:58 -08:00 |
|
Grayson Stebbins
|
36e9f6b9e0
|
Reminder about all dependencies
|
2015-01-27 13:33:29 -08:00 |
|
Andrew Meadows
|
e2ffe00c38
|
Merge pull request #4172 from huffman/fix-image-overlay-rescale
Fix image overlay rescale
|
2015-01-27 13:07:15 -08:00 |
|
Brad Hefta-Gaub
|
0c4dc4100d
|
Merge pull request #4176 from huffman/fix-inspect
Fix inspect + editEntities cameras from clashing
|
2015-01-27 13:05:33 -08:00 |
|
Brad Hefta-Gaub
|
0c53193e79
|
Merge pull request #4175 from cozza13/20283
CR for Job #20283 - Clean up scripts that have recently been added.
|
2015-01-27 13:05:17 -08:00 |
|
Brad Hefta-Gaub
|
a46fda3749
|
Merge pull request #4174 from huffman/delete-entity
Update deleteEntity to obey entity locked property
|
2015-01-27 13:05:05 -08:00 |
|
Brad Hefta-Gaub
|
064f49db3d
|
Merge pull request #4173 from thoys/patch-2
Update README.md
|
2015-01-27 13:04:53 -08:00 |
|
Andrew Meadows
|
6b6e846378
|
Merge pull request #4177 from ZappoMan/fixGlitches
Some physics improvements
|
2015-01-27 13:02:11 -08:00 |
|
Andrew Meadows
|
f2f054f689
|
Merge pull request #4161 from ey6es/master
Partial implementation of "granularity" setting for metavoxel tools.
|
2015-01-27 12:52:32 -08:00 |
|
Stephen Birarda
|
a4a06751da
|
attempt to enter VR mode when docked, get sensor data
|
2015-01-27 12:43:44 -08:00 |
|
Stephen Birarda
|
5aa49e4e8d
|
check in idle timer for headset dock
|
2015-01-27 11:47:06 -08:00 |
|
Grayson Stebbins
|
1ce92c1939
|
added bullet to externals list
|
2015-01-27 11:45:26 -08:00 |
|
Stephen Birarda
|
c0b61e4c38
|
register GVR receivers with QtActivity
|
2015-01-27 11:38:38 -08:00 |
|
ZappoMan
|
23892ab1e7
|
fixed comments
|
2015-01-27 11:38:14 -08:00 |
|
Chris Collins
|
283a056a43
|
remove VRui
remove VRui
|
2015-01-27 11:37:31 -08:00 |
|
Stephen Birarda
|
43e907ec83
|
get QtActivity notifications about GVR changes
|
2015-01-27 11:37:07 -08:00 |
|
ZappoMan
|
94e04e2d7d
|
removed extra whitespace
|
2015-01-27 11:34:46 -08:00 |
|
ZappoMan
|
b1586d4f90
|
move debug into ifdef
|
2015-01-27 11:29:17 -08:00 |
|
Ryan Huffman
|
80002551f9
|
Update editEntities camera to not enable if camera is in independent mode
|
2015-01-27 11:28:39 -08:00 |
|
Ryan Huffman
|
2556b4790b
|
Update inspect.js to not activate if camera is in independent mode
|
2015-01-27 11:28:20 -08:00 |
|
ZappoMan
|
45dbff67f8
|
more hacking
|
2015-01-27 11:15:33 -08:00 |
|
Chris Collins
|
411541b884
|
Tidy up some scripts.
Tidy up scripts. Make some changes to some script references and
reorganize.
|
2015-01-27 11:04:50 -08:00 |
|
Grayson Stebbins
|
a012562323
|
Correct bullet link, change order of build guides
|
2015-01-27 10:52:15 -08:00 |
|
Ryan Huffman
|
9fd352e1dc
|
Break long lines in TextureCache.h/cpp
|
2015-01-27 10:27:05 -08:00 |
|
Ryan Huffman
|
f65640a593
|
Update EntityTree.cpp to not delete entity when locked
|
2015-01-27 10:24:54 -08:00 |
|
Ryan Huffman
|
86f7c28ee9
|
Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked
|
2015-01-27 10:24:28 -08:00 |
|
Thijs Wenker
|
5f2cfc3cde
|
Update README.md
default number of assignment-clients to start
|
2015-01-27 19:16:20 +01:00 |
|
Grayson Stebbins
|
f085b81cde
|
Add specifics on env variable setting location
|
2015-01-27 10:10:10 -08:00 |
|
Ryan Huffman
|
6a9f135e1c
|
Cleanup image clipping in ImageOverlay
|
2015-01-27 08:11:37 -08:00 |
|
Ryan Huffman
|
d27a26967f
|
Update ImageOverlay to take texture rescaling into account
|
2015-01-27 08:09:47 -08:00 |
|
Ryan Huffman
|
1f6932bdcb
|
Update TextureCache to store original image dimensions (pre-scale)
|
2015-01-27 08:09:20 -08:00 |
|
Philip Rosedale
|
4c10f6f23b
|
Merge pull request #4171 from Atlante45/hydra_grab_fix
Hydra grab fix
|
2015-01-26 19:48:30 -08:00 |
|
ZappoMan
|
83d1cc911a
|
hacking
|
2015-01-26 19:38:24 -08:00 |
|
Atlante45
|
cf631bf3fc
|
Remove unnecessary stopAnimation in script to get rid of sacades
|
2015-01-26 19:20:47 -08:00 |
|
Atlante45
|
f84f6e9b66
|
Restore joints state on stopAnimation
|
2015-01-26 19:12:18 -08:00 |
|
Philip Rosedale
|
2108cac38e
|
Merge pull request #4170 from Atlante45/hydra_grab_fix
Fixed mapped rotation + doubled it
|
2015-01-26 18:27:42 -08:00 |
|
Atlante45
|
64f8495681
|
Fixed mapped rotation + doubled it
|
2015-01-26 18:20:08 -08:00 |
|
Philip Rosedale
|
78e1769468
|
Merge pull request #4169 from Atlante45/hydra_grab_fix
Hydra grab fix
|
2015-01-26 17:31:13 -08:00 |
|
ZappoMan
|
02c0700db3
|
support for skipping forward on new edit packets from server
|
2015-01-26 17:25:06 -08:00 |
|
Atlante45
|
4b3291d946
|
Some cleanup in hydraGrab.js
|
2015-01-26 17:11:49 -08:00 |
|