Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 14:41:30 +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
druiz17
92f3dfe2ab move the stylus back a bit 2017-09-20 14:23:43 -07:00
Elisa Lupin-Jimenez
92550b749c removed extraneous printouts 2017-09-20 14:23:09 -07:00
Elisa Lupin-Jimenez
02fa7395ac Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-20 14:21:19 -07:00
Elisa Lupin-Jimenez
b8fdb66745 added support for fbx formats 2017-09-20 14:20: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
Stephen Birarda
e75ece8fc4 Merge pull request #11415 from birarda/feat/auto-bake 
change include for QUrlQuery to be consistent
 2017-09-20 12:56:52 -07:00
Stephen Birarda
29a9331f14 change include for QUrlQuery to be consistent 2017-09-20 12:55:50 -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
vladest
6e3cfe81ab Fix crash on second bookmark saving 2017-09-20 21:01:16 +02: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
vladest
c17ca955db Listener disconnects in C++ now 2017-09-20 20:03:53 +02:00
Cain Kilgore
4d904bd5ce Changed naming of avatarGrav 2017-09-20 18:43:16 +01:00
vladest
257ce5b331 Merge branch 'master' into modal_dialogs_async 2017-09-20 19:23:28 +02:00
Cain Kilgore
506226ead0 Merge branch 'master' into 21542 2017-09-20 18:22:34 +01:00
samcake
5b5464fe63 Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-20 09:39:16 -07:00
samcake
7e4956342c Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game_render_interface 2017-09-20 09:38:19 -07:00
Sam Gateau
9a441f5768 Merge pull request #11409 from samcake/blue-bis 
Moving the render transform evaluation in game loop for Models
 2017-09-20 09:37:41 -07:00
Anthony J. Thibault
a8a5138c18 remove USE_N_SCALE preprocessor check 2017-09-20 09:23:13 -07:00
Daniela
8144841258 Add Edit.js Entities spawn up according to the orientation of the avatar. 2017-09-20 09:21:16 -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
druiz17
e78d8bc132 tablet on wiki planet 2017-09-20 09:11:06 -07:00
vladest
3376786288 Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard 2017-09-20 17:02:54 +02:00
vladest
56e6c8674a Merge branch 'master' into webbrowser_updates 2017-09-20 14:38:09 +02:00
David Rowe
80f56e48ca Fix Record app's toolbar button not highlighting when app dialog open 2017-09-20 16:50:19 +12:00
humbletim
708698f079 potential fix for the doppleganger "scrunching into a ball" issue 2017-09-19 23:21:46 -04: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
samcake
fd8868f609 Moving the render transform evaualtion in game loop for Models 2017-09-19 17:30:20 -07:00
druiz17
9c66a25d83 fixing and cleanup tablet inputs 2017-09-19 17:03:53 -07:00
David Rowe
41647305ed Rename selection manager object to avoid name clash with new API object 2017-09-20 11:11:18 +12: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
Stephen Birarda
fa839b8ee3 Merge pull request #11406 from birarda/feat/auto-bake 
add memory include for unique_ptr in BakeAssetTask
 2017-09-19 15:36:10 -07:00
Stephen Birarda
d4e35edc84 add memory for unique_ptr in BakeAssetTask 2017-09-19 15:08:44 -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
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
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
Ryan Huffman
20759b0c97 Merge pull request #11404 from birarda/feat/auto-bake 
add abort on shutdown to Baker/FBXBaker/TextureBaker
 2017-09-19 14:20:56 -07:00
Stephen Birarda
a8ac015bc4 address code review comments 2017-09-19 13:56:42 -07:00
Clément Brisset
a6376fcc12 Merge pull request #11402 from huffman/fix/remove-fbxcpp 
Remove FBX.cpp and other cleanup
 2017-09-19 13:54:50 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
vladest
50ee41e095 Fix file loading dialogs 2017-09-19 22:42:15 +02:00
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00