Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 07:51:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11570 commits 73 branches 59 tags 1.2 GiB
Commit graph

11570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
3d43956c11 bounding shape relative to model's root Joint 2014-04-01 11:39:40 -07:00
Andrew Meadows
9f9127b716 draw head bounding shape first 2014-04-01 11:39:24 -07:00
Andrzej Kapolka
fb37ef5bca Fix for annoying intermittent seg fault on Linux exit. Closes #2542. 2014-04-01 11:25:39 -07:00
Andrzej Kapolka
afb5711879 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-01 10:40:38 -07:00
Andrew Meadows
03d04e194d Init bounding Extents for more correct shapes 2014-04-01 10:39:58 -07:00
AndrewMeadows
f12da05722 Merge pull request #2581 from Atlante45/more_upload_fixes 
More upload fixes
 2014-04-01 09:51:25 -07:00
AndrewMeadows
ff211dbc2b Merge pull request #2573 from PhilipRosedale/master 
Audio VU level meter to replace scope
 2014-04-01 09:41:39 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model 
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
 2014-04-01 09:25:25 -07:00
Philip Rosedale
7d12fcee9d 220Hz tone injection option for easier audio quality checks 2014-03-31 21:55:29 -07:00
Andrzej Kapolka
5aa9b981be Hopefully, a fix for the Windows build. 2014-03-31 18:43:38 -07:00
James Brotchie
19b8f101d8 Improved hifi:// style URL scheme handling. 
First steps towards implementing #1463.

 - Moved url parsing code from Application::event to
   Menu::goTo(QString).
 - Handle destination component of URL as either a @username,
   #place, or x-xx,y-yy,z-zz style coordinate.
 - Added support for entering hifi:// style URL into @ invoked
   goto menu option.
 2014-04-01 11:31:43 +10:00
Philip Rosedale
81d1eb7ed2 removed unused procedural movement code 2014-03-31 18:24:58 -07:00
Andrzej Kapolka
929f08dec2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-31 18:22:43 -07:00
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -07:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
Atlante45
f027aac76b Fix to model upload in account manager 2014-03-31 17:19:04 -07:00
Stephen Birarda
89cb1ad527 Merge pull request #2580 from birarda/master 
add a missing line for symmetric socket activation
 2014-03-31 16:12:41 -07:00
Stephen Birarda
9e58fc3e47 Merge pull request #2579 from brotchie/master 
Hitting enter no longer shows chat window when chat is disabled
 2014-03-31 16:12:20 -07:00
Stephen Birarda
135d97d0a7 add a pretty important missing line for symmetric socket activation 2014-03-31 15:59:54 -07:00
Stephen Birarda
5061d2781c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-31 15:58:56 -07:00
James Brotchie
da116608a0 Hitting enter no longer shows chat window when chat is disabled. 
When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
 2014-04-01 07:38:22 +10:00
Philip Rosedale
6877491f34 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-31 12:39:28 -07:00
Stephen Birarda
d737638d8f Merge pull request #2576 from brotchie/patch-1 
Update BUILD.md
 2014-03-31 09:40:27 -07:00
Philip Rosedale
3babb5e0bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-31 07:25:46 -07:00
Philip Rosedale
d4b3113692 Merge pull request #2575 from brotchie/master 
Remember most recently opened script location.
 2014-03-31 07:21:19 -07:00
Philip Rosedale
356df8ab31 Merge pull request #2566 from birarda/master 
add a symmetric ping type to handle open servers with clients on symmetric nats
 2014-03-31 07:20:13 -07:00
James Brotchie
59bc0ffb9d Update BUILD.md 
Not sure about anybody else but I needed glm 0.9.5.2 the compile without errors. 0.9.5.0 (as suggested in the current BUILD.md) failed because the precision template parameter was undefined.
 2014-03-31 23:33:17 +10:00
James Brotchie
6880160bc0 Remember most recently opened script location. 
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
 2014-03-31 22:08:38 +10:00
Andrzej Kapolka
10588cff9f "Clear spanners" clears the voxelized attributes, too. 2014-03-30 15:51:39 -07:00
Andrzej Kapolka
40b1d2f284 Fix for voxelization on removal. 2014-03-29 22:39:49 -07:00
Philip Rosedale
27f0214032 first pass audio VU scope 2014-03-28 23:09:51 -07:00
Philip Rosedale
91ecbe9086 Merge pull request #2568 from birarda/hydra-move 
repairs to hydraMove script to apply thrust from headOrientation
 2014-03-28 22:57:16 -07:00
Andrzej Kapolka
7580951b92 More progress on voxelizing spanners. 2014-03-28 20:19:28 -07:00
Philip Rosedale
78ee8706d6 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-28 16:48:15 -07:00
Andrzej Kapolka
176d8f746e Finally at the point of actually getting spanners to turn into voxels. 2014-03-28 15:19:40 -07:00
Grayson Stebbins
4d16547362 Note about shortcut for domain dialog 
(set your domain via Cmnd+D/Cntrl+D)
 2014-03-28 14:50:26 -07:00
Stephen Birarda
61711c7aaa Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-28 13:30:06 -07:00
Andrzej Kapolka
78896d6af9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 13:29:11 -07:00
Stephen Birarda
075ff22356 Merge pull request #2572 from ddobrev/19520 
Fixed a typo that resulted in a wrong padding of a widget
 2014-03-28 13:28:39 -07:00
Dimitar Dobrev
f9cee2ccfa Fixed a typo that resulted in a wrong padding of a widget. 2014-03-28 22:21:55 +02:00
Stephen Birarda
44860a5f5a put servers alphabetically first in node list 2014-03-28 12:01:37 -07:00
Andrzej Kapolka
cba57f20dd Working on spanner attributes. 2014-03-28 11:38:02 -07:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Andrzej Kapolka
fd5f378e1c Better color/normal merging. 2014-03-28 11:16:55 -07:00
Brad Hefta-Gaub
4acb146655 Merge pull request #2570 from birarda/shared-assignment-pointer 
use a QSharedPointer to allow for more elegant assignment cleanup
 2014-03-28 11:03:36 -07:00
Andrew Meadows
5406490719 rename _shapes -> _jointShapes 
also stubbed Model::createBoundingShape()
 2014-03-28 11:00:30 -07:00
Stephen Birarda
52bfae5b4d Merge pull request #2569 from ddobrev/19520 
Restored code that Git had somehow deleted
 2014-03-28 10:54:44 -07:00
Stephen Birarda
eb35b63651 use a shared pointer for more elegant cleanup at assignment conclusion 2014-03-28 10:48:44 -07:00
Dimitar Dobrev
9b43508098 Restored code that Git had somehow deleted. 2014-03-28 19:26:16 +02:00
Stephen Birarda
0c28907609 fix the hydraMove script to pull you based on head orientation, not body 2014-03-28 10:08:00 -07:00