Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 23:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20889 commits 76 branches 59 tags 1.2 GiB
Commit graph

6747 commits

Author SHA1 Message Date
Stephen Birarda
a66888939c add some debugging for domain switch 2015-01-20 10:51:11 -08:00
Stephen Birarda
483d072709 handle override path from address bar 2015-01-20 10:47:57 -08:00
Andrzej Kapolka
f7f480cee4 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-19 21:54:07 -08:00
Andrzej Kapolka
35bd1cda89 I believe this should fix some problems with flickering/crashing on edits: 
don't reapply properties that we've already read (thus clearing cached data,
stepping on other threads, etc.)
 2015-01-19 21:52:56 -08:00
Andrew Meadows
171fead347 remove log about failure to add to physics engine 2015-01-19 15:55:53 -08:00
Andrzej Kapolka
f8f9c25d38 Back to JPG compression for heightfield colors. 2015-01-19 14:59:28 -08:00
Brad Hefta-Gaub
215e3b732e Merge pull request #4134 from ey6es/metavoxels 
Big ol' metavoxel update.  Mostly the switch to "stack" representation for dual contour data, but also includes some heightfield fixes.
 2015-01-19 14:06:02 -08:00
Brad Hefta-Gaub
33152904bc Merge pull request #4133 from birarda/master 
add debugging for AddressManager connect to domain
 2015-01-19 13:25:48 -08:00
Andrzej Kapolka
eb320f37c7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-19 12:41:21 -08:00
Andrzej Kapolka
ed287e9bb2 This function isn't used, either. 2015-01-19 12:16:06 -08:00
Andrzej Kapolka
422e4fb85d Use the closest point on an approximative sphere, rather than the center of 
the node, to determine the LOD distance.
 2015-01-19 12:12:31 -08:00
Andrzej Kapolka
8d4707a874 Removed unused function. 2015-01-19 11:53:53 -08:00
Stephen Birarda
990ca8397e add extra debugging for AddressManager connect to domain 2015-01-19 10:23:05 -08:00
Andrzej Kapolka
2ed6835426 Use alpha channel to indicate holes when importing terrain images. 2015-01-18 16:30:46 -08:00
Andrzej Kapolka
a9f7533477 Set/erase brushes. 2015-01-18 16:20:55 -08:00
Andrzej Kapolka
61cbafadd4 More corner cases. 2015-01-18 00:18:35 -08:00
Andrzej Kapolka
9edb3e84cb Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-17 20:17:49 -08:00
Andrzej Kapolka
5bb441b6ef Added a "voxelize" brush for debugging. 2015-01-17 20:17:28 -08:00
Andrzej Kapolka
3dbbbb72b0 Fixes for deltas when root hasn't changed, range updates. 2015-01-16 16:49:22 -08:00
Andrzej Kapolka
2497b2fe39 If there's no directly intersecting spanner, find the closest heightfield that 
we can project onto.
 2015-01-16 15:41:08 -08:00
Andrew Meadows
840acecbe6 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
 2015-01-16 15:22:06 -08:00
Andrew Meadows
d5efc375d9 Merge pull request #4128 from ZappoMan/master 
fix double targets and freezing bullets
 2015-01-16 14:37:22 -08:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
Andrzej Kapolka
45b36b383c More progress on stitching, etc. 2015-01-16 14:32:15 -08:00
ZappoMan
9a60896a40 fix double targets and freezing bullets 2015-01-16 14:24:50 -08:00
Philip Rosedale
1ff90bec5d Merge pull request #4124 from AndrewMeadows/inertia 
support for simple kinematic motion
 2015-01-16 13:33:44 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Andrew Meadows
7c9419aa4e fix non-bullet build 2015-01-16 10:34:52 -08:00
Sam Gateau
afb6175d60 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-16 10:32:56 -08:00
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
Andrew Meadows
2427fa68cd remove unnecessary Bullet #include 2015-01-16 10:06:39 -08:00
Sam Gateau
8634d86167 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:43:21 -08:00
Sam Gateau
0e38ea8854 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:41:43 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Andrew Meadows
4392af3b3a Remove pre-Bullet server-side EntityItem motion 2015-01-16 09:26:43 -08:00
Andrzej Kapolka
f81c117ae5 Stitching progress. 2015-01-15 17:59:55 -08:00
Andrew Meadows
3fed38793e merge andrew/origin/inertia to andrew/local/inertia 2015-01-15 17:55:51 -08:00
Andrew Meadows
4c1cd991f4 remove pessimistic send of object updates 
we have not yet seen the headache of packetloss and unreliable messages
 2015-01-15 17:53:37 -08:00
Andrew Meadows
250fd98fee support for simple kinematic motion 2015-01-15 17:51:01 -08:00
Sam Gateau
0fdc9c1855 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 15:27:52 -08:00
Sam Gateau
7ae9635ce7 Refactoring the code from directional into DeferredLighting.slh 2015-01-15 15:27:18 -08:00
Stephen Birarda
6f5d9d54ec Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-15 14:15:38 -08:00
Stephen Birarda
b2c5847d9b Merge pull request #4117 from Atlante45/dm_update 
Drop DM ref before creating new object
 2015-01-15 14:15:01 -08:00
Atlante45
786c0a5462 Drop DM ref before creating new object 2015-01-15 14:00:45 -08:00
Stephen Birarda
250a3de9fe make node mutex in LimitedNodeList recursive for double read lock 2015-01-15 13:34:33 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Sam Gateau
d759f4c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 11:54:55 -08:00
Sam Gateau
067483fce2 Adding a prototype of ambient lighting with spherical harmonics 2015-01-15 11:54:01 -08:00
Andrew Meadows
51cc9d6d9a alt method for repressing unused var warnings 2015-01-15 10:46:09 -08:00
Andrew Meadows
9eb4d66327 remove warnings 2015-01-15 10:36:17 -08:00