Commit graph

19789 commits

Author SHA1 Message Date
Stephen Birarda
4d8d6d602a simplify the FindTBB module for set envs 2014-12-15 13:56:21 -08:00
Stephen Birarda
bf5147cd91 fix qt modules to link in LinkSharedDependencies 2014-12-15 12:56:32 -08:00
Stephen Birarda
fa8b7020b0 repairs to MetavoxelSystem after reset to upstream 2014-12-15 11:49:43 -08:00
Stephen Birarda
c18c45a401 bump glm dependency version 2014-12-15 11:30:17 -08:00
Stephen Birarda
ea08d7bb23 remove block recommending VS2010 project file 2014-12-15 11:28:43 -08:00
Stephen Birarda
aac44953cb fix generator passed to cmake for windows build 2014-12-15 11:27:31 -08:00
Stephen Birarda
36f23fe4be fix Qt path in Generating build files 2014-12-15 11:26:06 -08:00
Stephen Birarda
ee91964300 clarify that TBB can be installed wherever 2014-12-15 11:25:17 -08:00
Stephen Birarda
9b37967bed changes to instructions for TBB, remove MSVC2010 2014-12-15 11:23:25 -08:00
Stephen Birarda
bba48a61f9 cleanup formatting of build guides 2014-12-15 10:22:58 -08:00
Stephen Birarda
a87fb0fe5e link to OS build guides from main guide 2014-12-15 10:21:31 -08:00
Stephen Birarda
5ad4a57e3d add OS specific build files 2014-12-15 10:19:06 -08:00
Stephen Birarda
d65f435e28 change Qt version referenced in build guide 2014-12-15 10:10:31 -08:00
Stephen Birarda
ce6334535b add info for TBB to Linux section 2014-12-15 10:08:48 -08:00
Stephen Birarda
a688f48bf7 indicate that user should run tbbvars for FindTBB 2014-12-15 10:02:01 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
Brad Hefta-Gaub
0b85a4cc49 Merge pull request #3965 from Atlante45/dependancy_manager
Dependancy manager
2014-12-15 08:12:04 -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
e40961df12 Checking that T is in fact derived from Dependency 2014-12-14 21:34:27 -08:00
Atlante45
1db3592d4c Switched meFaceshifto DependencyManager for Faceshift 2014-12-14 19:56:42 -08:00
Atlante45
39a19a297f Switched menu to DependencyManager for Faceshift 2014-12-14 16:31:03 -08:00
Atlante45
1d9e53e227 Switched avatar to DependencyManager for Faceshift 2014-12-14 16:28:28 -08:00
Atlante45
ad2dee5eaa Switched devices to DependencyManager for Faceshift 2014-12-14 16:26:08 -08:00
Atlante45
1c17e396f2 Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager 2014-12-14 16:18:29 -08:00
Brad Hefta-Gaub
fc760d5aa6 Merge pull request #3960 from huffman/entity-tool-properties-updates
Entity tool properties updates
2014-12-14 09:02:43 -08:00
Philip Rosedale
99fd7b3d6c Merge pull request #3963 from ZappoMan/test
fix warning
2014-12-13 23:16:16 -08:00
Philip Rosedale
fddd67d5f7 Merge pull request #3958 from ey6es/master
Fix for distorted replaced textures.
2014-12-13 23:15:28 -08:00
ZappoMan
31db2188cb remove test comment 2014-12-13 07:58:13 -08:00
ZappoMan
d28e274876 fix warning 2014-12-13 07:43:40 -08:00
Atlante45
28786721a6 Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager 2014-12-13 01:18:33 -08:00
Atlante45
9aea2843ac Remove pointer check 2014-12-12 21:20:26 -08:00
Atlante45
50fd52377f Couple improvements to the dependency manager 2014-12-12 21:10:45 -08:00
Atlante45
14cda00ebc First implementation of the DependencyManager 2014-12-12 20:52:41 -08:00
Ryan Huffman
a9223f5887 Remove text from label 2014-12-12 15:45:31 -08:00
Ryan Huffman
2fab404f7f Reorganize selectionManager selection checking 2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd Update SelectionManager -> selectionManager 2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea Add buttons for moving selection to grid and resetting to natural dimensions 2014-12-12 15:28:57 -08:00
Ryan Huffman
a5cbc9b3e2 Fix properties window to work with undo/redo 2014-12-12 15:28:22 -08:00
Ryan Huffman
1a90a81037 Add id to properties window 2014-12-12 15:27:56 -08:00
Ryan Huffman
d1f5bf2e3c Add rotation to properties window 2014-12-12 15:27:30 -08:00
Ryan Huffman
b8737ad525 Update 'f' focus to only work when something is selected 2014-12-12 15:26:07 -08:00
Andrzej Kapolka
c1c5991ac5 Fix for distorted replaced textures. 2014-12-12 12:07:48 -08:00
Brad Hefta-Gaub
1ea25db237 Merge pull request #3957 from birarda/master
fix for domain failed reconnect after disconnect
2014-12-12 10:05:26 -08:00
Stephen Birarda
687072f19c fix for domain failed reconnect after disconnect 2014-12-12 09:47:15 -08:00
Brad Hefta-Gaub
aae000d50e Merge pull request #3956 from Atlante45/dont_hide_mouse_on_every_window
Don't hide mouse when over a widget
2014-12-11 16:06:05 -08:00
Atlante45
df66a0049b Don't hide mouse when over a widget 2014-12-11 15:33:46 -08:00
Clément Brisset
14918ff86a Merge pull request #3952 from ZappoMan/HMDMode
More HMD work - keep more dialogs from being moved to HMD
2014-12-11 15:26:36 -08:00
Philip Rosedale
b160d5b571 Merge pull request #3955 from ey6es/master
Fix for normal and specular maps on skinned models.
2014-12-11 15:23:59 -08:00
Philip Rosedale
8505aaceba Merge pull request #3953 from ZappoMan/someCleanup
Remove some dead code from Voxel rendering
2014-12-11 15:23:27 -08:00