Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24242 commits 71 branches 56 tags 1.2 GiB
Commit graph

24242 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
a9c2a6e048 another attempt at zones starting from box 2015-04-20 18:17:21 -07:00
Seth Alves
64c23b8e8b Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 16:56:24 -07:00
Seth Alves
c49e2c1804 cleanups, diff minimization 2015-04-20 16:52:29 -07:00
Seth Alves
4a5631fca6 cleanups, diff minimization 2015-04-20 16:51:28 -07:00
Seth Alves
6107682658 handle ignoring simulation data echoed back to us differently 2015-04-20 16:36:56 -07:00
Brad Hefta-Gaub
098a18b725 Merge pull request #4667 from samcake/orange 
Fix for transform issues for overlay 3d elements on mac and linux
 2015-04-20 16:15:34 -07:00
David Rowe
1af17fa9e7 Use voice to control DDE mouth 
Add voice blend coefficient values to DDE values.
 2015-04-20 16:14:36 -07:00
Seth Alves
23f1767634 cleanup 2015-04-20 16:13:28 -07:00
Seth Alves
d6c8bd94cf clean up some debugging prints 2015-04-20 15:59:33 -07:00
Sam Gateau
58c1827f69 bring back the glPushPop in transform legacy mode 2015-04-20 15:56:44 -07:00
Sam Gateau
3f16c8fbc0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-20 15:45:47 -07:00
Seth Alves
56b005a872 packets should be ignore if they contain local nodeID, not if local entity contains nodeID 2015-04-20 12:19:36 -07:00
Seth Alves
08d300afcd use a flag to indicate that simulation ownership should be grabbed 2015-04-20 11:49:10 -07:00
Seth Alves
88f289f3c1 small cleanup and some debugging prints 2015-04-20 11:19:48 -07:00
Seth Alves
fbff3627dc attempt to claim simulation ownership of entities the avatar crashes with 2015-04-20 11:13:51 -07:00
Clément Brisset
b64d7fc17c Merge pull request #4662 from birarda/remove-visage 
remove visage support
 2015-04-20 20:06:21 +02:00
Seth Alves
f452e47577 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 08:49:33 -07:00
Sam Gateau
41ff48528e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-19 09:59:38 -07:00
Brad Hefta-Gaub
29971a5c59 Merge pull request #4664 from samcake/orange 
Teaching Project, Cleaning the interface for the default Sun light properties and more
 2015-04-19 09:57:04 -07:00
Sam Gateau
5335dcb236 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-19 09:27:27 -07:00
Clément Brisset
464c69dbaf Merge pull request #4663 from ctrlaltdavid/menu-tidying 
Move visibility methods into DiscoverabilityManager
 2015-04-18 20:02:15 +02:00
Sam Gateau
687ca7fee5 Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working 2015-04-17 19:00:40 -07:00
Seth Alves
b3cb9fe9a4 fix comment some more 2015-04-17 15:33:41 -07:00
Seth Alves
e9d8c53f75 undo dice testing hack 2015-04-17 15:18:05 -07:00
Seth Alves
adfc82e169 remove commented-out code 2015-04-17 15:10:34 -07:00
Seth Alves
dac57c44da if measured acceleration is close to zero, send zero to entity server, else send gravity 2015-04-17 15:05:47 -07:00
Stephen Birarda
511240da5a remove Visage from FaceTracker comment 2015-04-17 14:29:51 -07:00
Stephen Birarda
cfac4fe9c1 remove the Visage find module 2015-04-17 14:28:41 -07:00
Stephen Birarda
6b615c1ba1 remove Visage from menu header 2015-04-17 14:28:20 -07:00
Stephen Birarda
63a81bdcb4 remove VISAGE handling in interface CMakeLists 2015-04-17 14:27:58 -07:00
David Rowe
931c46345e Move visibility methods into DiscoverabilityManager 2015-04-17 14:15:50 -07:00