Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 16:46:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24275 commits 76 branches 59 tags 1.2 GiB
Commit graph

24275 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
b776ea8110 Make ::contains() back into a const 2015-04-23 19:15:06 +02:00
Atlante45
b340cd06bf Fix volume formula for capsules 2015-04-23 19:14:07 +02:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Atlante45
51d99da29f Magic number 2015-04-23 17:50:26 +02:00
Atlante45
f494f86ee5 Handle registration point in transforms 2015-04-23 17:48:29 +02:00
Atlante45
bda72025af Check mesh extend before going through triangles 2015-04-23 16:40:40 +02:00
Atlante45
99fd590a90 Update compound shape geometry when async get 2015-04-23 16:05:06 +02:00
Atlante45
d18229d52d Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 15:58:57 +02:00
Atlante45
6be0910966 Fix contain for collision hulls 2015-04-23 15:58:18 +02:00
Atlante45
3a0b5f9d22 Register RenderableZoneEntityItem in EntityTreeRenderer 2015-04-23 15:34:03 +02:00
Atlante45
c91ca146d5 Add different shapes to zone example 2015-04-23 15:22:58 +02:00
Atlante45
15482d6a57 Don't compute shape for zones 2015-04-23 15:21:51 +02:00
Atlante45
fb4d1d3557 Fix compoundShapeURL reseting shapeType 2015-04-23 14:24:20 +02:00
Atlante45
f117941c8d Macro fixing 2015-04-23 13:25:14 +02:00
Atlante45
01f4f34911 Centralize contains standard cases 2015-04-23 13:04:59 +02:00
Atlante45
837a0d3ba8 rename collision model in edit.js 2015-04-23 12:13:52 +02:00
Atlante45
3ebe72f025 Fix read macro 2015-04-23 12:12:42 +02:00
Brad Davis
eaaada908a Merge pull request #4674 from ZappoMan/ZoneVolume 
implement volume priority for zones
 2015-04-22 20:21:30 -07:00
Brad Hefta-Gaub
67a12d8272 Merge pull request #4665 from ctrlaltdavid/dde-miscellaneous 
DDE miscellaneous
 2015-04-22 19:57:49 -07:00
David Rowe
35e2b87a70 Rename DDE menu items 2015-04-22 13:15:57 -07:00
David Rowe
649d4736cd Merge branch 'master' into dde-miscellaneous 2015-04-22 13:00:40 -07:00
ZappoMan
fb4e334c70 implement volume priority for zones 2015-04-22 12:38:34 -07:00
Atlante45
287d625c52 Added RenderableZoneEntities class 2015-04-22 21:17:12 +02:00
Atlante45
99b3ef0d75 Move contain function to FBXGeometry 2015-04-22 21:17:12 +02:00
Atlante45
9cec256142 Rename collisionModelURL members/methods 2015-04-22 21:16:09 +02:00
Atlante45
8dc98d86b5 Bump entities packet version 2015-04-22 21:16:03 +02:00
Atlante45
7f3be9c89b Add shapeType/compoundShapeURL to ZoneEntities 2015-04-22 21:14:10 +02:00
Atlante45
b446644549 Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
Atlante45
f3fcb749df Fix algorithm + add comments 2015-04-22 21:03:55 +02:00
Atlante45
955723acf1 RenderableEntityItem uses collision hull in contains 2015-04-22 21:03:55 +02:00
Atlante45
8db9f80779 Reimplements "contains" for sphere and particles 2015-04-22 21:03:55 +02:00
Atlante45
dbf40afa47 Remove deprecated "*InDomainUnit" getter/setter 2015-04-22 21:03:55 +02:00
samcake
68a4a14b43 Merge pull request #4672 from ZappoMan/ZoneEntity2 
Implement Zone Entity
 2015-04-22 11:58:03 -07:00
ZappoMan
ac81e3e847 added example script 2015-04-22 11:27:35 -07:00
ZappoMan
19386d5a5d Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-04-22 09:35:08 -07:00
Andrew Meadows
65825a4501 Merge pull request #4659 from ericrius1/collision 
Filtering triggering of collisions with contact type of "continue"
 2015-04-22 09:33:40 -07:00
Andrew Meadows
b2c67a7f33 Merge pull request #4639 from sethalves/acceleration-and-owner-in-wire-protocol 
simulation owner in wire protocol
 2015-04-22 09:20:44 -07:00
Seth Alves
cde64893af coding standard 2015-04-21 18:36:06 -07:00
ZappoMan
486ab044a0 use piggyback properties to save on property bit space 2015-04-21 15:16:46 -07:00
ZappoMan
8366dd02a0 remove RenderableZoneEntityItem class since zones don't render like other entities 2015-04-21 15:03:04 -07:00
ZappoMan
4ce451f984 wire up zone rendering again 2015-04-21 14:55:45 -07:00
ZappoMan
98350a47ad Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 2015-04-21 14:36:27 -07:00
ZappoMan
e436c95212 first cut at reworking zones 2015-04-21 14:36:13 -07:00
Brad Hefta-Gaub
578c67e051 Merge pull request #4671 from samcake/orange 
Refine the naming of the "keyLight" of the domain and the upcoming ZoneEntity
 2015-04-21 11:24:52 -07:00
Sam Gateau
f54821f996 more details in the comments 2015-04-21 11:12:01 -07:00
Sam Gateau
48364cb598 refined the names of the key light porperties in Stage 2015-04-21 11:04:14 -07:00
Seth Alves
284215d46a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-21 09:53:15 -07:00
Seth Alves
34e64e5007 Merge pull request #4650 from birarda/vhacd-external 
add v-hacd as an external project
 2015-04-21 09:44:52 -07:00
Philip Rosedale
a0a22ec94f Merge pull request #4669 from ctrlaltdavid/20506 
CR for Job #20506 - Use audio for mouth when using DDE
 2015-04-20 21:19:46 -07:00
ZappoMan
8ce4cb628a another attempt at zones starting from box 2015-04-20 18:18:01 -07:00