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

1870 commits

Author SHA1 Message Date
Andrew Meadows
85fd1fc14f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
 2014-12-18 13:46:06 -08:00
Atlante45
aa0998dc7d Moved LimitedNodeList into DM 2014-12-18 10:32:34 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Stephen Birarda
9425ea2c17 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
Atlante45
d9d0166bc9 Use variadic templates to create instance with arguments 2014-12-17 15:23:39 -08:00
Andrew Meadows
6ea766b48d merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTypes.cpp
 2014-12-17 13:21:00 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Atlante45
8a76429a0e Merge branch 'applications_diet' into applications_diet_cpp11 2014-12-16 16:50:51 -08:00
Atlante45
6304a5e819 Unused removed method 2014-12-16 16:50:15 -08:00
Atlante45
3f2b5aeca4 Cleaner destruction handling 2014-12-16 16:22:59 -08:00
Atlante45
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -08:00
Atlante45
b2dac6f53f DM users update 2014-12-16 15:32:11 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Stephen Birarda
1db12453d4 move audio stats into member of Audio 2014-12-16 14:47:24 -08:00
Atlante45
cf6aa563ac DM returns shared pointer 2014-12-16 13:54:24 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
ZappoMan
0b95403949 cleanup the windows hackery a little 2014-12-15 12:25:20 -08:00
ZappoMan
95d820ee8b more windows hackery 2014-12-15 12:16:01 -08:00
ZappoMan
4e7368b643 more windows hackery 2014-12-15 12:09:30 -08:00
ZappoMan
28f2dc62ea add windowshacks.h to GPUConfig.h and move it to shared 2014-12-15 11:49:01 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Atlante45
e40961df12 Checking that T is in fact derived from Dependency 2014-12-14 21:34:27 -08:00
Atlante45
28786721a6 Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager 2014-12-13 01:18:33 -08:00
Atlante45
9aea2843ac Remove pointer check 2014-12-12 21:20:26 -08:00
Atlante45
50fd52377f Couple improvements to the dependency manager 2014-12-12 21:10:45 -08:00
Atlante45
14cda00ebc First implementation of the DependencyManager 2014-12-12 20:52:41 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
ec907d1d1d removed debug 2014-12-06 09:44:30 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrew Meadows
fb7a5e64cf fix file path in header text: physcis --> shared 2014-12-03 11:15:44 -08:00
Andrew Meadows
8d49b694cc ShapeManager doesn't support tiny and giant shapes 2014-12-03 10:08:26 -08:00
Andrew Meadows
6e88ab15f9 remove debug #include 2014-12-02 17:47:33 -08:00
Andrew Meadows
182cebbe40 Fix order of shape types for ShapeCollider 2014-12-02 17:47:00 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
Andrew Meadows
919214b7cb split ShapeInfo into shared and physics parts 2014-12-02 10:44:40 -08:00
Andrew Meadows
e6a9081184 Moving ShapeInfo to shared lib 2014-12-01 16:47:55 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -08:00
Andrew Meadows
5acaaa9c3b merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-26 15:36:08 -08:00
ZappoMan
333f323856 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode 2014-11-25 12:46:18 -08:00
ZappoMan
e9812d0608 added similarStrings() helper 2014-11-25 09:25:49 -08:00
Andrew Meadows
37093cbd00 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-11-24 11:24:39 -08:00
Andrew Meadows
eda779b434 add != operator for AACube 2014-11-24 11:04:27 -08:00
Sam Gateau
1f22d5b493 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-24 10:05:39 -08:00
Sam Gateau
87471df7a1 First version of the lighmap working 2014-11-21 18:08:34 -08:00
ZappoMan
bd2adf08e3 fix to drift in usecTimestampNow() caused when computer sleeps 2014-11-21 13:33:53 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
8c65c6c1c8 fix comment for actual time format 2014-11-18 17:02:28 -08:00
Stephen Birarda
705d3da089 cleanup time in log prefix 2014-11-18 17:00:33 -08:00
Andrew Meadows
971804b98e name change shinkIfNeeded() -> shrinkIfNeeded() 2014-11-17 16:14:49 -08:00
Stephen Birarda
287ab61618 link Gui and Script to shared since they are dependencies 2014-11-17 14:06:41 -08:00
Stephen Birarda
473ae10104 shuffle files with QtGui dependency out of shared 2014-11-17 13:33:07 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
Sam Gateau
0973d197cf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 12:25:00 -08:00
Stephen Birarda
f23b08971c merge with cuckoo branch, fix makefile OS X support 2014-11-14 10:52:12 -08:00
Stephen Birarda
86284036f1 put back timestamp in log 2014-11-14 10:35:13 -08:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
Sam Gateau
420118e9db Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-13 11:04:12 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
ZappoMan
09a06c9d82 add debug streamer for xColor 2014-11-13 08:14:01 -08:00
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
Sam Gateau
b6c004c431 Fix syntax that doesn't compile on linux and used smart glm::max instruction 2014-11-12 17:16:43 -08:00
Sam Gateau
8fb04af59d defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design 2014-11-12 16:40:45 -08:00
Sam Gateau
e47524d70a fix syntax and missing constant name 2014-11-12 10:41:50 -08:00
Sam Gateau
b716a512c6 Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level 2014-11-12 00:26:44 -08:00
Sam Gateau
668c5e298d clean up the Transform class and the rendering path in Model.cpp 2014-11-11 16:39:00 -08:00
Sam Gateau
ad51416c28 move the transform class files to the Shared library, still problem with negative scale composition 2014-11-11 09:54:35 -08:00
Stephen Birarda
9b2acadb4b include c++ header for memset 2014-11-07 17:24:05 -08:00
Stephen Birarda
6a4808aac8 include string.h for memset usage 2014-11-07 17:22:54 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Stephen Birarda
4fd22914c0 fix a leak in StdDev 2014-11-07 17:11:00 -08:00
Stephen Birarda
3f44203984 remove getpid usage and replace with Qt solution 2014-11-05 11:42:40 -08:00
Philip Rosedale
cdad40faec Merge pull request #3736 from ZappoMan/entityBugs 
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
 2014-11-04 12:59:13 -08:00
ZappoMan
a89287e404 reset the QElapsedTimer in usecTimestampNow() periodically to prevent error 2014-11-04 11:01:37 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
Stephen Birarda
6b922fc3e7 final tweak for linux unistd include 2014-10-30 10:03:36 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
Stephen Birarda
7f3482bbdd swithc from elif to elsif 2014-10-29 10:53:34 -07:00
Stephen Birarda
03e1da0ba9 include unistd only on Q_OS_LINUX 2014-10-29 10:37:39 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Andrew Meadows
c39b239f99 fix linux build for missing getpid() 2014-10-29 09:30:51 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer 
logging tweaks to reduce spam from repeated log messages
 2014-10-28 17:58:17 -07:00
Stephen Birarda
9af097967d remove ctime since windows build did not fail without it 2014-10-28 15:56:30 -07:00
Stephen Birarda
992396ba63 add ctime for strftime call 2014-10-28 15:48:06 -07:00
Stephen Birarda
01de6305e9 add time header for date in log entry 2014-10-28 15:42:03 -07:00
Stephen Birarda
c4538836c1 always output the first matching repeated log message 2014-10-28 14:51:47 -07:00
Stephen Birarda
424793b905 complete output of suppressed repeated messages to log 2014-10-28 14:49:14 -07:00
Stephen Birarda
8e3102266a use the LogHandler in Interface 2014-10-28 14:23:34 -07:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Stephen Birarda
2711ff2b5f move functionality from VerboseLoggingHelper into the Logging class 2014-10-28 13:48:53 -07:00
Stephen Birarda
8a4c716452 leverage the VerboseLoggingHelper for packets from unknown nodes 2014-10-28 12:15:52 -07:00
Stephen Birarda
9c30903eb6 add the VerboseLoggingHelper class for repeated messages 2014-10-28 12:05:56 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
samcake
3d13792a9d Merge pull request #3599 from ZappoMan/frustumCullModelParts 
Frustum cull model parts
 2014-10-15 11:56:00 -07:00
ZappoMan
64fecba011 removed some unneeded scaling to AABox and AACube debug 2014-10-14 17:17:30 -07:00
ZappoMan
e235af1331 add debeg streaming to Extents 2014-10-14 17:16:49 -07:00
ZappoMan
f04c2b6e6f fix possible buffer overrun asserts 2014-10-14 17:14:12 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Stephen Birarda
c16ab0a19f remove definition for an unused method 2014-09-29 15:27:45 -07:00
Stephen Birarda
bd4a32551b fix for settings save without organization 2014-09-29 10:09:33 -07:00
Stephen Birarda
5e2870ac5f require a distinction between master config and user config 2014-09-29 09:30:08 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Stephen Birarda
e75a2d355e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard 2014-09-26 14:31:52 -07:00
Stephen Birarda
94f30fe4d9 handle password setting by not converting to double 2014-09-26 12:20:12 -07:00
Stephen Birarda
21809cc9df fix http username with no password 2014-09-26 12:09:29 -07:00
Stephen Birarda
e6449da890 repair a crash while overriding a config map 2014-09-26 11:10:56 -07:00
Stephen Birarda
954fbc2017 use DomainServerSettingsManager to handle simulation settings and config 2014-09-26 11:06:05 -07:00
Philip Rosedale
f66f565f53 update stDev (standard deviation) class to coding standard 2014-09-25 18:14:02 -07:00
Stephen Birarda
a684191cf1 change the default config path to system config path 2014-09-25 14:50:07 -07:00
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
Andrew Meadows
58bcb98dd6 remove virtual for ListShape::findRayIntersection() 2014-09-23 10:04:36 -07:00
Andrew Meadows
7dd9587d20 remove warning about hidden virtual override 2014-09-23 09:07:23 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
ZappoMan
fd9f64cb44 normalize all quats before packing 2014-09-15 08:46:28 -07:00
ZappoMan
4ae3360f83 fix warning 2014-09-13 08:50:52 -07:00
ZappoMan
e76ffb2ecb fixed another warning 2014-09-13 08:44:13 -07:00
ZappoMan
973479d1ac fix warning in ByteCountCoded<> 2014-09-13 07:57:45 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrew Meadows
62867391a3 collide against PhysSimulation instead of VoxelTree 2014-09-12 17:38:45 -07:00
Andrew Meadows
32b07027d3 namechange planeNormal --> faceNormal 2014-09-12 17:27:56 -07:00
Andrew Meadows
4e7a7667b1 remove unused variable 2014-09-12 09:19:03 -07:00
Andrew Meadows
825be3e1e7 fix for ray-vs-AACubeShape intersection test 2014-09-12 08:40:48 -07:00
Andrew Meadows
a9957ac7df the real fix for ray-vs-plane intersection 2014-09-12 08:40:03 -07:00
Andrew Meadows
ff0872a5f0 add RayIntersectionInfo::getIntersectionPoint() 2014-09-12 08:38:44 -07:00
Andrew Meadows
46089a0611 fix ray-vs-AACube logic 2014-09-12 08:37:47 -07:00
ZappoMan
9f4d199440 move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes 2014-09-11 15:36:13 -07:00
ZappoMan
d616c7fa0c handy conversions between AABox, AACube, and Extents 2014-09-11 12:23:35 -07:00
ZappoMan
7cadc3433a improve constness for operators on PropertyFlags<> 2014-09-11 12:13:34 -07:00
ZappoMan
13cffa6e44 moved Extents to shared 2014-09-11 12:12:25 -07:00
Andrew Meadows
0494ffcf38 implement Ray-vs-Capsule and Ray-vs-AACube 2014-09-10 17:01:51 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
Ryan Huffman
ecadf7dd33 Add include for QtGlobal to ensure OS global has been defined 2014-09-08 12:40:53 -07:00
Ryan Huffman
b0a0760be2 Update ShutdownEventListener to not stop event handling 2014-09-05 11:26:22 -07:00
Ryan Huffman
38a14c3864 Reapply "Update assignment client to close on WM_CLOSE message on Windows" 
This reverts commit a603453cf2.
 2014-09-05 11:19:36 -07:00
Leonardo Murillo
a603453cf2 Revert "Update assignment client to close on WM_CLOSE message on Windows" 2014-09-05 11:36:56 -06:00
Brad Hefta-Gaub
9648c0d64e Merge pull request #3343 from AndrewMeadows/ragdoll 
Ragdoll Part 12: first pass avatar skeleton collides with voxels
 2014-09-04 23:09:08 -07:00