Stephen Birarda
|
50c9bb2ae5
|
remove glm as manual dep in BUILD guides
|
2015-02-13 12:33:29 -08:00 |
|
Stephen Birarda
|
9136154cd5
|
fix double subdir include, clear up build guide
|
2015-02-13 10:48:27 -08:00 |
|
Stephen Birarda
|
2f875cc08e
|
remove the glm find module
|
2015-02-13 10:38:13 -08:00 |
|
Stephen Birarda
|
9c13bec476
|
remove glm include where no longer required
|
2015-02-13 10:38:01 -08:00 |
|
Stephen Birarda
|
263afdd22c
|
use external project glm in physics tests
|
2015-02-13 10:37:17 -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
|
d3973a724c
|
remove glm requirement in audio tests
|
2015-02-13 10:35:52 -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
|
2c7e225ef7
|
use cmake ExternalProject for glm in Interface
|
2015-02-13 10:14:47 -08:00 |
|
Stephen Birarda
|
13fc0b1fcd
|
fix AudioInjector debug line to be more clear
|
2015-02-13 09:36:16 -08:00 |
|
Stephen Birarda
|
ef9cc2aacc
|
repair ability for desktop to add gvr target
|
2015-02-12 12:49:29 -08:00 |
|
Stephen Birarda
|
0154ac9734
|
final script repairs for new AudioInjector API
|
2015-02-12 11:52:20 -08:00 |
|
Stephen Birarda
|
1120a5f963
|
use new injector API in inWorldTestTone
|
2015-02-12 11:50:48 -08:00 |
|
Stephen Birarda
|
eda7d8ffb1
|
use new injector APIs in movable script
|
2015-02-12 11:49:01 -08:00 |
|
Stephen Birarda
|
70e085009b
|
use injector restart in airGuitar script
|
2015-02-12 11:44:14 -08:00 |
|
Stephen Birarda
|
5f4e3528c2
|
override seek to handle warning once stopped
|
2015-02-12 11:29:55 -08:00 |
|
Stephen Birarda
|
5715642e04
|
fix for restart API in lobby script
|
2015-02-12 11:13:30 -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
|
9f62e8bbf6
|
Merge pull request #4274 from sethalves/lockers-can-change-metavoxels
if a MetavoxelEditMessage is received from a node which is not an editer...
|
2015-02-12 09:51:25 -08:00 |
|
Andrew Meadows
|
5553f0f531
|
Merge pull request #4275 from ctrlaltdavid/20306
CR for Job #20306 - When you load Interface on a PC if takes up the entire screen, this needs to change
|
2015-02-12 09:50:12 -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 |
|
Seth Alves
|
6506d87eb6
|
Merge branch 'master' of github.com:highfidelity/hifi into lockers-can-change-metavoxels
|
2015-02-12 09:16:56 -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
|
e737921e67
|
Merge pull request #4270 from sethalves/clean-up-stats
put bandwidth stats in first overlay column rather than in their own
|
2015-02-12 08:58:53 -08:00 |
|
Andrew Meadows
|
5bb504ad55
|
Merge pull request #4268 from huffman/remove-upload-model
Remove upload from file from editEntities.js
|
2015-02-12 08:57:22 -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 |
|
David Rowe
|
6f03035169
|
Explicit casts for OSX and Linux
|
2015-02-11 18:05:25 -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 |
|
Seth Alves
|
b9882e6488
|
if a MetavoxelEditMessage is received from a node which is not an editer of this domain, ignore it
|
2015-02-11 16:53:32 -08:00 |
|
Stephen Birarda
|
e3c4ead323
|
remove unecessary injector stops
|
2015-02-11 16:23:57 -08:00 |
|
Stephen Birarda
|
05b7cd819e
|
use isPlaying property instead of getter
|
2015-02-11 16:21:45 -08:00 |
|
Stephen Birarda
|
f9174366dc
|
fixes for new injector API in other scripts
|
2015-02-11 16:20:48 -08:00 |
|
Stephen Birarda
|
d8646f6ea0
|
repairs for new injector API in air guitar script
|
2015-02-11 16:17:10 -08:00 |
|