Stephen Birarda
|
e99012efbb
|
updates to build guides to remove soxr
|
2015-02-17 10:33:12 -08:00 |
|
Stephen Birarda
|
4300836810
|
make gverb a cmake external project
|
2015-02-13 15:47:35 -08:00 |
|
Stephen Birarda
|
ab0692229d
|
fix GLM includes for gvr-interface and shared
|
2015-02-13 14:54:21 -08:00 |
|
Stephen Birarda
|
6e63c1c1ad
|
set the GLM_INCLUDE_DIRS var in cache so find hits it
|
2015-02-13 14:50:12 -08:00 |
|
Stephen Birarda
|
8c998a65ee
|
use the glm find_package and check externals
|
2015-02-13 12:50:32 -08:00 |
|
Stephen Birarda
|
0e32ed280a
|
put back glm dependency via external proj in entities-renderer
|
2015-02-13 10:36:23 -08:00 |
|
Stephen Birarda
|
b713551087
|
use external project glm in script-engine
|
2015-02-13 10:35:06 -08:00 |
|
Stephen Birarda
|
fa6f6a6b71
|
use external project glm in render-utils
|
2015-02-13 10:34:19 -08:00 |
|
Stephen Birarda
|
d7ce10dedb
|
use external project glm for physics library
|
2015-02-13 10:33:35 -08:00 |
|
Stephen Birarda
|
8994cc0268
|
use external project glm for octree library
|
2015-02-13 10:32:27 -08:00 |
|
Stephen Birarda
|
1d90c1c827
|
use glm external project in model library
|
2015-02-13 10:31:41 -08:00 |
|
Stephen Birarda
|
16615b9be0
|
use glm external project in metavoxels library
|
2015-02-13 10:30:22 -08:00 |
|
Stephen Birarda
|
54ce79db5a
|
remove glm dependency in gpu library
|
2015-02-13 10:29:19 -08:00 |
|
Stephen Birarda
|
26b93731f8
|
use glm as external project in fbx library
|
2015-02-13 10:28:06 -08:00 |
|
Stephen Birarda
|
4d5d647d84
|
use external project glm in environment library
|
2015-02-13 10:27:24 -08:00 |
|
Stephen Birarda
|
0e790daa5b
|
remove glm dependency from entities-renderer
|
2015-02-13 10:26:23 -08:00 |
|
Stephen Birarda
|
866295b09e
|
use external project glm in entities library
|
2015-02-13 10:24:46 -08:00 |
|
Stephen Birarda
|
a4752aaab0
|
use external project glm in avatars
|
2015-02-13 10:22:09 -08:00 |
|
Stephen Birarda
|
df8e51f835
|
use external project glm in more targets
|
2015-02-13 10:21:21 -08:00 |
|
Stephen Birarda
|
13fc0b1fcd
|
fix AudioInjector debug line to be more clear
|
2015-02-13 09:36:16 -08:00 |
|
Stephen Birarda
|
5f4e3528c2
|
override seek to handle warning once stopped
|
2015-02-12 11:29:55 -08:00 |
|
Stephen Birarda
|
060b0bbfd6
|
tell injector it is not finished once restarted
|
2015-02-12 11:13:03 -08:00 |
|
Stephen Birarda
|
ea52cea5dd
|
more cleanup for AudioInjector mem management
|
2015-02-12 10:56:40 -08:00 |
|
Stephen Birarda
|
7becf62ba9
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-12 10:28:04 -08:00 |
|
Brad Hefta-Gaub
|
fa5eebd93e
|
Merge pull request #4269 from AndrewMeadows/thermonuclear
ModelEntityItem gets _shapeType
|
2015-02-12 10:06:01 -08:00 |
|
Andrew Meadows
|
7304585103
|
Merge pull request #4271 from huffman/fix-overlays-text-size
Fix overlays text size
|
2015-02-12 09:35:37 -08:00 |
|
Andrew Meadows
|
357dd963f3
|
Merge pull request #4273 from ZappoMan/bugfix
fix the quad color being broken after rendering text
|
2015-02-12 09:00:16 -08:00 |
|
Andrew Meadows
|
b4bd60e979
|
give TextEntityItem a box collision shape
|
2015-02-12 08:28:34 -08:00 |
|
Stephen Birarda
|
43e777163e
|
use a QPointer to trigger delayed delete
|
2015-02-11 19:15:33 -08:00 |
|
Stephen Birarda
|
79674fb94f
|
use a wrapper on audio injector for script ownership
|
2015-02-11 17:20:00 -08:00 |
|
Stephen Birarda
|
449719bc7c
|
add option to restart a local audio injector
|
2015-02-11 16:58:30 -08:00 |
|
Stephen Birarda
|
f9174366dc
|
fixes for new injector API in other scripts
|
2015-02-11 16:20:48 -08:00 |
|
Stephen Birarda
|
4894a5b414
|
better handling of cleanup for local injector
|
2015-02-11 16:11:55 -08:00 |
|
Stephen Birarda
|
0498c5c708
|
provide old ASI APIs in AudioInjector
|
2015-02-11 15:57:32 -08:00 |
|
Stephen Birarda
|
7b485829c4
|
cleanup AudioInjector memory management
|
2015-02-11 15:52:00 -08:00 |
|
ZappoMan
|
7a45b1bc96
|
fix the quad color being broken after rendering text
|
2015-02-11 15:50:04 -08:00 |
|
Andrew Meadows
|
9f59addbc2
|
merge upstream/master into andrew/thermonuclear
|
2015-02-11 13:35:28 -08:00 |
|
Andrew Meadows
|
8b34283d76
|
fix missing comma
|
2015-02-11 13:21:57 -08:00 |
|
Ryan Huffman
|
341e31a074
|
Remove extraneous initialized check
|
2015-02-11 13:08:11 -08:00 |
|
Andrew Meadows
|
4581802532
|
explicitly flag virtual functions as such
|
2015-02-11 13:03:22 -08:00 |
|
Andrew Meadows
|
bd1817817b
|
restore order of PROP_USER_DATA
|
2015-02-11 12:59:59 -08:00 |
|
Ryan Huffman
|
51ff897ee5
|
Update Font to not setup GL until first draw
|
2015-02-11 12:59:12 -08:00 |
|
Brad Hefta-Gaub
|
9a7ed8055f
|
Merge pull request #4267 from samcake/master
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
|
2015-02-11 09:45:29 -08:00 |
|
Andrew Meadows
|
5975380892
|
Merge pull request #4266 from ZappoMan/bugfix
fix color issues with quads
|
2015-02-11 09:03:10 -08:00 |
|
Andrew Meadows
|
68c1e9ef71
|
Merge pull request #4260 from birarda/master
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
|
2015-02-11 09:02:18 -08:00 |
|
Andrew Meadows
|
d9b57de649
|
merge upstream/master into andrew/thermonuclear
|
2015-02-11 08:56:34 -08:00 |
|
Andrew Meadows
|
b983f6fccf
|
bump entity packet version
|
2015-02-11 08:52:49 -08:00 |
|
Andrew Meadows
|
ff27ab74ae
|
expose _shapeType to script and server
|
2015-02-11 08:46:41 -08:00 |
|
Andrew Meadows
|
d89548312e
|
manipulate the extents for SHAPE_TYPE_SPHERE
The conversion from ShapeInfo to btShape MUST be reversable!
Otherwise we leak shapes in the ShapeManager class.
|
2015-02-11 08:44:10 -08:00 |
|
Andrew Meadows
|
f4a4c9786c
|
don't create shape for SHAPE_TYPE_NONE
|
2015-02-11 08:43:55 -08:00 |
|