Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-11 00:38:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60520 commits 25 branches 0 tags 1.1 GiB
Commit graph

18920 commits

Author SHA1 Message Date
Andrew Meadows
171151b92a use new form of MovingEntitiesOperator ctor 2017-09-29 11:34:32 -07:00
Brad Davis
a7d507e9fd Disable watchdog with environment variable 2017-09-29 10:44:04 -07:00
Seth Alves
e7705175a3 Merge pull request #11481 from ZappoMan/animatedOverlays 
support animation of model overlays
 2017-09-29 10:26:24 -07:00
ZappoMan
9c81bc5479 CR fixes 2017-09-29 09:52:30 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
samcake
3265fe62ad Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 09:09:27 -07:00
samcake
e637842f8a Separating some of the code sepecific to render in its own cpp 2017-09-28 17:45:50 -07:00
Zach Fox
4814f277c1 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 16:07:32 -07:00
ZappoMan
be7729b276 support animation of model overlays 2017-09-28 15:14:59 -07:00
samcake
c112a3baf1 Seting up of camera and avatar correctly in game loop, not in render loop 2017-09-28 15:09:49 -07:00
Ryan Huffman
ff019d6195 Fix extension detection when tracking asset uploads 2017-09-28 13:56:49 -07:00
Andrew Meadows
60fe9ec5e9 Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928 
fix interface crash in Debug build
 2017-09-28 12:41:12 -07:00
vladest
c3225c2c76 Make fix precisely for Linux 2017-09-28 21:38:03 +02:00
Zach Fox
b5dc6b791b Fix commerce setting handle 2017-09-28 10:42:45 -07:00
Zach Fox
b6ce294bb2 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 09:38:48 -07:00
Zach Fox
65a63ea8c3 Remove dead OS X code 2017-09-28 09:38:22 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
Ryan Huffman
97bf093cab Fix ambiguous conversion in AssetMappingScriptingInterface 2017-09-28 08:16:54 -07:00
vladest
0a9bebeefc Added workaround to enable menu bar under Linux 2017-09-28 15:34:56 +02:00
samcake
40ca98214b Moving all of the camera and avatar eval to game loop 2017-09-27 17:58:43 -07:00
samcake
29da0c663f Merge branch 'master' of https://github.com/highfidelity/hifi into flash 2017-09-27 16:21:55 -07:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash 
Fix mirror and fade threading crashes
 2017-09-27 16:17:04 -07:00
Atlante45
eb06c33187 Naming coding standard fix 2017-09-27 15:32:53 -07:00
samcake
3bd6e35e30 Fixing the broken on hud overlay's render transform 2017-09-27 15:19:21 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
Andrew Meadows
26ea7034d8 prevent zero scale for Line3DOverlay 2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475 prevent zero dimensions for Volume3DOverlay 2017-09-27 14:30:50 -07:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07: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
Ryan Huffman
88810d28c1 Add activity logging for uploading_asset 2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -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
Atlante45
acb0bf8d20 Asset Browser tweaks 2017-09-26 17:26:46 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -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
328dd9c108 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-26 16:12:27 -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
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
beholder
24a12a2f8f 7722 Add onHover Outline to Tablet "X" Button 2017-09-26 22:31:56 +03: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
samcake
669af73a96 Bringing as much as possible out from render to game 2017-09-26 10:47:24 -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
Sam Gateau
953614fe65 More stuff out of render to the gameloop 2017-09-25 23:43:32 -07:00
samcake
157b4f2e13 Moving some of the updates on the camera and the avatar out from render to game loop 2017-09-25 18:28:33 -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
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Andrew Meadows
a3ac20d961 minor cleanup 2017-09-25 15:10:14 -07:00
Andrew Meadows
37c501b131 LODManager uses renderTime instead of main loop fps 2017-09-25 13:17:21 -07:00
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -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
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
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
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
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
samcake
4ce774ab8e Merge branch 'blue-bis' of https://github.com/samcake/hifi into blue 2017-09-22 11:02:57 -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
16fb64afaa Merging with blue-bis 2017-09-21 18:01:04 -07:00
samcake
4a67e0421f minimise the changes compared to upstream 2017-09-21 17:33:50 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
samcake
2d369a4586 fixing the image3D updating its renderTransform from it s update() call 2017-09-21 16:20:13 -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
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
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
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
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
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +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
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
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02: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
samcake
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -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
samcake
c687932ca7 One more: 2017-09-15 11:44:35 -07:00
samcake
a49b4dc31f Merge back blue-bis in 2017-09-15 11:40:26 -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
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
Sam Gateau
30bf800963 Cleanup 2017-09-14 20:33:08 -07:00
samcake
ec7536db2c Brining the changes just to fix the tablet issue 2017-09-14 18:36:20 -07:00
samcake
bff578b283 Working version that fixes the web overlay / tablet 2017-09-14 17:07:50 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
vladest
2f86658308 Move Tablet becomes toolbar menu from General to Developer menu 2017-09-14 16:37:02 +02:00
Sam Gateau
a70f7dfc87 put updateCamera in its function 2017-09-13 22:05:20 -07:00
Sam Gateau
e4a5b7f250 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-13 19:28:56 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
David Kelly
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
Cain Kilgore
1c05311056 Some code cleanup 2017-09-13 16:48:18 +01:00
SamGondelman
a955381726 Merge remote-tracking branch 'upstream/master' into textAA 2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab working on text3d overlays and entities 2017-09-12 16:49:51 -07:00
samcake
216d74c112 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-12 14:36:12 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
David Kelly
61e8458d13 some cleanup 2017-09-12 08:08:41 -07:00
Sam Gateau
3669e66619 trying to update the transform at the right time in overlays 2017-09-12 00:02:54 -07:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
David Kelly
5c12403b7c first working pass at single file. Cleanup needed 2017-09-11 16:40:21 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
David Kelly
4acbc2bfba Just write the image file in the format we will use later 2017-09-11 13:03:21 -07:00
Howard Stearns
54deef8f32 Merge pull request #11329 from davidkelly/dk/walletSSLFix 
fix wallet for new openssl
 2017-09-11 10:07:12 -07:00
samcake
934364ec59 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-11 09:55:47 -07:00
Chris Collins
47a9337aa7 Merge pull request #11323 from jherico/mac_fixes 
Mac fixes
 2017-09-11 09:10:50 -07:00
Cain Kilgore
b69bd0ef49 Removed old Disconnect 2017-09-09 17:23:18 +01:00
Cain Kilgore
f6e22b0733 Changes 
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
 2017-09-09 17:21:42 +01:00
Cain Kilgore
0820eadc5b Fixed a thing 2017-09-08 23:52:04 +01:00
Cain Kilgore
387e474889 WIP 2017-09-08 23:48:09 +01:00
Cain Kilgore
f109a86b23 Fixed small crash bug on exit 2017-09-08 23:05:22 +01:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
David Kelly
c142215935 oops -- this is a windows-only thing (like so many other problems) 2017-09-08 12:52:12 -07:00