Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 13:09:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58329 commits 76 branches 59 tags 1.2 GiB
Commit graph

58329 commits

This branch
This branch
All branches
Author SHA1 Message Date
mukulHF
780644fa38 Update TabletRunningScripts.qml 2017-08-07 11:37:27 -07:00
mukulHF
fadc19d8bb Update RunningScripts.qml 2017-08-07 11:36:37 -07:00
mukulHF
cf7b2ba547 Update LetterboxMessage.qml 2017-08-07 11:35:42 -07:00
mukulHF
3ca2bc0571 Update DesktopLetterboxMessage.qml 2017-08-07 11:35:27 -07:00
Zach Fox
36453644e0 Merge pull request #11130 from zfox23/contextOverlays_fixCrash1 
Fix crash in Context Overlays code
 2017-08-07 11:29:30 -07:00
Zach Fox
07a4beac73 Fix the crash 2017-08-07 10:28:36 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
mukulHF
e9f268ff26 Update LetterboxMessage.qml 2017-08-07 10:01:50 -07:00
mukulHF
4382f22622 Update DesktopLetterboxMessage.qml 2017-08-07 10:01:26 -07:00
Chris Collins
4acccb6ace Merge pull request #11118 from cain-kilgore/chat-char-limit 
WL 21493 - Update the Chat.js to indicate when a message is too long
 2017-08-07 09:52:57 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag 
Zip drag (needs review)
 2017-08-07 03:17:31 -07:00
Seth Alves
f898a05014 Merge pull request #11122 from ElderOrb/case6760 
fix for 6760: Create Mode turns to Portrait when Reopening tablet
 2017-08-06 19:02:47 -07:00
Seth Alves
8798e47f99 Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes 
Crash fixes for avatars without Hips, and web overlays
 2017-08-06 18:48:07 -07:00
Brad Davis
959499eab8 Merge pull request #11128 from sethalves/fix-some-crash-on-exit 
Fix some crash on exit
 2017-08-06 17:27:22 -07:00
Seth Alves
931369ae00 Merge pull request #11127 from vladest/fix_mouse_release_lost 
fixed typo leads to lost touch or mouse release events
 2017-08-06 13:17:50 -07:00
Seth Alves
83a30e2f35 missed some statics 2017-08-06 13:12:27 -07:00
Seth Alves
6f9460162d avoid calling a pure virtual function from GLBackend dtor 2017-08-06 12:47:45 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
vladest
134bad9534 fixed typo leads to lost touch or mouse release events 2017-08-06 19:09:40 +02:00
vladest
3a013bf86e Remove snap to item. Add caching for scrolling speedup 2017-08-05 13:28:08 +02:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
beholder
06c9378b03 fix for 6760: Create Mode turns to Portrait when Reopening tablet 2017-08-05 04:07:04 +03:00
Brad Hefta-Gaub
95c28b2fa1 Merge pull request #11119 from highfidelity/anshuman64-entervr 
Capitalize "ENTER VR"
 2017-08-04 18:03:20 -07:00
mukulHF
1ce1e29368 Update DesktopLetterboxMessage.qml 2017-08-04 17:44:43 -07:00
mukulHF
7aad4af533 Update LetterboxMessage.qml 2017-08-04 17:44:16 -07:00
anshuman64
22afb25d44 Capitalize "ENTER VR" 2017-08-04 17:19:26 -07:00
Elisa Lupin-Jimenez
a246c59277 changed debug print for unsupported entity files 2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez
af432087e3 small revisions to bracketing/variable name 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
8c9ce82986 Fixed Mac and Ubuntu platform build issue (hopefully) 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
c2cb7573c5 Removed commented out blocks code 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
692aa4c4b9 Clara download working again, still can drag in Blocks zip 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
9d2be28a8a troubleshooting Blocks injection 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6 Removed extraneous print statements 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c3d943ff72 Drag zip folder works 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
4570814145 Added Blocks to marketplace window 2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez
a7dd6a5a41 Changed marketplaces message to be more discoverable 2017-08-04 16:56:30 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
Cain Kilgore
f79a8b3cb5 Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit 2017-08-04 23:34:44 +01:00
Brad Hefta-Gaub
cce0ba9596 Merge pull request #11043 from jherico/threaded_render_checkpoint 
Updates from Threaded Rendering project
 2017-08-04 15:28:00 -07:00
Brad Davis
0e508432c4 PR comments 2017-08-04 15:27:33 -07:00
Cain Kilgore
c8ebc299f5 Limited Max Length of the Chat Box to 256 - as this exceeds Message. max. 2017-08-04 23:25:26 +01:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb Merge pull request #11110 from Armads/WL21423 
Camera mode on startup is determined by user settings and HMD status
 2017-08-04 13:16:34 -07:00
Brad Hefta-Gaub
8f98d0b7c8 Merge pull request #11114 from ElderOrb/case6677 
6677: Change "Desktop" App to Say "Exit VR"
 2017-08-04 13:09:47 -07:00
beholder
d05e1677c3 6677: Change "Desktop" App to Say "Exit VR" 2017-08-04 23:04:15 +03:00
Brad Hefta-Gaub
0f85769098 Merge pull request #11116 from vladest/fix_menu_caps 
Cleanup top menu on menu re instantiation
 2017-08-04 12:37:14 -07:00