Olivier Prat
|
efa6a8c0b5
|
Merged with master
|
2018-01-17 15:49:46 +01:00 |
|
Olivier Prat
|
157a229a4f
|
Tried to add GLSL validation in scribe. Issues with determining the correct version...
|
2018-01-17 15:09:32 +01:00 |
|
Olivier Prat
|
54690219e3
|
Changed the way shader type is sent to Scribe
|
2018-01-17 11:12:37 +01:00 |
|
Olivier Prat
|
7b420d48e2
|
Generated shader files are now grouped in a sub-filter group in the project
|
2018-01-17 10:59:48 +01:00 |
|
Olivier Prat
|
49549ced17
|
Fixed compilation with new shader system
|
2018-01-17 10:52:58 +01:00 |
|
Sam Gateau
|
d4571bd86a
|
Merge pull request #12181 from humbletim/rename-model-graphics
Rename libraries/model -> libraries/graphics
|
2018-01-16 18:12:25 -08:00 |
|
NissimHadar
|
9a382ebb86
|
Merge pull request #12177 from NissimHadar/defaultAmbientFix
Set ambient mode to inherit if no URLs have been entered.
|
2018-01-16 14:40:08 -08:00 |
|
MiladNazeri
|
d356f4faf9
|
Merge pull request #12143 from ctrlaltdavid/21679
location API JSDoc
|
2018-01-16 12:32:25 -08:00 |
|
Clément Brisset
|
858221d4db
|
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash
Fix concurrent access crash in avatar mixer
|
2018-01-16 11:07:59 -08:00 |
|
David Rowe
|
f836a5f2b6
|
Fix typo
|
2018-01-17 08:06:04 +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 |
|
Sam Gondelman
|
3879626205
|
Merge pull request #12176 from SamGondelman/rendering
Fix animation crash, make last frame inclusive
|
2018-01-16 10:05:48 -08:00 |
|
Olivier Prat
|
3911ce59cc
|
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
|
2018-01-16 19:02:12 +01:00 |
|
humbletim
|
b91d536dd0
|
rename model:: -> graphics::
|
2018-01-16 12:46:16 -05:00 |
|
humbletim
|
08ccda9cfc
|
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
|
2018-01-16 12:44:44 -05:00 |
|
John Conklin II
|
f3b200214c
|
Merge pull request #12110 from highfidelity/RC62
Beta Release 62 - includes up to Developer Release 7646
|
2018-01-16 09:34:13 -08:00 |
|
Seth Alves
|
b17913366a
|
Merge pull request #12178 from ctrlaltdavid/21694
Support FBX files that have nodes with non-XYZ rotation order
|
2018-01-16 07:50:11 -08:00 |
|
Olivier Prat
|
cdb94d0832
|
Merge branch 'master' of git://github.com/highfidelity/hifi into scribe
|
2018-01-16 16:43:50 +01:00 |
|
David Rowe
|
02179e3efd
|
Doc review
|
2018-01-16 17:14:30 +13:00 |
|
David Rowe
|
f319fa70cb
|
Merge branch 'master' into 21679
|
2018-01-16 16:22:34 +13:00 |
|
Nissim Hadar
|
f2d272b6fe
|
Merge branch 'master' of https://github.com/highfidelity/hifi into defaultAmbientFix
|
2018-01-15 17:56:19 -08:00 |
|
Nissim Hadar
|
daa6409936
|
Improved comments.
|
2018-01-15 17:33:48 -08:00 |
|
David Rowe
|
67218a697b
|
Support FBX files that have nodes with non-XYZ rotation order
|
2018-01-16 14:01:20 +13:00 |
|
John Conklin II
|
b26b99fec5
|
Merge pull request #12175 from SamGondelman/RC62
RC62: Fix animation crash, make last frame inclusive
|
2018-01-15 15:49:54 -08:00 |
|
Nissim Hadar
|
a1415e28ff
|
If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit.
|
2018-01-15 15:11:10 -08:00 |
|
SamGondelman
|
9d721ba605
|
fix crash on last frame = first frame, make last frame inclusive
(cherry picked from commit f1253e3c6c)
|
2018-01-15 15:03:03 -08:00 |
|
SamGondelman
|
f1253e3c6c
|
fix crash on last frame = first frame, make last frame inclusive
|
2018-01-15 15:01:17 -08:00 |
|
MiladNazeri
|
c7cdf6b8f6
|
Merge pull request #12145 from ctrlaltdavid/21684
Update Window JSDoc per recent API changes
|
2018-01-15 14:50:40 -08:00 |
|
Ryan Huffman
|
9b7520ddba
|
Merge pull request #12173 from sethalves/atp-get-mapping
expose GetMappingRequest to js
|
2018-01-15 13:42:19 -08:00 |
|
Seth Alves
|
ed91ece871
|
Merge pull request #12169 from druiz17/asset-browser
fix asset browser for tablet
|
2018-01-15 12:04:26 -08:00 |
|
Sam Gateau
|
2f5d2bef49
|
Merge pull request #12028 from Zvork/roughness_metal
Lighting model update for better specular
|
2018-01-15 10:51:18 -08:00 |
|
Seth Alves
|
76048f3c30
|
error handling
|
2018-01-15 10:48:12 -08:00 |
|
Melissa Brown
|
991dad18ba
|
Merge pull request #12160 from ElderOrb/FB11241
FB11241 Changing options in menu causes the title “Menu” to change to…
|
2018-01-15 10:46:37 -08:00 |
|
John Conklin II
|
c3648fb04c
|
Merge pull request #12168 from druiz17/RC62
fix Asset browser for tablet (RC62)
|
2018-01-15 10:16:56 -08:00 |
|
Seth Alves
|
3e7d303661
|
export atp GetMappingRequest to js
|
2018-01-15 09:56:46 -08:00 |
|
Dante Ruiz
|
8e4bd2d662
|
fix asset browser for tablet
|
2018-01-12 17:11:02 -08:00 |
|
Dante Ruiz
|
a48304b104
|
fix Asset browser for tablet
|
2018-01-12 17:06:07 -08:00 |
|
Anthony Thibault
|
0a54241fe3
|
Merge pull request #12092 from hyperlogic/feature/dual-quat
Fix tootsie roll wrists and shoulders with dual quaternion skinning
|
2018-01-12 16:30:03 -08:00 |
|
John Conklin II
|
810c5b6577
|
Merge pull request #12167 from zfox23/fixBrowseAvatars_62
RC62: Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 16:06:07 -08:00 |
|
Zach Fox
|
bd3474de68
|
Merge pull request #12166 from zfox23/fixSnapshotSocialSharing
Fix social media sharing buttons on Snapshot app
|
2018-01-12 15:52:56 -08:00 |
|
Zach Fox
|
e627925bd3
|
Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 15:14:42 -08:00 |
|
Zach Fox
|
ea2b0c4f6f
|
Merge pull request #12165 from zfox23/fixBrowseAvatars
Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 15:14:18 -08:00 |
|
Zach Fox
|
522007af9d
|
Fix social media sharing buttons on Snapshot app
|
2018-01-12 14:58:14 -08:00 |
|
Zach Fox
|
6920e57613
|
Fix 'Browse Avatars' button from Avatar Settings
|
2018-01-12 13:31:58 -08:00 |
|
Brad Hefta-Gaub
|
68de7f864e
|
Merge pull request #12162 from kencooke/audio-stereo-mic
Support for stereo audio input/mic
|
2018-01-12 13:29:28 -08:00 |
|
NissimHadar
|
e580a19677
|
Merge pull request #12147 from NissimHadar/noBackgroundModeFix
Dealing with legacy domains.
|
2018-01-12 12:42:11 -08:00 |
|
Andrew Meadows
|
a116768f4c
|
Merge pull request #12154 from hyperlogic/bug-fix/elbow-glitch-fix
Fix for elbow glitches
|
2018-01-12 10:18:11 -08:00 |
|
Zach Fox
|
b7f4fe2ba3
|
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file
Do not delete wallet file
|
2018-01-12 09:44:40 -08:00 |
|
Anthony J. Thibault
|
bfd18e3696
|
unused variable warning fix
|
2018-01-12 09:07:50 -08:00 |
|
Olivier Prat
|
98a47e56fc
|
Added a hack to force referencing of shader source on Android
|
2018-01-12 17:32:12 +01:00 |
|