Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19664 commits 2 branches 0 tags 1.1 GiB
Commit graph

19664 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan
650a5d694f Merge remote-tracking branch 'hifi/master' 2014-12-04 11:05:33 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request #3899 from huffman/entity-tools-fix-registration-point 
Entity tools fix registration point
 2014-12-04 11:04:27 -08:00
Sam Gateau
94cdae073b Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 11:02:23 -08:00
ZappoMan
11f10f9512 make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances 2014-12-04 10:54:04 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request #3896 from huffman/fix-entity-selection 
Fix entity tool selection when inactive
 2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6 Version 1.12 of the walk.js script 2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
ZappoMan
958b37dead Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-04 09:38:38 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Ryan
d5b95238b9 Merge remote-tracking branch 'hifi/master' 2014-12-04 08:28:13 -08:00
Sam Gateau
592e902f46 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 00:25:15 -08:00
Sam Gateau
30d87ee026 Trying to capture light information in order to get the one GLobal Light object containg the intensity value 2014-12-04 00:24:08 -08:00
Philip Rosedale
dd8deeea59 simpler butterflies script that doesn't put as much traffic on entity server 2014-12-03 22:39:11 -08:00
Atlante45
e246b979f7 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-03 17:50:17 -08:00
Brad Hefta-Gaub
c901b8d1eb Merge pull request #3895 from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-03 17:26:00 -08:00
Atlante45
8d814ab07b Updated Oculus pickray 2014-12-03 17:05:42 -08:00
Atlante45
bd39688c62 Magnifiy window tweaks 2014-12-03 17:04:26 -08:00
Andrew Meadows
ab011d5b30 fix for non-animating models 2014-12-03 16:49:49 -08:00
Andrzej Kapolka
6764f29cd2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 16:49:10 -08:00
Andrzej Kapolka
8fb766a5d0 Only recreate the renderers for nodes that have changed. 2014-12-03 16:44:13 -08:00
Atlante45
0624ab7c72 Fixed aspect ratio and cropped overlay texture 2014-12-03 16:04:23 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Philip Rosedale
abd54a4d7b Merge branch 'master' of https://github.com/worklist/hifi 2014-12-03 15:06:29 -08:00
Ryan
f2952b2fef Merge remote-tracking branch 'hifi/master' 2014-12-03 15:05:32 -08:00
Atlante45
73004d1bee Decoupled reticules from Overlays view 2014-12-03 14:40:47 -08:00
Brad Hefta-Gaub
96c3bfceef Merge pull request #3889 from huffman/entity-tools-polish-2 
Entity tools polish - round 2
 2014-12-03 14:31:27 -08:00
Brad Hefta-Gaub
f10b656877 Merge pull request #3870 from AndrewMeadows/thermonuclear 
pull entity simulation out of EntityTree
 2014-12-03 14:30:44 -08:00
Andrzej Kapolka
7a81e6c9e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 14:30:31 -08:00
Sam Gateau
322dd38322 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-03 14:23:49 -08:00
Andrzej Kapolka
f76ff6a70a Merge pull request #3894 from ey6es/master 
Bump up the glyph texture size so that we don't spill over into another
 2014-12-03 14:19:55 -08:00
Andrzej Kapolka
df23a84cc2 Bump up the glyph texture size so that we don't spill over into another 
texture.
 2014-12-03 14:18:47 -08:00
Sam Gateau
913007939b Trying to read the light attribute 2014-12-03 14:12:50 -08:00
Philip Rosedale
5c59fc786d Merge pull request #3893 from ey6es/master 
Fixes for erroneous download percentages (resources and metavoxels); warning fix, metavoxel edit fix.
 2014-12-03 14:03:07 -08:00
Ryan Huffman
d08337326c Update selection box color to red 2014-12-03 12:59:51 -08:00
Andrzej Kapolka
fecb225a06 Prevent erroneous resource download percentages; Qt reports the total bytes as 
-1 before the actual size is available.
 2014-12-03 12:55:58 -08:00
Andrzej Kapolka
88048e8599 Make sure the position of the heightfield/voxel brush is valid before acting. 2014-12-03 12:47:32 -08:00
Andrzej Kapolka
d975e3f0ce Fixed signed/unsigned warnign. 2014-12-03 12:38:10 -08:00
Andrzej Kapolka
1e93137e6b Fix for overflow when computing metavoxel stats. 2014-12-03 12:24:58 -08:00
Andrzej Kapolka
e32c214e4d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 12:08:06 -08:00
Ryan
556e9477c8 Merge remote-tracking branch 'hifi/master' 2014-12-03 11:14:49 -08:00
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -08:00
Philip Rosedale
d34bf8ccd3 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-03 10:55:43 -08:00
Ryan
623af78f88 Merge remote-tracking branch 'hifi/master' 2014-12-03 10:54:59 -08:00
Brad Hefta-Gaub
f70f07e694 Merge pull request #3890 from PhilipRosedale/master 
When in HMD, arrow keys make jump turns
 2014-12-03 10:54:22 -08:00
Philip Rosedale
f897e2290d Merge branch 'master' of https://github.com/worklist/hifi 2014-12-03 10:54:09 -08:00