Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 02:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19711 commits 75 branches 59 tags 1.2 GiB
Commit graph

1735 commits

Author SHA1 Message Date
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
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
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
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
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