Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 05:40:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
vladest
5a452fa981 Merge branch 'master' into tablet_extended_sounds 2017-09-25 15:40:40 +02:00
Olivier Prat
443d6dfacb Added user definable taps in blur task 2017-09-25 14:24:40 +02:00
Olivier Prat
bcec3680b6 First draft 2017-09-25 11:51:23 +02:00
Olivier Prat
f31e9df21c Fixed incorrect pixel byte size computation in KTX 2017-09-25 10:31:49 +02:00
Olivier Prat
23c77d528a Merged with master with new abotProcessing in image 2017-09-25 09:48:24 +02:00
utkarshgautamnyu
6c40d39f81 refactored jsbaker.cpp 2017-09-24 20:53:09 -07:00
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -07:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
543bc5a71b HazeMode calls Haze::setIsHazeActive. 2017-09-24 18:25:20 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Nissim Hadar
678b4e35b1 Before replacing "Haze Active" checkbox with "Haze Mode" combo. 2017-09-24 14:06:00 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
David Rowe
bbc6e5d1b5 Fix bounding box isn't cleared when exit tool with header or grip click 2017-09-24 17:06:42 +13:00
David Rowe
4e0efdaa1a Automatically add entities in bounding box to currently selected groups 2017-09-24 16:55:15 +13:00
David Rowe
2afc84cf0b Display bounding box of currently selected groups 2017-09-24 12:06:04 +13:00
Brad Hefta-Gaub
bafb59e691 Merge pull request #11436 from SamGondelman/missingModels 
Fix missing models
 2017-09-23 13:56:50 -07:00
utkarshgautamnyu
cda5e94b33 Added JavaScript Baking 2017-09-22 20:57:18 -07:00
David Rowe
8976befaeb Use emissive FBX model for highlighted Tools menu header 2017-09-23 14:20:53 +12:00
Nissim Hadar
c4419fede8 Bumped up the version number. 2017-09-22 19:07:05 -07:00
Nissim Hadar
c2eea7d40b Minor cleanup. 2017-09-22 18:37:21 -07:00
Nissim Hadar
736a6aa311 Haze checkbox in UI doesn't disable the UI. 2017-09-22 18:20:35 -07:00
David Rowe
64acc0d0a3 Press undo/redo and menu buttons when click them 2017-09-23 13:01:38 +12:00
samcake
59006411c6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
Sam Gateau
d68577be7e Merge pull request #11441 from SamGondelman/glowAlpha 
Fix alpha on Line3DOverlays with glow
 2017-09-22 17:17:23 -07:00
druiz17
b8ee60a394 fix scripting error 2017-09-22 17:13:48 -07:00
SamGondelman
86198606e0 add _modelJustLoaded and updateTransforForSkinnedMesh on creation 2017-09-22 17:12:44 -07:00
David Rowe
bc5cd7415b Use emissive FBX models for header bars 2017-09-23 11:56:42 +12:00
David Rowe
f53f8c14fc Update wrist tool icon 2017-09-23 11:34:57 +12:00
druiz17
2c7b8cdb4f fixing script issues 2017-09-22 16:26:41 -07:00
SamGondelman
0e3f1c5149 add setLaserLength, setLockEndUUID doesn't use defaultRenderStates 2017-09-22 16:11:24 -07:00
druiz17
ee9ac3e7f9 undo unnessary changes 2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44 Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer 2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1 hand controller pointer 2017-09-22 15:32:40 -07:00
Zach Fox
702a4e9ade More tweaking to overlay position 2017-09-22 15:32:38 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
Howard Stearns
8fdd405593 consistent comments 2017-09-22 15:10:30 -07:00
Howard Stearns
f25e22b463 entityInstanceNumber 2017-09-22 15:06:39 -07:00
Howard Stearns
7724fc204b working checkpoint 2017-09-22 14:19:54 -07:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
SamGondelman
bc477608ee fix alpha on glowLines 2017-09-22 13:22:08 -07:00
Ryan Huffman
883bdc6003 Merge pull request #11425 from Atlante45/feat/auto-bake 
Asset Browser auto-refresh
 2017-09-22 13:17:04 -07:00
vladest
5aab9bf5b0 Merge branch 'master' into fix_dde_visibility 2017-09-22 21:10:21 +02:00
vladest
4d530ef173 Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close 2017-09-22 21:08:34 +02:00
Zach Fox
e3f2e70bca No magic numbers 2017-09-22 11:43:56 -07:00
Zach Fox
430d1b22bb Update angular size and i behavior 2017-09-22 11:41:28 -07:00
samcake
8b3de41e51 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-22 11:39:25 -07:00
samcake
452a8f7175 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-22 11:31:33 -07:00
Sam Gateau
f7f14cb4e3 Merge pull request #11432 from samcake/blue-bis 
Fix overlay rendering to use cached Render Transform information
 2017-09-22 11:30:31 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00