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

18363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
e66a96b020 Merge pull request #3718 from ctrlaltdavid/hmd-leap-offset 
Better estimate of HMD offset for Leap-on-HMD
 2014-11-03 11:40:48 -08:00
David Rowe
d085be6c47 Better estimate of HMD offset 2014-11-03 11:14:04 -08:00
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
AndrewMeadows
43a33730ea Merge pull request #3713 from ey6es/metavoxels 
Allow heightfield color/material layers to be of different resolutions than the height layer.
 2014-11-03 11:00:58 -08:00
AndrewMeadows
b246af7511 Merge pull request #3712 from ctrlaltdavid/fix-log-file-eols 
Fix log file missing end of lines
 2014-11-03 08:44:23 -08:00
AndrewMeadows
8d02e64804 Merge pull request #3711 from ctrlaltdavid/20130 
CR for Job #20130 - Repeated inspect.js errors
 2014-11-03 08:43:53 -08:00
AndrewMeadows
80a385b23a Merge pull request #3710 from ZappoMan/lockAndMaterialProperties 
Improvements to Entities
 2014-11-03 08:41:55 -08:00
AndrewMeadows
61d12ba0a9 Merge pull request #3709 from huffman/entity-tool-updates 
Entity tool cleanup and fixes
 2014-11-03 08:37:01 -08:00
AndrewMeadows
aa726bdb56 Merge pull request #3708 from DaveDubUK/19996 
CR for Job #19996 - Applying the principles of animation to a procedural animation script
 2014-11-03 08:25:43 -08:00
David Rowe
ccc5e0d6ca Increase Interface's disk cache from default 50MB to 10GB 2014-10-31 10:06:43 -07:00
David Rowe
29eeeb3384 Fix log file missing end of lines 2014-10-31 09:24:50 -07:00
David Rowe
f84030ce3f Fix pan and orbit camera controls in inspect.js after API change 2014-10-30 19:16:29 -07:00
Andrzej Kapolka
2314ab3624 Removed unused variable, fixed painting materials on heightfields with greater 
resolution.
 2014-10-30 18:05:40 -07:00
Andrzej Kapolka
8ce9521604 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 16:52:42 -07:00
Andrzej Kapolka
fd12c7a0d7 One more piece of the resolution puzzle. 2014-10-30 16:52:19 -07:00
ZappoMan
e78ac4c1d4 Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 16:36:19 -07:00
ZappoMan
fecea5fe3c fixes to the Model List feature in editModels.js and added it to new edit 2014-10-30 15:27:05 -07:00
ZappoMan
5e21701a5b fix possible deadlocks 2014-10-30 15:22:50 -07:00
ZappoMan
915a0d52d4 only remap textures on the render thread, fix deadlock, and improve handling of changes to textures 2014-10-30 15:01:59 -07:00
Ryan Huffman
7ccacbd8ac Remove old entity selection code and fix rotation bug 2014-10-30 14:57:23 -07:00
ZappoMan
81cc15495f rename Models to Entities, and add menu option to disable Light entities 2014-10-30 14:43:43 -07:00
Ryan Huffman
55fdbfec1f Disable edit camera tools 2014-10-30 14:43:35 -07:00
Brad Hefta-Gaub
8c013a84ff Merge pull request #3707 from highfidelity/revert-3669-20074 
Revert "Worklist #20074"
 2014-10-30 14:41:54 -07:00
Brad Hefta-Gaub
1c4e71ebc1 Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
ZappoMan
03f988b062 Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 14:19:44 -07:00
Brad Hefta-Gaub
7b5d2ef9f8 Merge pull request #3706 from huffman/entity-tool-help 
Add edit entities help window
 2014-10-30 12:53:17 -07:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Andrzej Kapolka
49e5cc51a6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 11:43:32 -07:00
Brad Hefta-Gaub
12fbc9a039 Merge pull request #3705 from birarda/lobby 
lobby easter egg for status
 2014-10-30 11:40:24 -07:00
Stephen Birarda
bc24fa7de0 lobby easter egg for status 2014-10-30 11:39:37 -07:00
Andrzej Kapolka
c46d0f4d56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 11:37:36 -07:00
ZappoMan
db606ee7ff Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 11:36:54 -07:00
AndrewMeadows
4cf77d1c6c Merge pull request #3702 from ZappoMan/lockAndMaterialProperties 
Lock and textures properties
 2014-10-30 11:35:38 -07:00
ZappoMan
6f4fd36c8f Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 11:28:33 -07:00
Brad Hefta-Gaub
cdca6588e2 Merge pull request #3704 from huffman/orbit-camera 
Update edit camera controls to hide cursor when orbiting
 2014-10-30 11:28:27 -07:00
ZappoMan
bb51417844 Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties 2014-10-30 11:27:52 -07:00
ZappoMan
6d613fba3c removed debug 2014-10-30 11:26:48 -07:00
Ryan Huffman
87a17f869f Update edit camera controls to hide cursor 2014-10-30 11:25:39 -07:00
Brad Hefta-Gaub
467f2d6df4 Merge pull request #3703 from birarda/lobby 
show a reticle sphere in lobby interface
 2014-10-30 11:22:26 -07:00
Stephen Birarda
409a01c498 show the reticle sphere in lobby interface 2014-10-30 11:16:52 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
Stephen Birarda
35dc72521b only show sphere if user is wearing the oculus 2014-10-30 10:44:55 -07:00
Stephen Birarda
ec126f16d5 make the oculus reticle a sphere overlay 2014-10-30 10:43:10 -07:00
Stephen Birarda
a37fcbeb3b Merge pull request #3701 from birarda/lobby 
add a missing semicolon to lobby
 2014-10-30 10:22:44 -07:00
Stephen Birarda
ae4233c680 add a missing semicolon for @zappoman 2014-10-30 10:22:30 -07:00
Stephen Birarda
608c85d183 Merge pull request #3700 from birarda/lobby 
don't render Avatars when in lobby
 2014-10-30 10:22:16 -07:00
Stephen Birarda
f0d6dafcd4 Merge pull request #3698 from birarda/master 
final tweak for linux unistd include
 2014-10-30 10:22:11 -07:00
Stephen Birarda
2aebfc968a don't render Avatars when in lobby 2014-10-30 10:21:52 -07:00
Philip Rosedale
45725db78e Merge pull request #3699 from birarda/lobby 
use new lobby panel wall to avoid shimmer on frame edge
 2014-10-30 10:20:18 -07:00
Stephen Birarda
183d080b1e use new lobby panel wall to avoid shimmer on frame edge 2014-10-30 10:11:05 -07:00