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

19334 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
958b37dead Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-04 09:38:38 -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
Andrew Meadows
ab011d5b30 fix for non-animating models 2014-12-03 16:49:49 -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
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
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
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
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -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
790d3c1cc6 Merge pull request #3892 from birarda/master 
fix filename/URL discrepancy for local scripts
 2014-12-03 10:51:35 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Ryan Huffman
5c5c66b265 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2 2014-12-03 08:40:38 -08:00
Philip Rosedale
a549b4b152 Merge pull request #3891 from birarda/master 
fix for delayed domain-server heartbeats
 2014-12-03 08:40:10 -08:00
Stephen Birarda
49a087018f fix for delayed heartbeats, late socket lookup 2014-12-03 08:22:50 -08:00
Stephen Birarda
b346813250 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-03 08:03:23 -08:00
Philip Rosedale
d63ace9f61 fix angular velocity from oculus, tweak hair 2014-12-02 23:53:46 -08:00
Philip Rosedale
57e2f71bb7 remove unused body delta pitch, roll 2014-12-02 23:24:47 -08:00
Philip Rosedale
3ca20a7eee Add jump/warp turning when in HMD 2014-12-02 23:08:34 -08:00
Ryan Huffman
4e78003520 Fix issue with selection boxes not being hidden 2014-12-02 18:03:00 -08:00
Ryan Huffman
f25d509363 Remove unused lastPlaneIntersection 2014-12-02 17:50:34 -08:00
Ryan Huffman
aa067bc153 Update UpDown translation to follow the mouse as other tools do 2014-12-02 17:49:25 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958 Update checkMove to only update rotation handles instead of all handles 2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2 Move baseOfEntityProjectionOverlay update to updateHandles() 2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a Increase size of selection boxes 2014-12-02 15:59:56 -08:00
Ryan Huffman
2b5a4e4563 Add selection boxes in multi-selection mode 2014-12-02 15:56:43 -08:00
Ryan Huffman
77365ec282 Move entity selection to click event and add ability to deselect 2014-12-02 15:49:45 -08:00
Philip Rosedale
73d358b150 Merge pull request #3888 from PhilipRosedale/master 
Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js
 2014-12-02 15:31:50 -08:00
Philip Rosedale
8c506c0301 Merge pull request #3887 from samcake/tot 
Hack for the Viking Palace scene before demo for good looking lightmaps
 2014-12-02 15:31:15 -08:00
ZappoMan
bb6e302d69 support toggle of light picking in newEditEntities.js 2014-12-02 15:23:05 -08:00
Ryan Huffman
167ab05de4 Default 'Allow Select Large/Small Models' to true 2014-12-02 15:19:51 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Philip Rosedale
06b22cf605 ...and don't turn on/off UI from hydra 2014-12-02 14:50:25 -08:00
Philip Rosedale
1ce201c04f add same for rotation 2014-12-02 14:33:19 -08:00
Philip Rosedale
2f11501e5b Fix constant movement with hydra by adding null zone for thrust 2014-12-02 14:28:46 -08:00
Sam Gateau
8b75272cde Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-02 13:49:28 -08:00
Sam Gateau
40df497374 Hack for the Viking Palace scene before demo for good looking lightmaps 2014-12-02 13:48:59 -08:00
Andrzej Kapolka
b613511b74 Merge pull request #3886 from ey6es/master 
At least on Linux, fixes an annoying issue where closing the application
 2014-12-02 13:24:03 -08:00
Andrzej Kapolka
4d233c09a3 At least on Linux, fixes an annoying issue where closing the application 
window causes it to disappear and reappear briefly before exiting.
 2014-12-02 13:19:39 -08:00
ZappoMan
cc012aad00 reset view frustum 2014-12-02 12:54:10 -08:00