Commit graph

47937 commits

Author SHA1 Message Date
howard-stearns
7c45a78cb0 Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file 2016-11-03 13:17:47 -07:00
Brad Hefta-Gaub
e1837c90e2 Merge pull request #8991 from sethalves/fix-8981
fix QVector<bool> packing when number of joints isn't a multiple of 8
2016-11-03 10:59:06 -07:00
Brad Hefta-Gaub
b1582b474b Merge pull request #8986 from humbletim/allow-acscript-atp-uploads
allow assignment client scripts to create ATP assets
2016-11-03 10:10:37 -07:00
Brad Hefta-Gaub
8fab554c55 Merge pull request #8967 from samcake/red
Fix the reported amount of GPU memory physically available for GPPU with video mem larger than 4Gb
2016-11-03 09:48:02 -07:00
Seth Alves
1d0c3d7168 fix checker for unreasonable size of vector of bools 2016-11-03 09:47:24 -07:00
Seth Alves
cfea3cba9b guard against heap-overflow in the event of bogus entity network data 2016-11-03 06:54:11 -07:00
Seth Alves
64cb5d1b1a fix QVector<bool> packing when number of joints isn't a multiple of 8 2016-11-02 20:02:07 -07:00
Brad Hefta-Gaub
4b9720dbf0 Merge pull request #8988 from huffman/fix/tutorial-smooth-turn
Add smooth turning support to tutorial
2016-11-02 17:17:51 -07:00
Ryan Huffman
cf975f9667 Update step/smooth yaw action values to be hardcoded 2016-11-02 15:56:19 -07:00
Ryan Huffman
f6c0a451de Revert "Fix Controller.Actions not returning correct values"
This reverts commit 8350dc47f4.
2016-11-02 15:53:29 -07:00
Ryan Huffman
68735763df Add support for smooth turning in tutorial 2016-11-02 15:41:35 -07:00
Ryan Huffman
8350dc47f4 Fix Controller.Actions not returning correct values 2016-11-02 15:40:58 -07:00
Ryan Huffman
3d160cca75 Merge pull request #8969 from huffman/feat/task-manager-app-name
Add "High Fidelity" to sandbox and interface description in Windows Task Manager
2016-11-02 14:21:19 -07:00
samcake
96bdeebc37 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-11-02 12:30:45 -07:00
samcake
3c777bb079 Clenaing up the detection phase to get all the iformation from DXGI 2016-11-02 12:29:51 -07:00
Ryan Downe Karpf
8f7b8504fd Merge pull request #8983 from druiz17/oldIcon
Update Dialog - changed old interface icon with new interface  icon
2016-11-02 12:21:07 -07:00
Clément Brisset
e85d81da3c Merge pull request #8982 from Atlante45/installer
Launch Interface after Sandbox content loaded
2016-11-02 11:30:50 -07:00
Clément Brisset
9d555270d1 Merge pull request #8985 from huffman/fix/tutorial-went-to-trigger
Fix tutorial tracking wentToEntry if you haven't finished the tutorial
2016-11-02 11:26:41 -07:00
Ryan Huffman
54496c2eff Fix tutorial tracking wentToEntry if you haven't finished the tutorial 2016-11-02 09:02:39 -07:00
Dante Ruiz
a948e03ed8 changed old icon to new icon 2016-11-02 08:23:10 -07:00
Brad Hefta-Gaub
56b3ac8c89 Merge pull request #8972 from sethalves/fix-for-2159
lock around audio-client quit flag to avoid shutdown race
2016-11-02 00:14:33 -07:00
Atlante45
46102d93c6 Launch interface on install after content loading 2016-11-01 18:15:27 -07:00
Atlante45
e78d907db0 Add clo to launch interface after content loads 2016-11-01 18:15:27 -07:00
samcake
49f1590e01 Start detecting all the gpus 2016-11-01 16:51:57 -07:00
Howard Stearns
486cf01a55 Merge pull request #8975 from zfox23/AddSnapshotText
Add "Snapshot" text to snapshot cards in Address Bar Dialog
2016-11-01 15:33:53 -07:00
Anthony Thibault
a9c88f2383 Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes
fix broken eyes in mirrored animations
2016-11-01 15:28:48 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
howard-stearns
4c34214e2d Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file 2016-11-01 14:45:37 -07:00
howard-stearns
52cc03c5a2 Get snapshot location data from file, which now uses shareable place info. 2016-11-01 14:44:39 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Seth Alves
137730dc50 coding standard 2016-11-01 11:59:28 -07:00
Chris Collins
3625f329d9 Merge pull request #8971 from hyperlogic/bug-fix/deterministic-plugin-load-order
Load plugins in alphabetical order.
2016-11-01 11:30:04 -07:00
Seth Alves
ae17135a07 lock around quit flag to avoid shutdown race 2016-11-01 11:14:16 -07:00
samcake
861944ba71 Try uing DXGI on windows instead of com 2016-11-01 11:12:47 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
0cc98d4501 Add VersionInfo.rc to interface 2016-11-01 09:00:08 -07:00
Ryan Huffman
ea31a8e3b4 Add VersionInfo.rc.in 2016-11-01 08:59:56 -07:00
Ryan Huffman
b7f5fc2516 Update 'Sandbox' to 'High Fidelity Sandbox' in task manager 2016-11-01 08:58:29 -07:00
samcake
a23bbd1e4e Trying to extend the memory counter 2016-10-31 16:40:15 -07:00
samcake
91d878666c Remove experimental scripts 2016-10-31 14:56:28 -07:00
samcake
ce055fc1e6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-10-31 14:53:19 -07:00
Chris Collins
a49669a975 Merge pull request #8955 from sethalves/fix-obj-textures
fix obj textures
2016-10-31 11:52:25 -07:00
Chris Collins
0520aa9ad5 Merge pull request #8948 from samcake/blue
Avoid messaging for render targets generating mip maps
2016-10-31 11:09:06 -07:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket
group udt::Socket errors as debug logs
2016-10-31 10:31:10 -07:00
Chris Collins
3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068
Possible fix for 2069
2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub
a79541a83a Merge pull request #8962 from ZappoMan/removeFaceMute
remove mute icons
2016-10-30 13:12:23 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
Andrew Meadows
c8d4146351 don't mirror eye animations 2016-10-28 17:08:43 -07:00