Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:13:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59099 commits 71 branches 56 tags 1.2 GiB
Commit graph

59099 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
03e278c5ae Merge pull request #11416 from druiz17/stylus-pos 
Pull back the stylus position in hand.
 2017-09-20 17:40:22 -07:00
druiz17
2c55419c60 change tablet forward offset 2017-09-20 16:49:45 -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
Seth Alves
90c97319ea Merge pull request #11408 from druiz17/fix-tablet-input 
fixing/improving and cleanup tablet inputs
 2017-09-20 16:36:07 -07:00
Thijs Wenker
4d99430ef1 Merge pull request #11419 from highfidelity/feat/optional_makeUserConnection_debug 
Optionalize the debug spam of makeUserConnection.js
 2017-09-20 15:49:17 -07:00
Thijs Wenker
7ea1968b33 Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=) 2017-09-20 14:59:15 -07:00
Thijs Wenker
60a566768a removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script 2017-09-20 14:39:13 -07:00
druiz17
92f3dfe2ab move the stylus back a bit 2017-09-20 14:23:43 -07:00
druiz17
c20c5ee2b5 fixed tablet grabbing issue 2017-09-20 14:10:10 -07:00
vladest
c48aba423a Rename check box 2017-09-20 22:48:39 +02:00
vladest
7c049d2764 Merge branch 'master' into audio_devices_split 2017-09-20 22:38:42 +02:00
anshuman64
4a95023a2d Merge pull request #11399 from cain-kilgore/21540 
WL 21540 - Make Rotation using Vive Controller Work
 2017-09-20 13:25:33 -07:00
Seth Alves
a4082dc7e9 Merge pull request #11411 from ctrlaltdavid/21546 
Fix Record app's toolbar button not highlighting when app dialog open
 2017-09-20 12:31:33 -07:00
Seth Alves
1ca42cc632 Merge pull request #11414 from druiz17/fix-tablet-position 
Fix tablet up orientation for wiki planet
 2017-09-20 12:30:00 -07:00
druiz17
2ce6dcf89d fixing spelling error 2017-09-20 11:45:42 -07:00
druiz17
5d87036f32 make changes requests and slight fixes 2017-09-20 11:41:31 -07:00
druiz17
e78d8bc132 tablet on wiki planet 2017-09-20 09:11:06 -07:00
David Rowe
80f56e48ca Fix Record app's toolbar button not highlighting when app dialog open 2017-09-20 16:50:19 +12:00
Clément Brisset
0f3834ded4 Merge pull request #11398 from birarda/bug/localhost-admin 
flag node as local by IP from UDP header, not IP from packet data
 2017-09-19 17:43:21 -07:00
druiz17
9c66a25d83 fixing and cleanup tablet inputs 2017-09-19 17:03:53 -07:00
Chris Collins
3209a49a7d Merge pull request #11407 from Atlante45/new-master 
Update master from stable
 2017-09-19 15:55:41 -07:00
Atlante45
23fa2707dd Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-09-19 15:45:15 -07:00
Andrew Meadows
3b3a8c8f5e Merge pull request #11403 from Atlante45/fix/openssl-build-instructions 
Fix OpenSSL build instructions
 2017-09-19 14:29:48 -07:00
vladest
7a36894f76 Make sure audio device not gets unchecked 2017-09-19 23:25:41 +02:00
Chris Collins
0a213e24c4 Merge pull request #11389 from highfidelity/RC-55 
Beta Release 55 - Includes up to Developer Release 7127
 2017-09-19 14:23:58 -07:00
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
Atlante45
1f485ac8f8 Fix OpenSSL build instructions 2017-09-19 12:07:24 -07: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
Seth Alves
a889ca1b01 Merge pull request #11396 from hyperlogic/bug-fix/shape-rendering 
Shapes now render at the correct size.
 2017-09-18 17:41:31 -07:00
Stephen Birarda
57a92adc73 flag node as local by sending address, not by local from packet 2017-09-18 15:39:51 -07:00
Cain Kilgore
320c6e6769 Merge branch 'master' of https://github.com/highfidelity/hifi into 21540 2017-09-18 23:39:15 +01:00
Cain Kilgore
dbe7cc5d1a 21540 - Make Rotation using Vive Controller Work 2017-09-18 23:38:38 +01:00
Anthony J. Thibault
73ad9051a4 Shapes now render at the correct size. 2017-09-18 15:27:58 -07:00
Brad Hefta-Gaub
5e5b77fbaa Merge pull request #11394 from hyperlogic/bug-fix/oculus-ipd-lighting 
Oculus: fix for lighting changes as avatar scale changes
 2017-09-18 15:15:10 -07:00
anshuman64
2397e5aedb Merge pull request #11391 from druiz17/spawn-tablet 
(TabletUX improvement) changing tablet spawn position
 2017-09-18 14:56:02 -07:00
Anthony J. Thibault
f314ba38df Oculus: fix for lighting changes as avatar scale changes 
The code was incorrectly NOT using the near and far clip distances when computing
the culling projection matrix. This projection matrix is used by the lighting system
to for deferred lighting, if it does not match actual projection used for
rendering into the g-buffer, the lighting will be incorrect.
 2017-09-18 14:38:03 -07:00
druiz17
9df3b6c211 change tablet spawn position 2017-09-18 13:29:05 -07: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
Seth Alves
79d97dcc89 Merge pull request #11234 from hyperlogic/feature/ant-man 
IPD and Sensor Scaling Support
 2017-09-18 12:58:28 -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
samcake
93d6c3a1aa Adding more comments for future fixmes 2017-09-18 10:58:45 -07:00
samcake
0e83065a6d One more: 2017-09-18 10:58:36 -07:00
samcake
fd440aeeaa addressing review comments 2017-09-18 10:57:56 -07:00
Sam Gateau
f82a507d09 Cleanup 2017-09-18 10:57:49 -07:00
samcake
a8bf4efc8b Brining the changes just to fix the tablet issue 2017-09-18 10:57:40 -07:00
Anthony J. Thibault
5187ac4761 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-18 10:57:04 -07: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