Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 04:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23015 commits 25 branches 0 tags 1.1 GiB
Commit graph

11279 commits

Author SHA1 Message Date
Brad Hefta-Gaub
fd6f8c7792 Merge pull request #4382 from huffman/import-export 
Improvements to Import/Export entities
 2015-03-06 16:31:57 -08:00
Andrew Meadows
021510ae68 merge upstream/master into andrew/isentropic 2015-03-06 15:38:10 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Stephen Birarda
a4963f1895 render application overlay only if enabled 2015-03-06 15:22:25 -08:00
Grayson Stebbins
7c78e598b8 Update to .com instead of .io in Welcome dialog 2015-03-06 15:15:48 -08:00
ZappoMan
ffab6ffe48 tweaks to hacks for detecting mixamo files 2015-03-06 15:11:02 -08:00
David Rowe
032896f75c Fix starting up fullscreen 2015-03-06 14:57:27 -08:00
David Rowe
22d9ff2788 Show/hide menu bar in non-VR fullscreen 2015-03-06 14:36:08 -08:00
Seth Alves
7a2977446a Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-06 08:47:05 -08:00
Clément Brisset
aed208a339 Merge pull request #4383 from huffman/fix-script-editor-icons 
Fix issue with Script Editor icons not showing up on first show
 2015-03-06 06:02:50 -08:00
Ryan Huffman
299035bc85 Move script editor show() call to DialogsManager 2015-03-05 15:05:17 -08:00
Ryan Huffman
03c03a20f9 Update pasteEntities to use vec3 2015-03-05 13:52:30 -08:00
Ryan Huffman
6848025504 Add exporting by entity ID to Application 2015-03-05 13:36:16 -08:00
Atlante45
7690301e58 Include functional 2015-03-05 21:49:22 +01:00
Ryan Huffman
71768ef275 Return entity IDs on paste 2015-03-05 12:36:45 -08:00
Ryan Huffman
a922619ebc Add Clipboard.exportEntities that takes a list of entity IDs 2015-03-05 12:36:10 -08:00
Atlante45
f4d8ee39dc Menu item for cache editor 2015-03-05 21:10:02 +01:00
Atlante45
908e946ac5 Hook up disk cache to the dialog manager 2015-03-05 21:09:23 +01:00
Atlante45
53f23d8452 Added disk cache editor 2015-03-05 21:08:14 +01:00
Atlante45
9d7144dab0 Bumped disk cache size to 10GB 2015-03-05 18:52:48 +01:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Seth Alves
ac0c4e8512 cap max speed at MAX_WALKING_SPEED 2015-03-04 19:57:06 -08:00
Andrew Meadows
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Andrew Meadows
b9cbd1ea6e witch internal EntityItem data to use meters 2015-03-04 09:38:37 -08:00
Seth Alves
b4998e9c53 falling onto an object works 2015-03-04 08:48:48 -08:00
David Rowe
8686e090c9 Don't upload skeletonless avatar model to HiFi servers 2015-03-03 22:34:07 -08:00
David Rowe
aad3f1dfd9 Automatically switch to default model if avatar model is skeletonless 2015-03-03 22:34:07 -08:00
David Rowe
30b77d4200 Don't crash if avatar model at start-up or loaded is skeletonless 2015-03-03 22:34:06 -08:00
Seth Alves
a254f017cc Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-03 18:37:40 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00
Stephen Birarda
0a74291377 Merge pull request #4373 from birarda/remove-xmpp 
fix web chat link for IRC
 2015-03-03 16:26:12 -08:00
Stephen Birarda
d3682b0297 fix web chat link for IRC 2015-03-03 16:03:47 -08:00
Brad Hefta-Gaub
fc048c3b03 Merge pull request #4368 from ctrlaltdavid/20377 
CR for 20377
 2015-03-03 15:51:42 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Seth Alves
7e4b597ca3 keep physics specific code in PhysicsEngine 2015-03-03 15:45:10 -08:00
Seth Alves
5d4ef8d5b8 initial flailing 2015-03-03 14:30:26 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Stephen Birarda
a961cd8ff3 show link to IRC in place of Qxmpp removal 2015-03-03 12:17:35 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
David Rowe
1b34b80b1a Use BrowsC_U to control both brows' up and down 2015-03-03 11:05:59 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
27b9b345ca remove ChatWindow includes from DialogsManager 2015-03-03 10:15:34 -08:00
Stephen Birarda
b270297406 remove a missed XmppClient include 2015-03-03 10:14:35 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
David Rowe
dd678dbc49 Use all DDE coefficients to achieve better face control 2015-03-02 19:05:13 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
ZappoMan
a338d96b9d only render the overlay if we're actually rendering the overlay 2015-02-27 18:00:51 -08:00
ZappoMan
9cc66f3da7 cleanup stats display behavior, reset default settings for timing details 2015-02-27 17:57:42 -08:00
Sam Gateau
5652852d1a Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-27 17:35:59 -08:00
Sam Gateau
f92efa13c8 fix typo 2015-02-27 17:35:08 -08:00
Sam Gateau
5ab3cbb7ec Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated 2015-02-27 17:11:16 -08:00
Philip Rosedale
af9108c79f Merge pull request #4338 from ctrlaltdavid/20368 
DO NOT MERGE - QA for 20368
 2015-02-27 14:16:55 -08:00
Philip Rosedale
9eee213bce Merge pull request #4353 from Atlante45/relax_face_tracker 
Relax blendshapes
 2015-02-27 13:36:22 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
David Rowe
797b1649a6 Merge branch 'master' into 20368 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-02-27 12:48:21 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties 
Update light properties (primarily for editEntities.js)
 2015-02-27 10:54:19 -08:00
Philip Rosedale
35205fbbf3 Merge pull request #4347 from samcake/temp1 
Introducing the SunSkyStage
 2015-02-27 10:37:02 -08:00
Atlante45
fa8e1549f6 Relax blendshapes 2015-02-27 19:33:01 +01:00
Atlante45
db90fcdb62 Simplify expression 2015-02-27 16:09:15 +01:00
Atlante45
8615bb7cff Make relaxation go to EPSILON within TIME 2015-02-27 15:58:28 +01:00
Atlante45
9849efe013 Exponential relaxation 2015-02-27 15:33:24 +01:00
Stephen Birarda
fc2f6d47bb remove references to PrioVR in interface code 2015-02-26 17:28:00 -08:00
Stephen Birarda
38f77190eb remove PrioVR from build files 2015-02-26 17:20:45 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Andrew Meadows
9ad88c3793 Referentials do math using meters 2015-02-26 13:42:08 -08:00
Atlante45
fdf9fdd877 Relax head/lean when not tracking 2015-02-26 20:05:47 +01:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Sam Gateau
fcb293d0b2 CLean up before pr 2015-02-26 10:45:00 -08:00
Atlante45
e37ef226fc Simplify lookForward compute 2015-02-26 19:21:14 +01:00
Atlante45
682b3f5e61 Remove unused angular velocity 2015-02-26 19:18:52 +01:00
Atlante45
f560f97c6b Only update active FaceTracker 2015-02-26 19:18:05 +01:00
Atlante45
b6968a6b15 Update Facetrackers 2015-02-26 19:15:49 +01:00
Atlante45
8eb4abc49c Rework FaceTracker 2015-02-26 19:14:09 +01:00
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
6b29e314c2 Adding the Stage of the Scene and exposing control of the sun light from javascript 2015-02-25 19:05:27 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
ZappoMan
b03928cec7 some cleanup 2015-02-25 16:31:43 -08:00
ZappoMan
af43ba3444 used a registered quad for the audio box since its color constantly changes 2015-02-25 15:21:24 -08:00
Andrew Meadows
8d4ea143ce easy conversions of: InDomainUnits --> InMeters 2015-02-25 14:48:06 -08:00
Andrew Meadows
2f749e3c51 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/entities/src/TextEntityItem.h
 2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits() 
and friends
 2015-02-25 14:35:04 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
ZappoMan
d1e648b392 remove unused references to QGLWidget* parent in Overlay and Overlays 2015-02-25 12:34:38 -08:00
Brad Hefta-Gaub
6d237f3f79 Merge pull request #4339 from huffman/fix-plane-pick 
Fix plane pick
 2015-02-25 12:23:45 -08:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
ZappoMan
e66f12f958 add shutdown short circuiting to datagram processor 2015-02-25 10:56:08 -08:00
David Rowe
23e172a0a1 Remove attempt at individual eyebrow control 2015-02-25 10:44:57 -08:00
David Rowe
c5fba3e0ce Improve mouth resting position and smile 2015-02-25 10:44:08 -08:00
Ryan Huffman
c499352ad8 Update billboard and planar overlays to use new findRayRectangleIntersection signature 2015-02-25 10:27:11 -08:00
Clément Brisset
b1e46c1bc8 Merge pull request #4337 from ZappoMan/crashonexit 
Fixes to various Crashes on shutdown
 2015-02-25 08:47:36 -08:00
Brad Hefta-Gaub
0f4e098a61 Merge pull request #4334 from huffman/edit-ray-improvement 
Fix BillboardOverlay::findRayIntersection
 2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub
8c26be49d7 Merge pull request #4330 from huffman/edit-off-on-domain-change 
Turn editEntities off on domain change
 2015-02-24 20:11:39 -08:00
David Rowe
b0ffaaa8b7 Smooth DDE blendshape coefficients a little 2015-02-24 18:53:35 -08:00
David Rowe
7a95ed2baa Scale and clamp DDE blendshape coefficients 2015-02-24 17:38:20 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
ZappoMan
eab09eaf28 removed extra debugging 2015-02-24 17:15:58 -08:00
Ryan Huffman
eb21b74439 Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection 2015-02-24 17:01:24 -08:00
Ryan Huffman
be7959bbcd Fix BillboardOverlay findRayIntersection implementation 2015-02-24 17:00:55 -08:00
ZappoMan
89f7f2da2e don't do idle process and painting if we're shutting down the application 2015-02-24 15:57:34 -08:00
ZappoMan
ca432a415f Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit 2015-02-24 15:33:41 -08:00
Ryan Huffman
89c10ca2ec Fix BillboardOverlay::findRayIntersection 2015-02-24 14:36:24 -08:00
David Rowe
e91a28a0a4 Rework DDE blendshape derivation and remove scaling and smoothing 2015-02-24 14:33:55 -08:00
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -08:00
Andrew Meadows
1b669af79d Merge pull request #4307 from Atlante45/fix_warnings 
Fix warnings
 2015-02-24 12:19:32 -08:00
Andrew Meadows
efcac708b6 Merge pull request #4331 from PhilipRosedale/master 
Toyball is a textured baseball, added ability to get controller angular velocity
 2015-02-24 12:19:20 -08:00
samcake
5202d2136a Merge pull request #4319 from huffman/avatar-billboards 
Fix avatar billboards all rendering as the same billboard
 2015-02-24 11:22:38 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Ryan Huffman
4641bd0cd9 Add Window.domainChanged signal for scripting 2015-02-24 10:47:37 -08:00
ZappoMan
6be8f4c0ec more work on improving shutdown behavior 2015-02-23 17:32:31 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
2f4adbc2f7 also use release icon for RelWithDebInfo 2015-02-23 11:40:38 -08:00
Stephen Birarda
9878a93338 add a definition for shared QXmpp on win 2015-02-23 11:13:10 -08:00
Andrew Meadows
0455ccf7be Merge pull request #4313 from ctrlaltdavid/20355 
CR for 20355 - Initial Integration with DDE
 2015-02-23 09:47:19 -08:00
ZappoMan
85cec79ff5 removing debug messages 2015-02-23 09:44:22 -08:00
Andrew Meadows
2519f66037 Merge pull request #4311 from huffman/application-dpi-scale 
Application dpi scale
 2015-02-23 09:43:12 -08:00
Stephen Birarda
437d5c7bdf repairs to include locations for QXmpp and SDL2 2015-02-23 09:26:35 -08:00
Stephen Birarda
d08f7d6255 check if QXmpp is dynamic or static 2015-02-23 08:24:52 -08:00
Clément Brisset
c6b1375863 Merge pull request #4322 from AndrewMeadows/thermonuclear 
workaround for scratchy audio on Windows
 2015-02-23 07:18:30 -08:00
Sam Gateau
e9360a77f2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-23 07:04:36 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
David Rowe
f169ab1238 Tidy and document DDE face tracker UDP socket opening and closing 2015-02-21 11:26:48 -08:00
David Rowe
8d9685ee39 Fix Face Tracking menu operation 2015-02-21 11:01:07 -08:00
ZappoMan
2e7a43a7fb more hacking 2015-02-20 18:47:47 -08:00
Ryan Huffman
e6d9a1b251 Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale 
Conflicts:
	interface/src/ui/LoginDialog.cpp
 2015-02-20 18:09:55 -08:00
ZappoMan
8c4474b2d0 more hacking 2015-02-20 17:55:04 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
ZappoMan
0b607fa390 first cut at shutting down scripts ahead of other cleanup 2015-02-20 15:28:25 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
David Rowe
3a95614ca4 Update Faceshift readme.txt with Windows instructions 2015-02-20 11:29:51 -08:00
Ryan Huffman
5c3cae471b Fix avatar billboards all rendering as the same billboard 2015-02-20 09:48:04 -08:00
Andrew Meadows
aa667464c0 merge upstream/master into andrew/thermonuclear 2015-02-20 08:26:51 -08:00
Andrew Meadows
599ef68df8 fix for scratchy audio on windows 2015-02-20 08:26:11 -08:00
Stephen Birarda
44f8e599e2 test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Ryan Huffman
4dfe725721 Update preferences dialog to use layouts throughout 2015-02-19 14:02:15 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Ryan Huffman
4a8e3193a9 Add more comments to UIUtil::scaleWidgetFontSizes 2015-02-19 12:01:27 -08:00
Jason Hawks
d0b47a66ab removed at symbol and added enter for teleport box 2015-02-19 14:49:00 -05:00
Clément Brisset
d2ed782626 Merge pull request #4308 from Triplelexx/20315 
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
 2015-02-19 10:27:27 -08:00