Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20878 commits 29 branches 0 tags 1.1 GiB
Commit graph

20878 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Brad Hefta-Gaub
c7c7c35654 Merge pull request #4132 from ctrlaltdavid/3d-text-size 
Tweak 3D text overlay text size calculations
 2015-01-19 12:24:51 -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
Andrzej Kapolka
f0d09860ad Removed a couple magic numbers. 2015-01-19 11:46:12 -08:00
Andrew Meadows
fd9b56fe49 add lib/Release and lib/Debug to lib PATH_SUFFIXES 2015-01-19 10:41:45 -08:00
Stephen Birarda
990ca8397e add extra debugging for AddressManager connect to domain 2015-01-19 10:23:05 -08:00
David Rowe
9860feec61 Tweak 3D text overlay text size calculations 2015-01-19 09:54:44 -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
52641bd20f Fix for buffer crash. 2015-01-18 15:17:45 -08:00
Andrzej Kapolka
27255fbb4a Hermite display fix. 2015-01-18 01:04:45 -08:00
Andrzej Kapolka
393d537c16 Edge fix. 2015-01-18 00:26:43 -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
debc9b735d Fixed edge issue, increased default grid size to correspond to default 
heightfield import.
 2015-01-17 16:33:35 -08:00
samcake
cc95e512c5 Merge pull request #4130 from AndrewMeadows/thermonuclear 
fix for entities rendering as black on linux
 2015-01-17 09:33:03 -08:00
Andrzej Kapolka
3dbbbb72b0 Fixes for deltas when root hasn't changed, range updates. 2015-01-16 16:49:22 -08:00
Andrew Meadows
614a7eb0b5 fix for entities rendering as black on linux 2015-01-16 16:49:11 -08:00
Andrew Meadows
117ed9206c add ${BULLET_SEARCH_DIRS}/include, 
remove PATH_SUFFIXES include/bullet
 2015-01-16 16:19:47 -08:00
Stephen Birarda
4a2a9f92a7 Merge pull request #4129 from ctrlaltdavid/notifications-startup 
Stop notifications of all users at startup
 2015-01-16 15:44:50 -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
David Rowe
b2cadbe36a Stop notifications of all users at startup 2015-01-16 15:24:26 -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
Andrew Meadows
0a04dc8445 modify PATH_SUFFIXES when hunting for include dir 2015-01-16 13:38:11 -08:00
Brad Hefta-Gaub
81cd3e9e7f Merge pull request #4127 from birarda/master 
put user location without curly braces
 2015-01-16 13:35:09 -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
Andrew Meadows
e5eccbc791 add back BULLET_ROOT_DIR hint 2015-01-16 13:25:43 -08:00
Andrew Meadows
a293c61c05 use hifi_library_search_hints() macro 2015-01-16 13:20:58 -08:00
Andrew Meadows
54a6a0a27c use custom config when hunting for bullet include 2015-01-16 12:50:50 -08:00
Stephen Birarda
9c1196a2a6 put user location without curly braces 2015-01-16 12:08:56 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Philip Rosedale
9beb493a45 Merge pull request #4126 from samcake/temp1 
Remove glMaterial from Entity rendering, Add Ambient Sphere lighting
 2015-01-16 10:49:43 -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
Brad Hefta-Gaub
6be61cb912 Merge pull request #4125 from AndrewMeadows/thermonuclear 
Remove pre-Bullet server-side EntityItem motion
 2015-01-16 10:00:22 -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