Zach Fox
|
9d6e62d6bf
|
Merge pull request #12163 from ElderOrb/FB11109
FB11109 Preview disabled image swap (Commerce only)
|
2018-01-19 11:40:05 -08:00 |
|
Ryan Downe Karpf
|
f1b18ccc00
|
Merge pull request #12184 from ctrlaltdavid/21700
Add Window browseChanged signal as replacement for openFileChanged
|
2018-01-19 10:45:27 -08:00 |
|
Ryan Downe Karpf
|
08b4c6eb40
|
Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow
reduce calls to isPointOnDesktopWindow in controllerModules
|
2018-01-19 10:44:57 -08:00 |
|
Zach Fox
|
8c52f92de8
|
Merge pull request #12208 from zfox23/fixBubbleButtonFlash
Fix the Space Bubble button flash behavior; Rate limit sound
|
2018-01-19 09:29:17 -08:00 |
|
Clément Brisset
|
37504eca15
|
Merge pull request #12186 from ctrlaltdavid/21702
Add Window.protocolSignature() as a replacement for location.protocolVersion()
|
2018-01-18 15:20:03 -08:00 |
|
Alexander Ivash
|
a74b093b60
|
FB11109 Preview disabled image swap (Commerce only)
|
2018-01-18 23:26:43 +03:00 |
|
David Rowe
|
8c2427dd58
|
Rename Window.protocolVersion() to Window.protocolSignature()
|
2018-01-19 09:06:16 +13:00 |
|
Zach Fox
|
13d8d643f7
|
Also rate limit the bubble sound
|
2018-01-18 12:05:16 -08:00 |
|
Zach Fox
|
1bda3faaf2
|
Fix the Space Bubble button flash behavior
|
2018-01-18 11:23:49 -08:00 |
|
Dante Ruiz
|
d88ff701b5
|
reduce calls to isPointOnDesktopWindow
|
2018-01-18 10:48:35 -08:00 |
|
Andrew Meadows
|
82cab5e4a1
|
add scripted/qml debug UI for render LOD
|
2018-01-18 08:53:45 -08:00 |
|
Zach Fox
|
5ce768f402
|
Merge pull request #12151 from zfox23/commerce_sendMoney1
Commerce: P2P Transfer Iteration 1
|
2018-01-17 16:41:56 -08:00 |
|
Dante Ruiz
|
8f22c719b3
|
Merge pull request #12099 from sethalves/run
allow avatar walk-speed to be set from javascript
|
2018-01-17 13:53:13 -08:00 |
|
Seth Alves
|
8edded7059
|
Merge pull request #12164 from ctrlaltdavid/21695
Remove old ToolWindow code
|
2018-01-17 13:43:59 -08:00 |
|
Zach Fox
|
1d747bc0e4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-17 11:56:00 -08:00 |
|
Seth Alves
|
1e847cf32e
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-17 08:08:13 -08:00 |
|
Seth Alves
|
69a33428c0
|
Merge pull request #12078 from druiz17/soft-entities
Soft Entities
|
2018-01-17 08:02:37 -08:00 |
|
Seth Alves
|
d3084dc0df
|
defang
|
2018-01-17 07:11:27 -08:00 |
|
David Rowe
|
2883e24285
|
Add Window.protocolVersion() as a replacement for location's
|
2018-01-17 12:00:35 +13:00 |
|
Seth Alves
|
511f94a4fc
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-16 14:01:54 -08:00 |
|
David Rowe
|
85bda1da8e
|
Add Window browseChanged signal as replacement for openFileChanged
|
2018-01-17 09:57:20 +13:00 |
|
Clément Brisset
|
1949471dad
|
Merge pull request #12182 from highfidelity/stable
Merge stable (RC62) to master
|
2018-01-16 11:01:07 -08:00 |
|
Dante Ruiz
|
283b9a8003
|
fix softEntity edge cases
|
2018-01-12 15:31:54 -08:00 |
|
Seth Alves
|
f6ce254059
|
put run.js back in defaultScripts
|
2018-01-12 15:30:44 -08:00 |
|
Seth Alves
|
508a3b37cd
|
fix icon. button lights up when run in enabled
|
2018-01-12 15:28:42 -08:00 |
|
David Rowe
|
1fa31d3c10
|
Remove old ToolWindow code
|
2018-01-13 10:27:43 +13:00 |
|
Dante Ruiz
|
5b82c7bc41
|
fix merge conflict
|
2018-01-12 11:00:19 -08:00 |
|
Anthony J. Thibault
|
088f227df2
|
Pass model offset from avatar skeletonModel to attached entity
|
2018-01-12 10:26:02 -08:00 |
|
Zach Fox
|
1e608b13b2
|
Show username when admin (this probably isn't the way to get username
|
2018-01-11 14:45:43 -08:00 |
|
Seth Alves
|
1e92615459
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-11 13:21:45 -08:00 |
|
Zach Fox
|
d25ef074e1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-11 12:35:18 -08:00 |
|
Anthony Thibault
|
8d5e7dbeff
|
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:58:10 -08:00 |
|
John Conklin II
|
da2c56dbc9
|
Merge pull request #12139 from hyperlogic/bug-fix/snapshot-app-settings
RC62: Fix for black screen when clicking Settings from Snap app
|
2018-01-11 09:48:03 -08:00 |
|
Seth Alves
|
c09f644612
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-11 09:09:11 -08:00 |
|
Seth Alves
|
568c27d6e0
|
Merge pull request #12039 from luiscuenca/currentAPI
Fix and improve currentAPI.js
|
2018-01-10 17:55:08 -08:00 |
|
Anthony J. Thibault
|
1deb75daf7
|
Fix for black screen when clicking Settings from Snap app
(cherry picked from commit d5e3b97c93 )
|
2018-01-10 16:31:51 -08:00 |
|
Anthony J. Thibault
|
d5e3b97c93
|
Fix for black screen when clicking Settings from Snap app
|
2018-01-10 16:03:53 -08:00 |
|
Zach Fox
|
c15b1669b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-10 15:53:23 -08:00 |
|
Seth Alves
|
ddc730f49f
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-10 13:49:07 -08:00 |
|
Zach Fox
|
c5a5bddbc9
|
More progress
|
2018-01-10 12:21:12 -08:00 |
|
Zach Fox
|
e5abdc77d9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-10 10:02:56 -08:00 |
|
Zach Fox
|
f366fdf695
|
Beginnings of nearby
|
2018-01-10 09:58:23 -08:00 |
|
Seth Alves
|
3816c732c0
|
Merge branch 'run' of github.com:sethalves/hifi into run
|
2018-01-10 08:11:55 -08:00 |
|
Seth Alves
|
8cf94547e4
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-10 08:11:46 -08:00 |
|
Zach Fox
|
5469025113
|
More more more
|
2018-01-09 15:53:25 -08:00 |
|
Nissim Hadar
|
bb04b68e42
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
|
2018-01-09 15:51:46 -08:00 |
|
Nissim Hadar
|
0b1e321ccf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-09 15:25:03 -08:00 |
|
Brad Hefta-Gaub
|
a7b56da570
|
Merge pull request #12103 from ZappoMan/emoteApp
first cut at an emote app
|
2018-01-09 15:23:14 -08:00 |
|
Zach Fox
|
530df5447d
|
Even more proress
|
2018-01-09 15:19:50 -08:00 |
|
Dante Ruiz
|
125eb9ce44
|
add new tablet model and adjust screen offset
|
2018-01-09 14:31:57 -08:00 |
|