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
24253 commits 71 branches 56 tags 1.2 GiB
Commit graph

24253 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
d51f5a0ae8 remove commented out code 2015-04-22 17:22:37 -07:00
Seth Alves
5a7f8a2f5a git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table 2015-04-22 17:06:21 -07:00
Seth Alves
864f8cb3b3 fix comment 2015-04-22 16:10:25 -07:00
Seth Alves
96b4517e6e when removing something from bullet, attempt to wake up anything that was touching it 2015-04-22 16:05:31 -07:00
Seth Alves
07a848c9ce added bump call in physics engine for when an entity is deleted and may have something resting on top of it 2015-04-22 15:50:39 -07:00
Seth Alves
7781808bea remove debug prints, fix a comment 2015-04-22 15:25:09 -07:00
Seth Alves
6678922f5c put back code for interface giving up simulator status when something stops 2015-04-22 15:09:56 -07:00
Seth Alves
3450597d70 remove some debugging prints 2015-04-22 15:03:23 -07:00
Seth Alves
92ceff1a03 clean up EntityItem constructors 2015-04-22 14:53:23 -07:00
Seth Alves
c30d742f7d experimenting 2015-04-22 14:22:09 -07:00
Seth Alves
36dbbd0c9d experimenting 2015-04-22 14:14:12 -07:00
Seth Alves
cd3ee39fcc experimenting 2015-04-22 13:42:04 -07:00
Seth Alves
69ee33a392 experimenting 2015-04-22 13:29:28 -07:00
Seth Alves
ee000f91ae experimenting 2015-04-22 13:27:19 -07:00
Seth Alves
27ed0c4a98 experimenting 2015-04-22 13:21:06 -07:00
Seth Alves
7382b0b19f experimenting 2015-04-22 13:17:20 -07:00
Seth Alves
a6750eafd8 experimenting 2015-04-22 13:03:59 -07:00
Seth Alves
dc30ca0210 experimenting 2015-04-22 12:51:29 -07:00
Seth Alves
41166c1a42 allow entity server to time-out entity-simulation ownership rather than having interfaces give it up 2015-04-22 11:18:18 -07:00
Seth Alves
32673efc80 compute collision events inside lock to avoid a rare crash 2015-04-22 10:51:45 -07:00
Seth Alves
3f705f3172 keep track of the number of simulation steps each entity has been accelerated at nearly its gravity. if we get 4 in a row, start sending acceleration equal to gravity to the entity server, so it will include gravity in its estimates 2015-04-22 10:39:13 -07:00
Seth Alves
e334c456ea add a place to keep track of the number of simulation steps where acceleration was close to gravity for a given Entity 2015-04-22 10:13:13 -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
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
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