Olivier Prat
ec439086a2
Extended to other shaders
...
(cherry picked from commit 328f1dec9b
2018-05-10 15:41:34 -07:00
Olivier Prat
29355ba8fb
Fixed procedural shaders
...
(cherry picked from commit eab7dd6006
2018-05-10 15:41:04 -07:00
John Conklin II
befb411f6e
Merge pull request #13025 from highfidelity/RC67
...
Beta Release 67 - branched at developer release 8181
2018-05-10 10:11:23 -07:00
John Conklin II
4d224af7c7
Merge pull request #13137 from sethalves/fix-serverless-sim-ownership-rc67
...
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 12:34:42 -07:00
John Conklin II
e9ad50159c
Merge pull request #13136 from zfox23/RC67_MS14951
...
RC67: MS14951: Fix Snapshot hotkey sound playback
2018-05-09 11:11:33 -07:00
Seth Alves
db03265a6b
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 10:53:46 -07:00
Zach Fox
542e707de8
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 09:40:51 -07:00
John Conklin II
d8e6ecba35
Merge pull request #13129 from druiz17/fix-hmd-js
...
Fix hmd js
2018-05-09 07:45:52 -07:00
John Conklin II
a811c6aba3
Merge pull request #13132 from zfox23/RC67_MS14937
...
MS14937: Fix Replace button for content sets during Checkout
2018-05-09 06:47:47 -07:00
Zach Fox
22c26c348d
MS14937: Fix Replace button for content sets during Checkout
2018-05-08 16:37:11 -07:00
Dante Ruiz
1a0ded4526
adding windows
2018-05-08 15:10:57 -07:00
Dante Ruiz
0513204781
fix hmd.js
2018-05-08 15:05:55 -07:00
Stephen Birarda
10b9546104
Merge pull request #13124 from birarda/66-2-to-67
...
Merge 66.2 back to 67
2018-05-08 14:03:07 -07:00
Stephen Birarda
ae2c45bddd
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-08 10:23:14 -07:00
John Conklin II
a6eed27bdd
Merge pull request #13123 from druiz17/RC67
...
remove highlight on entity when point to the sky (RC67)
2018-05-08 07:25:40 -07:00
Dante Ruiz
a593209ec1
remove highlight when point to the sky
2018-05-07 15:33:12 -07:00
Dante Ruiz
9d6019e78c
Merge branch 'RC67' of github.com:highfidelity/hifi into RC67
2018-05-07 15:33:00 -07:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818
...
Fix for 'Login page for steam is blank'
2018-05-07 11:26:39 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758
...
RC67: MS14758: Fix avatar reset when gifting worn avatar
2018-05-07 10:10:41 -07:00
John Conklin II
8f8c5b4f08
Merge pull request #13105 from druiz17/another-highlight-f-x
...
fix-another-highlighting-issue
2018-05-07 10:05:59 -07:00
John Conklin II
2eb171be1c
Merge pull request #13107 from zfox23/RC67_MS14639
...
RC67: Fix for crash deep in QML after useFullAvatarURL
2018-05-07 10:05:16 -07:00
Alexander Ivash
b4cfea2fbc
FB14818 Login page for steam is blank
2018-05-06 17:17:06 +03:00
Anthony J. Thibault
8480bb962b
Fix for crash deep in QML after useFullAvatarURL
...
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c
MS14758: Fix avatar reset when gifting worn avatar
2018-05-04 16:04:05 -07:00
Dante Ruiz
176d69444f
fix-another-highlighting-issue
2018-05-04 14:23:46 -07:00
Dante Ruiz
607de3dfb4
Merge branch 'RC67' of github.com:highfidelity/hifi into RC67
2018-05-04 14:20:57 -07:00
Dante Ruiz
6414fcaae5
fix-another-highlighting-issue
2018-05-04 14:20:17 -07:00
John Conklin II
ea230d8698
Merge pull request #13100 from druiz17/fix-entity-highlighting-during-editing
...
Don't highlight entities during edit mode
2018-05-04 11:32:24 -07:00
Dante Ruiz
a57c72df6e
fix entity highlighting during edit mode
2018-05-04 08:53:49 -07:00
John Conklin II
ef997e647a
Merge pull request #13088 from samcake/rc67
...
RC67: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-03 16:21:14 -07:00
John Conklin II
182e7c4b5f
Merge pull request #13086 from samcake/rc66.2
...
RC 66.2: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
2018-05-03 15:48:41 -07:00
John Conklin II
b426c4e85d
Merge pull request #13089 from druiz17/RC-67-fix-highlighting
...
RC 67 fix entity highlighting
2018-05-03 15:34:21 -07:00
Dante Ruiz
cffb008c31
fixing edge case
2018-05-03 13:07:32 -07:00
Dante Ruiz
4793cddde6
fix highlighting issues
2018-05-03 11:27:07 -07:00
samcake
60a49c3f7c
applying the local lights on translucent fix
2018-05-03 10:37:29 -07:00
samcake
6579e3c3d2
Adjusting the number to 14 max UBO per shader stage after checking on opengl.glinfo.org
2018-05-03 09:09:58 -07:00
Sam Gateau
9776e1d15d
Exposing larger number of ubo because we can and moving the ubo slot using 11 to 12 to avoid collision
2018-05-02 23:38:30 -07:00
John Conklin II
f983714702
Merge pull request #13077 from jherico/fix/14638_rc67
...
Make resource swapchains immutable
2018-05-02 15:42:30 -07:00
Bradley Austin Davis
233c60a506
Change type used for swap chain count
2018-05-02 10:29:55 -07:00
Bradley Austin Davis
7bad849e67
Make resource swapchains immutable, fix for 14638
2018-05-02 10:29:40 -07:00
John Conklin II
2dc6b86b20
Merge pull request #13072 from jherico/fix/14638_rc66
...
RC66.2: Make resource swapchains immutable
2018-05-02 10:23:00 -07:00
John Conklin II
256154202e
Merge pull request #13071 from zfox23/RC67_preventImageProviderCrash
...
RC67: Fix a crash in Image Provider when logging in or reloading all scripts
2018-05-01 17:39:43 -07:00
Bradley Austin Davis
fb929da228
Change type used for swap chain count
2018-05-01 16:54:48 -07:00
Bradley Austin Davis
521ae36cbf
Make resource swapchains immutable, fix for 14638
2018-05-01 16:07:23 -07:00
Zach Fox
d5f809c3c0
Actually fix
2018-05-01 14:49:44 -07:00
Zach Fox
d1bb37874d
Prevent crash in ImageProvider when tablet isn't yet initialized
2018-05-01 14:49:37 -07:00
John Conklin II
a5753c6d94
Merge pull request #13064 from birarda/66-2-to-67
...
merge changes in 66.2 to 67
2018-05-01 12:50:01 -07:00
Stephen Birarda
24dc1c930e
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-01 10:54:35 -07:00
Brad Hefta-Gaub
30e808e133
Merge pull request #13056 from birarda/bug/local-ID-missed-erase
...
RC67: add a missing unsafe_erase for local node ID map
2018-04-30 19:12:03 -07:00
Stephen Birarda
ed47cd8458
add a missing unsafe_erase for local node ID map
2018-04-30 12:35:48 -07:00
