Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 15:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59627 commits 25 branches 0 tags 1.1 GiB
Commit graph

22084 commits

Author SHA1 Message Date
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00
beholder
3677718e48 7926 Create Mode: the keyboard tray is not styled correctly 2017-09-27 21:33:18 +03:00
Sam Gateau
88097bb39f Merge pull request #11447 from AndrewMeadows/lod-auto-adjust 
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
 2017-09-27 10:51:46 -07:00
Sam Gateau
9317ad38aa Merge pull request #11462 from highfidelity/game-render-interface 
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
 2017-09-26 17:40:23 -07:00
anshuman64
ca4d5ef807 Merge pull request #11454 from ElderOrb/case7877 
7877 Unexpected Behavior when pressing Enter on Input Field
 2017-09-26 16:26:42 -07:00
SamGondelman
49512c95d7 possibly fix threading crashes, mirror and fade 2017-09-26 16:21:36 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency 
Fix long tablet lag on first load
 2017-09-26 16:18:31 -07:00
samcake
badb45c921 fixing the web surface now getting scaled when the table t is grabbed is fixed 2017-09-26 15:20:45 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Andrew Meadows
909e5e86b1 Merge pull request #11442 from vladest/fix_dde_visibility 
Fix dde visibility
 2017-09-26 14:19:47 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5 Merge pull request #11345 from SamGondelman/textAA 
Text3D Overlays and Entities fixes and no-AA
 2017-09-26 12:26:08 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Dante Ruiz
74f9e07f1a Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu 
Move Tablet becomes toolbar menu from General to Developer menu
 2017-09-26 11:26:42 -07:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks 
Laser Pointer fixes and updates
 2017-09-26 10:22:55 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
Andrew Meadows
cc8e618bc0 remove cruft 2017-09-25 15:52:14 -07:00
Andrew Meadows
a3ac20d961 minor cleanup 2017-09-25 15:10:14 -07:00
beholder
5502a639e2 7877 Unexpected Behavior when pressing Enter on Input Field 2017-09-26 01:07:47 +03:00
Andrew Meadows
37c501b131 LODManager uses renderTime instead of main loop fps 2017-09-25 13:17:21 -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
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
SamGondelman
0e3f1c5149 add setLaserLength, setLockEndUUID doesn't use defaultRenderStates 2017-09-22 16:11:24 -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
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -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
452a8f7175 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-22 11:31:33 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
samcake
b424505f65 FIxing the case of the Circle3D 2017-09-22 10:48:56 -07:00
samcake
219d63784b REmoving the extra variables in Linear3D and just use the _renderTRansform 2017-09-22 10:39:51 -07:00
Atlante45
8583be41ce Don't refresh if not connected to the Asset Server 2017-09-21 18:57:09 -07:00
samcake
2d369a4586 fixing the image3D updating its renderTransform from it s update() call 2017-09-21 16:20:13 -07:00
Atlante45
6cdbf0c44a Fix RunningScripts in tablet mode 2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991 Add Asset Server auto refresh 2017-09-21 14:41:59 -07:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
samcake
454e167d93 notifying a render transform / bound change when the dimension property change 2017-09-21 12:58:56 -07:00
samcake
7103864b37 Also rendering the line3D overlay with start and end captured in game loop 2017-09-21 12:23:53 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Zach Fox
81be62b6f7 Check if ContextOverlayInterface is enabled before highlighting 2017-09-21 09:34:15 -07:00
samcake
5dc4e89e4c Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-21 08:56:02 -07:00
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618 
6618 [Worklist] Add Input Field On Top of Keyboard
 2017-09-21 08:54:11 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
samcake
cdf66887ef Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-20 18:09:28 -07:00
samcake
d112ffd8d6 Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d 2017-09-20 18:06:49 -07:00
Sam Gateau
daf18156f9 Merge pull request #11418 from SamGondelman/laserLaser 
Don't let scripts control visibility of laser pointer overlays
 2017-09-20 17:54:00 -07:00
Dante Ruiz
4f328524b1 Merge pull request #11182 from vladest/audio_devices_split 
Audio devices split
 2017-09-20 16:43:30 -07:00
Anthony J. Thibault
5e93c13856 warning fix 2017-09-20 16:36:33 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Cain Kilgore
322b7fc060 Cleanup from Merge 2017-09-20 23:37:33 +01:00
Cain Kilgore
a4655b9c73 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-20 23:25:26 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
SamGondelman
f21c99257e don't let scripts control visibility of laser pointers 2017-09-20 14:35:29 -07:00
vladest
c48aba423a Rename check box 2017-09-20 22:48:39 +02:00
vladest
6e3cfe81ab Fix crash on second bookmark saving 2017-09-20 21:01:16 +02:00
Anthony J. Thibault
a8a5138c18 remove USE_N_SCALE preprocessor check 2017-09-20 09:23:13 -07:00
Anthony J. Thibault
0873b88347 code review feedback 2017-09-20 09:21:15 -07:00
Anthony J. Thibault
809e986738 Fixes for lasers on 2d HUD 2017-09-20 09:21:14 -07:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
vladest
7a36894f76 Make sure audio device not gets unchecked 2017-09-19 23:25:41 +02:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
vladest
6297448e90 Build fix 2017-09-19 19:49:19 +02:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
Cain Kilgore
dbe7cc5d1a 21540 - Make Rotation using Vive Controller Work 2017-09-18 23:38:38 +01:00
Elisa Lupin-Jimenez
a41aced032 Merge pull request #11390 from elisa-lj11/master 
Fixed blocks download issue with `noDownload=false` tag
 2017-09-18 13:23:47 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes. 
(cherry picked from commit a260aaaae8)
 2017-09-18 12:15:32 -07:00
Elisa Lupin-Jimenez
a45cc88e55 Fixed blocks download issue with noDownload=false tag 2017-09-18 11:41:30 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
a8d24d9161 Cleanup 2017-09-16 22:41:18 +02:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
04b99ef8a5 Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
 2017-09-16 11:08:59 -07:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
Sam Gateau
512e9432ed Merge pull request #11370 from samcake/blue-bis 
Fixing the web surface of the tablet
 2017-09-15 15:36:55 -07:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
samcake
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
d968bbad6c Merge pull request #11364 from sethalves/rework-scriptengine-lifetime 
Rework scriptengine lifetime
 2017-09-15 12:17:51 -07:00
samcake
c687932ca7 One more: 2017-09-15 11:44:35 -07:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
samcake
19cd537e65 addressing review comments 2017-09-15 11:10:25 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Cain Kilgore
67a5c75a0d Doesn't need to be here anymore 2017-09-15 06:08:22 +01:00
Cain Kilgore
0526d32802 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-15 06:05:43 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
Sam Gateau
30bf800963 Cleanup 2017-09-14 20:33:08 -07:00