Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 20:47:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

1645 commits

Author SHA1 Message Date
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
Andrew Meadows
7cde6811ca remove unecessary AACube::operator<() 2014-09-04 15:21:19 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967 
Code Review for Job #19967
 2014-09-03 16:51:19 -07:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close 
Update assignment client to close on WM_CLOSE message on Windows
 2014-09-03 16:43:12 -07:00
Andrew Meadows
e120697a9b merge upstream/master into andrew/ragdoll 2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Andrew Meadows
a3b26582ba fix for nan in sphereVsAACubeHelper() 2014-09-03 15:39:26 -07:00
Andrew Meadows
4270c4d989 merge upstream/master into andrew/ragdoll 2014-09-03 14:42:17 -07:00
Andrew Meadows
361d1e83b0 use PhysicsEntity::stepForward() in simulation loop 2014-09-03 13:18:35 -07:00
Andrew Meadows
6454fd2627 add PhysicsEntity::stepForward() 2014-09-03 13:18:12 -07:00
Andrew Meadows
06e1d4a8bc init Shape::_mass in all ctors 2014-09-03 13:16:49 -07:00
Andrew Meadows
0cc6f559d4 add AACube::operator<() so they can be sorted 2014-09-03 13:13:54 -07:00
Ryan Huffman
5937830443 Update getWindowTitleBarHeight signature 2014-09-03 08:27:18 -07:00
Ryan Huffman
1ee23a1661 Add Windows.h include to ShutdownEventListener 2014-09-03 08:04:39 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
Andrew Meadows
7c04a25095 fix whitespace formatting of curly braces 2014-09-02 16:29:20 -07:00
Ryan Huffman
67cefc8d54 Reduce height of RunningScripts so titlebar is inside main window 2014-09-02 13:12:52 -07:00
ZappoMan
ea22073ddc removed some accidentally added code 2014-09-01 23:05:23 -07:00
ZappoMan
d1a046e6ed properly handle LOD in rendering by not rendering small entities 2014-08-29 21:18:31 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions 
so that I don't break anything when this merges with upstream
 2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face 
with unit tests
 2014-08-29 14:23:00 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00