ZappoMan
|
0e943ae240
|
remove render view frustum mode
|
2015-01-05 17:23:10 -08:00 |
|
ZappoMan
|
bd1612f6a4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
|
2015-01-05 16:51:31 -08:00 |
|
ZappoMan
|
7cf4bd1860
|
remove head mouse
|
2015-01-05 16:29:02 -08:00 |
|
ZappoMan
|
49d8f2b2f5
|
more work on voxelEctomy
|
2014-12-30 18:52:33 -08:00 |
|
ZappoMan
|
141e231958
|
more work on voxelEctomy
|
2014-12-30 18:41:56 -08:00 |
|
ZappoMan
|
4ea9bbc309
|
first major pass at voxelEctomy
|
2014-12-30 18:08:58 -08:00 |
|
ZappoMan
|
fbfa40e3c9
|
remove hair
|
2014-12-30 13:44:25 -08:00 |
|
Atlante45
|
879c3e2fd0
|
Add entity model upload
|
2014-12-23 12:30:00 -08:00 |
|
Atlante45
|
b2dac6f53f
|
DM users update
|
2014-12-16 15:32:11 -08:00 |
|
Atlante45
|
11a2ecab56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/entities/EntityTreeRenderer.h
interface/src/ui/ApplicationOverlay.cpp
libraries/render-utils/src/GlowEffect.cpp
libraries/render-utils/src/Model.cpp
|
2014-12-16 15:02:37 -08:00 |
|
Atlante45
|
4d1529f77b
|
typedefs
|
2014-12-16 14:02:22 -08:00 |
|
ZappoMan
|
41c135c4e5
|
move GlowEffect to libraries
|
2014-12-15 19:19:21 -08:00 |
|
ZappoMan
|
8f3d23c5b3
|
remove Menu dependency from GlowEffect
|
2014-12-15 19:06:54 -08:00 |
|
Atlante45
|
e5e2eb4e8a
|
Moved GLCanvas in DM and DM to QSharedPointers
|
2014-12-15 16:20:52 -08:00 |
|
ZappoMan
|
bfcc78c57d
|
replaced Application::resourcesPath() with PathUtils::resourcesPath()
|
2014-12-15 15:20:18 -08:00 |
|
Atlante45
|
25df784f43
|
Headers cleanup
|
2014-12-15 10:56:42 -08:00 |
|
Atlante45
|
738f23f326
|
Moved visage and dde over to DependencyManager
|
2014-12-14 22:30:13 -08:00 |
|
Atlante45
|
65094f2165
|
Update headers
|
2014-12-14 21:47:08 -08:00 |
|
Atlante45
|
39a19a297f
|
Switched menu to DependencyManager for Faceshift
|
2014-12-14 16:31:03 -08:00 |
|
ZappoMan
|
c9bc95580d
|
add support for generic windowWatcher that keeps dialogs from being moved to HMD display
|
2014-12-11 12:30:17 -08:00 |
|
ZappoMan
|
cc012aad00
|
reset view frustum
|
2014-12-02 12:54:10 -08:00 |
|
ZappoMan
|
85ca03199e
|
remove Entities developer menu items from C++ menu, make them available through script
|
2014-11-26 17:53:41 -08:00 |
|
ZappoMan
|
821cf46ee9
|
don't delete the HMDToolsDialog on hide, keep it around till app exit.
|
2014-11-26 09:11:26 -08:00 |
|
ZappoMan
|
aa44906841
|
make HMD tools a checkable menu
|
2014-11-25 13:27:16 -08:00 |
|
ZappoMan
|
333f323856
|
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode
|
2014-11-25 12:46:18 -08:00 |
|
ZappoMan
|
e35242345c
|
first cut at HMD Tools dialog
|
2014-11-25 09:26:24 -08:00 |
|
ZappoMan
|
08772bbae0
|
remove spatial audio menu items
|
2014-11-24 13:07:22 -08:00 |
|
ZappoMan
|
2e9a9bf5c2
|
make render entities as scene the default
|
2014-11-23 12:01:58 -08:00 |
|
Andrzej Kapolka
|
41eaf340c6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-21 12:47:26 -08:00 |
|
Philip Rosedale
|
e07f53d022
|
remove unused test audio filters
|
2014-11-20 19:57:24 -06:00 |
|
Philip Rosedale
|
6e89437bce
|
simplify audio scope menu(s)
|
2014-11-20 19:34:56 -06:00 |
|
Andrzej Kapolka
|
0a976ad262
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-20 11:26:29 -08:00 |
|
Andrew Meadows
|
82bf0f6210
|
menu item for "idle animations shift hips" hack
|
2014-11-19 09:38:10 -08:00 |
|
Andrzej Kapolka
|
d273e7c399
|
Render heightfields -> render spanners.
|
2014-11-18 19:49:08 -08:00 |
|
Ryan Huffman
|
6b2a497810
|
Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes
|
2014-11-13 17:48:17 -08:00 |
|
Ryan Huffman
|
03f155bcd8
|
Add tool window
|
2014-11-13 17:47:02 -08:00 |
|
ZappoMan
|
63a8608ac6
|
handle per model transforms, default scene mode off
|
2014-11-12 20:20:36 -08:00 |
|
ZappoMan
|
13f08e65d1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering
Conflicts:
interface/src/renderer/Model.h
|
2014-11-12 19:31:27 -08:00 |
|
ZappoMan
|
4245da5157
|
add menu item to enable/disable rendering as scene
|
2014-11-12 12:07:27 -08:00 |
|
Philip Rosedale
|
6af2b7aadf
|
remove buckyballs and face shift lean driving (should be a script if desired)
|
2014-11-12 07:33:59 -08:00 |
|
Andrzej Kapolka
|
6445b3aa5d
|
Linux warnings fixes.
|
2014-11-07 15:59:16 -08:00 |
|
Sam Gateau
|
cecf79e580
|
Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state
|
2014-11-03 11:22:23 -08:00 |
|
ZappoMan
|
e78ac4c1d4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
|
2014-10-30 16:36:19 -07:00 |
|
ZappoMan
|
81cc15495f
|
rename Models to Entities, and add menu option to disable Light entities
|
2014-10-30 14:43:43 -07:00 |
|
Brad Hefta-Gaub
|
1c4e71ebc1
|
Revert "Worklist #20074"
|
2014-10-30 14:33:10 -07:00 |
|
Brad Hefta-Gaub
|
7b5d2ef9f8
|
Merge pull request #3706 from huffman/entity-tool-help
Add edit entities help window
|
2014-10-30 12:53:17 -07:00 |
|
Ryan Huffman
|
4f2fef0428
|
Add edit entities help window
|
2014-10-30 12:02:30 -07:00 |
|
Brad Hefta-Gaub
|
e314fa1fc3
|
Merge pull request #3652 from ctrlaltdavid/19976
CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice
|
2014-10-29 20:46:12 -07:00 |
|
Stephen Birarda
|
6ba0845767
|
fix warnings that were bugging Xcode
|
2014-10-28 15:39:28 -07:00 |
|
Stephen Birarda
|
2816e8f114
|
fix location DataWebDialog missing InterfaceLocation object
|
2014-10-28 15:32:23 -07:00 |
|