Andrew Meadows
5eadc265af
Merge pull request #7327 from sethalves/auto-set-query-aa-cube
...
if needed, set queryAACube when dimensions are updated
2016-03-14 11:35:13 -07:00
David Rowe
f75aa97728
Grow width of QML message box to accommodate wide title if necessary
2016-03-15 07:22:21 +13:00
Seth Alves
5292e537ea
further unmangle merge
2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4
merge from upstream
2016-03-14 11:15:16 -07:00
Zach Pomerantz
b6322164cf
Guard against failure to load skybox tex
2016-03-14 11:15:06 -07:00
samcake
a7f21d5fce
Clena up comments, ready to PR
2016-03-14 10:36:19 -07:00
samcake
dc1f787873
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-14 10:11:46 -07:00
Brad Hefta-Gaub
830f53cc46
Merge pull request #7345 from sethalves/delete-parentless-entities-redux
...
Delete parentless entities redux
2016-03-14 10:04:22 -07:00
Chris Collins
e577658315
Merge pull request #7333 from PhilipRosedale/testSound
...
playTestSound.js - better clip for testing/showing audio
2016-03-14 08:44:28 -07:00
Brad Hefta-Gaub
7f4cbeda00
Merge pull request #7343 from jherico/procedural_time
...
Fix iDate uniform in procedurals to be continuous
2016-03-13 22:08:54 -07:00
Ryan Huffman
4b6dd4636f
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
2016-03-13 21:32:25 -07:00
Ryan Huffman
960047f412
Remove right click selection
2016-03-13 21:06:52 -07:00
Ryan Huffman
6c27bd9eb2
Update upload flow and make asset list dynamically sized
2016-03-13 21:04:07 -07:00
Anthony Thibault
1e94d9bdf5
interface/src/avatar: cppcheck fixes
2016-03-13 18:56:15 -07:00
Anthony Thibault
54cc49283c
libraries/avatars: cppcheck warning fixes
2016-03-13 18:19:42 -07:00
Anthony Thibault
9f30556084
libraries/animation: cppcheck fixes
...
* Fix for potential bug in AnimLoop due to _maxFrameIndexHint being uninitialized.
* made more single argument constructors explicit.
2016-03-13 17:17:34 -07:00
Anthony Thibault
11fcf00b2a
AnimSkeleton.h: made single argument ctors explicit
2016-03-13 16:55:34 -07:00
Anthony Thibault
02b2281def
AnimVarient.h: cppcheck fixes
...
* make all constructors explicit.
* remove static string comparison in assert.
2016-03-13 16:51:57 -07:00
Brad Hefta-Gaub
9e0d9f5748
Merge pull request #7337 from sethalves/disable-oculus-legacy-on-linux
...
don't build oculus-legacy plugin on Linux
2016-03-13 12:26:37 -07:00
Brad Hefta-Gaub
27fec45e95
Merge pull request #7342 from imgntn/consoleversion2
...
Add version number and make adding new menu items to Server Console easier
2016-03-13 12:25:04 -07:00
Brad Davis
798d2a73db
Merge pull request #7326 from ZappoMan/toggleOverlay
...
Various Overlay, Menu, and Away Mode bug fixes
2016-03-13 11:44:19 -07:00
Anthony Thibault
b921ac7757
MyAvatar: prevent roll and pitch in avatar via snapshot url.
2016-03-13 11:32:48 -07:00
Brad Hefta-Gaub
d4d113d47d
Merge pull request #7346 from sethalves/fix-crash
...
fix a crash
2016-03-13 11:18:35 -07:00
Seth Alves
dbd548a8c7
fix a crash
2016-03-13 11:01:11 -07:00
Seth Alves
7641b1e99d
remove debug print
2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189
be more aggressive about putting entities into the missing-its-parent list
2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698
delete child entities when parent is deleted
2016-03-13 07:04:50 -07:00
Eric Levin
8d2ab50616
Merge pull request #7344 from jherico/vive_crash
...
Fix vive crash on deactivate
2016-03-12 22:03:38 -08:00
Brad Davis
27033e5bb5
Fix vive crash on deactivate
2016-03-12 21:48:36 -08:00
Mark Johnson
b7a47d7bf2
Tabs -> Spaces
2016-03-12 17:35:57 -08:00
samcake
5b5d5cc328
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-03-12 17:33:57 -08:00
Mark Johnson
47d3f418e3
Merge remote-tracking branch 'highfidelity/master'
2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375
Fill in the downloads line of the stats window
...
Will show the active download, current download limit and how many
pending requests
2016-03-12 17:27:43 -08:00
Mark Johnson
d868b541c4
Separate the request limit value from the active request value
...
Use _requestLimit as the download limit, and track active downloads using
_requestsActive. If the limit is changes below the active count, it will
continue downloading all active requests, but not allow new requests until
the active count gets below the limit. If the limit increases, the pending
request queue will be checked immediately to fill the available download slots.
2016-03-12 17:19:29 -08:00
Brad Davis
27ecdffeb3
Fix iDate uniform in procedurals to be continuous
2016-03-12 16:46:15 -08:00
James B. Pollack
96bc17cd5e
Update photo_sphere.js
2016-03-12 16:01:10 -08:00
James B. Pollack
b929089af7
options
2016-03-12 15:01:34 -08:00
James B. Pollack
98d4f34d64
enable
2016-03-12 14:59:54 -08:00
James B. Pollack
03a109b60f
menu
2016-03-12 14:54:10 -08:00
Anthony Thibault
ea95295e66
ApplicationOveraly: Fix for gray line at top of HMD UI overlay
2016-03-12 14:52:26 -08:00
Seth Alves
cca4a93b2b
don't full up userData with default grabbable data
2016-03-12 14:09:52 -08:00
James Pollack
50e7bd7742
claenup
2016-03-12 13:42:18 -08:00
Seth Alves
be51040420
grabbable controlls are working
2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e
started to add grabbable psuedo properties to edit.js
2016-03-12 13:20:00 -08:00
James B. Pollack
f409127f1d
start
2016-03-12 12:18:54 -08:00
Seth Alves
29fd3e4ea6
Merge branch 'master' of github.com:highfidelity/hifi into disable-oculus-legacy-on-linux
2016-03-12 08:59:29 -08:00
Brad Hefta-Gaub
8420e67b54
Merge pull request #7338 from highfidelity/revert-7331-consoleversion
...
Revert "Show Server Console Version"
2016-03-12 08:54:14 -08:00
Brad Hefta-Gaub
90f5dd50a5
Revert "Show Server Console Version"
2016-03-12 08:38:41 -08:00
Seth Alves
d036e0618d
don't build oculus-legacy plugin on linux
2016-03-12 07:54:59 -08:00
David Rowe
f7c6725f63
Improve text3d rendering
2016-03-12 23:24:52 +13:00
