Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 10:37:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64047 commits 76 branches 59 tags 1.2 GiB
Commit graph

26290 commits

Author SHA1 Message Date
ZappoMan
027a1e69f4 some settings cleanup, adding description to Send Data 2018-01-20 00:08:06 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Bruce Brown
cbc8698e9a Fix Bitwise operators. 2018-01-19 16:59:47 -08:00
Ken Cooke
e2e4e7f423 Re-implement collision sound pitch shifting 2018-01-19 16:03:59 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703 
Display both lasers on tablet and Web surfaces
 2018-01-19 15:15:44 -08:00
Ken Cooke
a421ba7649 Add "pitch" parameter to scriptable audio injector options. 
Used in playSound() to pitch-shift the audio when injector is created.
 2018-01-19 14:50:51 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
luiscuenca
41f3b792b6 Fix warnings 2018-01-19 14:34:52 -07:00
Bruce Brown
fab13a111c Remove accidental - 2018-01-19 13:10:34 -08:00
David Rowe
24dcc8788c Code review 2018-01-20 10:07:23 +13:00
John Conklin II
c366ed42ab
Merge pull request #12202 from amantley/urlbug 
added a property check in renderableModelEntity for the animation url…
 2018-01-19 12:52:43 -08:00
David Rowe
94e6a68d41 Code review 2018-01-20 09:50:24 +13:00
humbletim
395cc663dd reuse same disk cache as AssetClient 2018-01-19 15:10:36 -05:00
Bruce Brown
39e938ccc7
Removed Tabs & CR/LF 2018-01-19 11:52:09 -08:00
Brad Davis
e2c4af05bd Don't process empty images 2018-01-19 11:42:31 -08:00
Brad Davis
104dbabee9 Infinite loop guard 2018-01-19 11:42:13 -08:00
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
Sam Gateau
9a8246f2b9
Merge pull request #12215 from Zvork/brdf 
Normalized diffuse & specular for directional, point and spot lights
 2018-01-19 11:08:29 -08:00
Seth Alves
63cd472fca
Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags 
fix race condition whereby physics may incorrectly overwrite script/network property change
 2018-01-19 11:06:22 -08:00
Brad Davis
d6f7b23b2d Merge remote-tracking branch 'upstream/master' into android 2018-01-19 10:37:41 -08:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
Thijs Wenker
0f7f58417b JS scripting console auto-complete 2018-01-19 19:11:12 +01:00
Sam Gateau
ce550b4fa6
Merge pull request #12209 from SamGondelman/textures 
Watch for attachment texture loading
 2018-01-19 10:08:04 -08:00
Olivier Prat
12c48a38f7 Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials. 2018-01-19 13:58:35 +01:00
Bruce Brown
3004ee08e1
Fix lockup when no midi devices present. 2018-01-18 21:18:36 -08:00
David Rowe
fb684909ce Merge branch 'master' into 21703 2018-01-19 17:25:12 +13:00
humbletim
31cdd5cca2 QueuedConnection per CR feedback 2018-01-18 22:20:28 -05:00
David Rowe
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
humbletim
dfb1619dc6 CR feedback; using namespace AssetUtils => inline AssetUtils:: 2018-01-18 21:49:53 -05:00
humbletim
d2a3a71f00 trying JS_VERIFY on for size (instead of JS_ASSERT) 2018-01-18 21:48:41 -05:00
Alexander Ivash
67e816756c make gcc happy 2018-01-19 01:51:41 +00:00
Andrew Meadows
75b5635d2f less word salad 2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -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
Elisa Lupin-Jimenez
42b8c293d6
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name 
Fixed typo in macro name
 2018-01-18 14:44:43 -08:00
Brad Hefta-Gaub
61a5750b09
Merge pull request #12204 from druiz17/fix-dynamic-entities-not-colliding 
Fix dynamic entities not colliding with avatar when a grab action is removed
 2018-01-18 14:39:21 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number 
fix sparse rectification for small textures, export for same model at diff URL
 2018-01-18 14:25:33 -08:00
amantley
961ed88fb0 fixed coding standards in RenderableModelEntityItem.cpp 2018-01-18 12:56:24 -08:00
SamGondelman
c8aded0688 watch for attachment texture loading 2018-01-18 12:40:02 -08:00
Alexander Ivash
50217726c0 remove extra qualification from DesktopPreviewProvider::getInstance() in .h 2018-01-18 23:26:43 +03:00
Alexander Ivash
be3789e70a show warning on attempt to force 'VSYNC' preview reason 2018-01-18 23:26:43 +03:00
Alexander Ivash
576ae227a8 move imagePaths into .h so simplify matching enum values to image files 2018-01-18 23:26:43 +03:00
Alexander Ivash
744da710a3 move VSYNC into 'PreviewDisabledReasons' enum 2018-01-18 23:26:43 +03:00
Alexander Ivash
a74b093b60 FB11109 Preview disabled image swap (Commerce only) 2018-01-18 23:26:43 +03:00
amantley
1c97272767 Cleaned up the code a bit so that there is no need for a new class variable for properties to verify the change of url 2018-01-18 12:09:28 -08:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
Atlante45
482ca3f038 Make type name hash static const 2018-01-18 10:28:43 -08:00
Dante Ruiz
92f8f9d2c0
Merge pull request #12200 from sethalves/fix-avatar-entity-delete-deadlock 
avoid a deadlock when clearing avatar entities
 2018-01-18 10:07:07 -08:00
Olivier Prat
902bfac380 Merged with master 2018-01-18 18:31:04 +01:00
Sam Gateau
dd436229c1
Merge pull request #12193 from SamGondelman/transparent 
Fix black flashing on transparent objects
 2018-01-18 09:11:46 -08:00
Dante Ruiz
3e3b3a0a9e Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding 2018-01-18 08:56:01 -08:00
Dante Ruiz
93594fb0bb make dynamic entities collide with avatar when removing grab action 2018-01-18 08:55:51 -08:00
amantley
9f484a7f57 Removed extraneous comments in RenderableItemEntity.cpp and .h 2018-01-18 08:54:05 -08:00
amantley
4eb2a5cf5e added a property check in renderableModelEntity for the animation url this fixes the bug stopping you from changing animations on an entity 2018-01-17 19:25:20 -08:00
Elisa Lupin-Jimenez
49e72346a4 fixed typo in macro name 2018-01-17 18:08:05 -08:00
Seth Alves
45406177e5 avoid a deadlock when clearing avatar entities 2018-01-17 17:56:25 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
David Rowe
ee2936d133 Add Pointers API function that disables hover events for nominated items 2018-01-18 14:07:07 +13: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
SamGondelman
a44c965f56 fix black flashing on transparent objects 2018-01-17 15:59:07 -08:00
Seth Alves
fda4cf10b9
Merge pull request #12159 from Zvork/compactvb 
Fix potential assert exception in FBXMesh_Reader.cpp
 2018-01-17 15:16:22 -08:00
Bradley Austin Davis
6200d31c93 Fixing OSX resources URL 2018-01-17 14:46:27 -08:00
humbletim
49bb9420cc
Merge branch 'master' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:11:33 -05:00
humbletim
09534769cd Merge branch 'Leopoly_Phase1_002_Mini-Promise' into Leopoly_Phase1_003_Asset-Request 2018-01-17 17:09:42 -05:00
humbletim
0930cc4f0e partial getMapping PR integration 2018-01-17 17:08:57 -05:00
Seth Alves
8edded7059
Merge pull request #12164 from ctrlaltdavid/21695 
Remove old ToolWindow code
 2018-01-17 13:43:59 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671 
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
 2018-01-17 13:42:47 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -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
Bradley Austin Davis
9f6c2c3cdd Merge remote-tracking branch 'upstream/master' into android 2018-01-17 11:44:00 -08:00
humbletim
744da48551 add apache 2.0 headers 2018-01-17 14:00:50 -05:00
Sam Gateau
0e72197a37
Merge pull request #12179 from Zvork/specular 
Fixed error in Specular shader which gave low key specular highlights
 2018-01-17 10:51:25 -08:00
Bradley Austin Davis
503fed19a7 Trying to fix mac resource loading 2018-01-17 10:36:34 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Olivier Prat
e6caa83d73 Merged with master 2018-01-17 16:35:31 +01:00
Brad Davis
795a3b8407 Fix merge errors 2018-01-16 19:27:35 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Anthony J. Thibault
bc587bf6d8 Removal of legacy Rig methods 2018-01-16 18:19:35 -08: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
Anthony J. Thibault
576273efe3 Remove Rig::restoreJointPosition and references to it. 2018-01-16 18:01:58 -08:00
Anthony J. Thibault
1027025b5c remove bind poses from AnimSkeleton. 2018-01-16 17:41:25 -08:00
Anthony J. Thibault
51ea2632c0 Remove Avatar UseAnimPreAndPostRotations option. 
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
 2018-01-16 17:27:19 -08:00
David Rowe
2883e24285 Add Window.protocolVersion() as a replacement for location's 2018-01-17 12:00:35 +13:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -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
Brad Davis
ceb60f6eba Fix built-in resource loading from scripts 2018-01-16 12:33:09 -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
Mohammed Nafees
885801c5ca Fix copying to clipboard from JS scripts 2018-01-16 13:17:47 -05: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
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
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
8fb863e98c Added SurfaceData mechanism to evalGlobalLight 2018-01-16 15:57:05 +01:00
Olivier Prat
705b475d0c Merged with master 2018-01-16 15:07:20 +01:00
Olivier Prat
3382a35c3f Fixed bug due to incorrect discard of fragments with no local lights 2018-01-16 12:13:45 +01:00
Olivier Prat
6686b328c7 Fixed error in Specular shader which gave low key specular highlights 2018-01-16 10:47:46 +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
Brad Davis
30bd8977b7 Remove android specific start address 2018-01-15 15:16:37 -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
f1253e3c6c fix crash on last frame = first frame, make last frame inclusive 2018-01-15 15:01:17 -08:00
Brad Davis
aeb7ca17a5 Don't sync textures with unsupported formats to the GPU 2018-01-15 13:43:49 -08:00
Brad Davis
17e9c3d00c Don't try to set invalid uniforms 2018-01-15 13:43:19 -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
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
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Dante Ruiz
c76fdd1f5f adding scale 2018-01-15 10:43:26 -08:00
Zach Fox
f7ed8c10fa Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-15 10:13:07 -08:00
Seth Alves
3e7d303661 export atp GetMappingRequest to js 2018-01-15 09:56:46 -08:00
Brad Davis
db30e9c45f Fixing PR builds 2018-01-15 09:47:31 -08:00
Olivier Prat
32445a5660 Updated pipelines 2018-01-15 18:18:13 +01:00
Bradley Austin Davis
537db9acb3 Fixing OSX build 2018-01-15 09:07:20 -08:00
Olivier Prat
54eab1c878 First working local lights on transparent objects 2018-01-15 17:49:55 +01:00
Olivier Prat
a3e50689cb Modified light outline shader to use some factorized code 2018-01-15 12:18:22 +01:00
Olivier Prat
6af6b5fe41 evalLocalLighting function created in LightLocal.slh 2018-01-15 12:02:29 +01:00
Olivier Prat
ca776fb9b4 Added LightLocal.slh to centralize shading with local lights 2018-01-15 11:36:52 +01:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
55bfdc105b Switch android to GLAD 2018-01-14 10:22:18 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
58d4d193f7 Add command line disabling of QML and KTX cache 2018-01-13 12:22:00 -08:00
Brad Davis
24b83aa0f1 Merge remote-tracking branch 'sam/android-gles' into windows_gles 2018-01-13 11:36:31 -08:00
Brad Davis
3d69ceea71 Re-enable HUD compositing 2018-01-13 11:34:56 -08:00
Brad Davis
8c528be481 Allow compile time disabling of QML surface rendering 2018-01-13 11:34:00 -08:00
Brad Davis
6d45238bbd Allow disabling of KTX cache 2018-01-13 11:32:47 -08:00
Brad Davis
6313e3ea69 Allow building on Android with GLAD disabled 2018-01-13 11:31:50 -08:00
Sam Gateau
d6e771f01d Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid 2018-01-13 10:02:53 -08:00
Sam Gateau
57f1ba2412 Merging with master to be able connect to dev domains and it works. fixing shaders for gles compile errors and disabling material textures by default 2018-01-13 02:00:34 -08:00
Brad Davis
c685cc0e6f Fix stencil buffer background issue 2018-01-13 01:31:42 -08:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094 fixing the stencil not clearing correctly and shaders not compiled correctly in main thread 2018-01-13 01:00:10 -08:00
Sam Gateau
9fc50628e1 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:43:57 -08:00
Brad Davis
51a0131414 Fix linkage 2018-01-12 19:37:28 -08:00
Sam Gateau
628731ed19 Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles 2018-01-12 19:37:07 -08:00
Sam Gateau
44920dd828 Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes 2018-01-12 19:33:47 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -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
Dante Ruiz
283b9a8003 fix softEntity edge cases 2018-01-12 15:31:54 -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
David Rowe
1fa31d3c10 Remove old ToolWindow code 2018-01-13 10:27:43 +13:00
NissimHadar
e580a19677
Merge pull request #12147 from NissimHadar/noBackgroundModeFix 
Dealing with legacy domains.
 2018-01-12 12:42:11 -08:00