Sam Gateau
|
6b29e314c2
|
Adding the Stage of the Scene and exposing control of the sun light from javascript
|
2015-02-25 19:05:27 -08:00 |
|
samcake
|
5202d2136a
|
Merge pull request #4319 from huffman/avatar-billboards
Fix avatar billboards all rendering as the same billboard
|
2015-02-24 11:22:38 -08:00 |
|
Brad Hefta-Gaub
|
af99a5d07b
|
Merge pull request #4325 from AndrewMeadows/bispinor
use strings for shapeType in JS Entity properties
|
2015-02-23 15:11:57 -08:00 |
|
Andrew Meadows
|
3cd0a70641
|
store shapeType whenever it is explicitly changed
|
2015-02-23 14:35:44 -08:00 |
|
Andrew Meadows
|
f2fc781523
|
change shapeType to use strings in billiards.js
|
2015-02-23 11:42:36 -08:00 |
|
Andrew Meadows
|
456acd8833
|
merge upstream/master into andrew/bispinor
|
2015-02-23 11:41:40 -08:00 |
|
Andrew Meadows
|
2e1c122915
|
moved ShapeType boilerplate stuff macos
|
2015-02-23 11:38:56 -08:00 |
|
Andrew Meadows
|
0fc4c732f7
|
use macro for copying shapeType string to script
|
2015-02-23 10:13:47 -08:00 |
|
Andrew Meadows
|
0455ccf7be
|
Merge pull request #4313 from ctrlaltdavid/20355
CR for 20355 - Initial Integration with DDE
|
2015-02-23 09:47:19 -08:00 |
|
Andrew Meadows
|
2519f66037
|
Merge pull request #4311 from huffman/application-dpi-scale
Application dpi scale
|
2015-02-23 09:43:12 -08:00 |
|
Clément Brisset
|
c6b1375863
|
Merge pull request #4322 from AndrewMeadows/thermonuclear
workaround for scratchy audio on Windows
|
2015-02-23 07:18:30 -08:00 |
|
David Rowe
|
f169ab1238
|
Tidy and document DDE face tracker UDP socket opening and closing
|
2015-02-21 11:26:48 -08:00 |
|
David Rowe
|
8d9685ee39
|
Fix Face Tracking menu operation
|
2015-02-21 11:01:07 -08:00 |
|
Ryan Huffman
|
e6d9a1b251
|
Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale
Conflicts:
interface/src/ui/LoginDialog.cpp
|
2015-02-20 18:09:55 -08:00 |
|
Andrew Meadows
|
d650a092c2
|
Merge pull request #4321 from ctrlaltdavid/faceshift-readme
Update Faceshift readme.txt with Windows instructions
|
2015-02-20 18:02:35 -08:00 |
|
Andrew Meadows
|
d5733f3782
|
Merge pull request #4318 from PhilipRosedale/master
Billiard balls are now textured models
|
2015-02-20 17:59:33 -08:00 |
|
Andrew Meadows
|
27e6f99deb
|
use strings for shapeType for JS Entity properties
|
2015-02-20 16:54:58 -08:00 |
|
Brad Hefta-Gaub
|
70400f7f8c
|
Merge pull request #4323 from huffman/notifciation-local-only-audio
Update notifications.js audio to be local-only
|
2015-02-20 14:29:20 -08:00 |
|
Ryan Huffman
|
cf0b13f869
|
Update notifications.js audio to be local-only
|
2015-02-20 14:22:59 -08:00 |
|
Andrew Meadows
|
94b3c4a3a8
|
simpler less draconian workaround
|
2015-02-20 11:57:37 -08:00 |
|
David Rowe
|
3a95614ca4
|
Update Faceshift readme.txt with Windows instructions
|
2015-02-20 11:29:51 -08:00 |
|
Brad Hefta-Gaub
|
5d6d9bb1d4
|
Merge pull request #4320 from huffman/fix-camera-move-on-mirror
Fix entity camera tool from taking over in mirror mode
|
2015-02-20 10:40:03 -08:00 |
|
Brad Hefta-Gaub
|
32bbc8d551
|
Merge pull request #4317 from birarda/master
dynamically grab animation URL as model URL from model
|
2015-02-20 10:39:30 -08:00 |
|
Ryan Huffman
|
c665a3873d
|
Fix entity camera tool from taking over in mirror mode
|
2015-02-20 10:11:55 -08:00 |
|
Ryan Huffman
|
5c3cae471b
|
Fix avatar billboards all rendering as the same billboard
|
2015-02-20 09:48:04 -08:00 |
|
Andrew Meadows
|
c3dbae1bd3
|
remove warning about signed-unsigned comparison
|
2015-02-20 09:00:28 -08:00 |
|
Andrew Meadows
|
aa667464c0
|
merge upstream/master into andrew/thermonuclear
|
2015-02-20 08:26:51 -08:00 |
|
Andrew Meadows
|
599ef68df8
|
fix for scratchy audio on windows
|
2015-02-20 08:26:11 -08:00 |
|
Philip Rosedale
|
66d1eeb327
|
Add textured models as balls
|
2015-02-19 21:11:51 -08:00 |
|
Ryan Huffman
|
4dfe725721
|
Update preferences dialog to use layouts throughout
|
2015-02-19 14:02:15 -08:00 |
|
Stephen Birarda
|
51ad631c54
|
dynamically grab animation URL as model URL from model
|
2015-02-19 13:14:46 -08:00 |
|
Philip Rosedale
|
f3b37bba54
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2015-02-19 12:04:43 -08:00 |
|
Ryan Huffman
|
4a8e3193a9
|
Add more comments to UIUtil::scaleWidgetFontSizes
|
2015-02-19 12:01:27 -08:00 |
|
Grayson Stebbins
|
fd3bbb6553
|
Merge pull request #4316 from nbq/removeat
Fix TP text in welcome page
|
2015-02-19 11:58:22 -08:00 |
|
Jason Hawks
|
d0b47a66ab
|
removed at symbol and added enter for teleport box
|
2015-02-19 14:49:00 -05:00 |
|
Jason Hawks
|
e66e098cd2
|
Merge branch 'master' of github.com:nbq/hifi
|
2015-02-19 14:38:50 -05:00 |
|
Clément Brisset
|
d2ed782626
|
Merge pull request #4308 from Triplelexx/20315
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
|
2015-02-19 10:27:27 -08:00 |
|
Andrew Meadows
|
21405135f9
|
Merge pull request #4310 from talentraspel/20323
CR for Job #20323 - BUG: another crash on exit in interface
|
2015-02-19 09:52:23 -08:00 |
|
Clément Brisset
|
ac3b172dee
|
Merge pull request #4312 from ctrlaltdavid/update-svg-url
Update SVG URL to Amazon S3
|
2015-02-19 04:36:16 -08:00 |
|
Andrew Meadows
|
e207dad009
|
Merge pull request #4314 from AndrewMeadows/inertia
fix EntityServer crash for zero view aspectRatio
|
2015-02-18 18:09:05 -08:00 |
|
Ryan Huffman
|
a8999964f6
|
Cleanup dpi scaling comments
|
2015-02-18 16:21:51 -08:00 |
|
Stephen Birarda
|
24468a7936
|
Merge pull request #4315 from birarda/master
use http link for gverb in case no git available
|
2015-02-18 16:18:04 -08:00 |
|
Ryan Huffman
|
4751974c45
|
Revert "Add scaling for high-dpi Windows/Linux displays"
This reverts commit 2828b65bea.
|
2015-02-18 16:16:50 -08:00 |
|
Ryan Huffman
|
03eb1a984f
|
Revert "Fix dpi scaling in getViewportDimensions"
This reverts commit 9b719273ab.
|
2015-02-18 16:15:53 -08:00 |
|
Stephen Birarda
|
5a3ef34d1e
|
use http link for gverb in case no git available
|
2015-02-18 16:14:51 -08:00 |
|
Andrew Meadows
|
cf9d92abc0
|
fix EntityServer crash for zero view aspectRatio
|
2015-02-18 15:48:12 -08:00 |
|
Philip Rosedale
|
f6f54809d0
|
Merge pull request #4291 from Atlante45/reverb_smoothing
Reverb smoothing
|
2015-02-18 15:34:14 -08:00 |
|
Ryan Huffman
|
22d46e3e6b
|
Update runningscripts script font to match parent
|
2015-02-18 15:33:24 -08:00 |
|
Ryan Huffman
|
9b719273ab
|
Fix dpi scaling in getViewportDimensions
|
2015-02-18 15:30:39 -08:00 |
|
Ryan Huffman
|
2828b65bea
|
Add scaling for high-dpi Windows/Linux displays
|
2015-02-18 15:09:41 -08:00 |
|