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

40413 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
166a419e90 Oculus update 2016-03-08 11:20:53 -08:00
Anthony J. Thibault
e046ba64dd Properly marshal fakeMouseEvent data from script thread to main thread 2016-03-08 10:58:54 -08:00
Seth Alves
b780fad83f Merge pull request #7270 from birarda/local-socket-check 
add a secondary method for local socket check
 2016-03-08 10:48:08 -08:00
Seth Alves
04e36f925a use local message 2016-03-08 10:30:49 -08:00
Brad Hefta-Gaub
19ad4314ca Merge pull request #7276 from jherico/bookmarks 
Don't trigger modal dialog from menu handler
 2016-03-08 10:29:29 -08:00
Seth Alves
0b6f52f508 use local messaging to disable mouse-grab when edit.js is active 2016-03-08 10:27:34 -08:00
Zach Pomerantz
d1324b2e7a Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree 2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
samcake
19cc0c2282 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-08 10:15:00 -08:00
Stephen Birarda
909979bab9 fix SLOT connection for local address check 2016-03-08 09:11:38 -08:00
Stephen Birarda
73b7e787d3 change signature of errorTestingLocalSocket 2016-03-08 09:09:28 -08:00
James B. Pollack
9db528d7a3 Merge pull request #7273 from imgntn/nomarketplaceinfo 
DIsable Right Click Marketplace Info for now from edit.js
 2016-03-08 09:08:29 -08:00
Chris Collins
d9088543af Merge pull request #7274 from imgntn/noavatarheadbody 
Remove avatar head and body from package model selections
 2016-03-08 09:00:59 -08:00
ericrius1
451856ae67 fixed path 2016-03-08 08:14:57 -08:00
Brad Davis
f08f54fd22 Don't trigger modal dialog from menu handler 2016-03-07 21:48:07 -08:00
James B. Pollack
2e9ebfb178 remove avatar head and body from pacakage model selections 2016-03-07 21:03:11 -08:00
James B. Pollack
482964d8ad hide this for now 2016-03-07 20:37:14 -08:00
James B. Pollack
8381b1d2fd collision shape type 2016-03-07 20:21:14 -08:00
James B. Pollack
268a328fd4 Merge pull request #7268 from imgntn/pingponggunfix 
Adjust ping pong gun dimensions
 2016-03-07 20:14:28 -08:00
David Rowe
2aaf9ff0d0 Update message dialogs to use HiFi-Glyphs icons 2016-03-08 17:13:05 +13:00
James B. Pollack
249d88b619 add base to fishtank 2016-03-07 19:59:27 -08:00
samcake
3ed5a2afe2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-07 19:07:13 -08:00
Anthony J. Thibault
26b4c904f3 handControllerMouse.js: transform hand controllers into sensor frame 2016-03-07 18:42:52 -08:00
Anthony J. Thibault
3d71226f72 Crash fix for moving reticle via script. 
sendMessage is not thread-safe, use invokeMethod to call into application thread instead.
 2016-03-07 18:33:09 -08:00
samcake
3a810152fb Trying to consolidate the FBX reader for Blender /maya 2016-03-07 18:30:22 -08:00
David Rowe
e5188108a1 Fix width of delete bookmark drop-down 2016-03-08 15:21:15 +13:00
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
Stephen Birarda
20ab108d51 remove some debug for local socket check error 2016-03-07 18:01:57 -08:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -08:00
Chris Collins
5078f486b1 Merge pull request #7266 from sethalves/local-messages 
allow sending interface-local messsages
 2016-03-07 17:21:45 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
634f8fbc83 Fix texture leak 2016-03-07 17:14:43 -08:00
Brad Davis
f5acf49e47 Fix reticle transform when depth != 1 2016-03-07 17:14:42 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
David Rowe
2f91b29c06 Set default focus 2016-03-08 14:03:54 +13:00
David Rowe
09390ffffd Remove colon from dialog label 2016-03-08 14:00:49 +13:00
David Rowe
b71a512a6f Reorder OK and Cancel buttons 2016-03-08 13:58:20 +13:00
David Rowe
7f2938c53f Tidy message dialog code 2016-03-08 13:56:25 +13:00
David Rowe
b7fd5467ba Restyle query dialogs 2016-03-08 13:53:05 +13:00
David Rowe
d893b2e3b1 Handle no icon in modal dialogs 2016-03-08 13:52:24 +13:00
David Rowe
ba1e8db34a Add QML UI test dialogs for creating and deleting bookmarks 2016-03-08 13:51:13 +13:00
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
ericrius1
d4bc83f408 cleanup and bug fixes 2016-03-07 16:16:06 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
Andrew Meadows
592d29fc7c Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration 
fix collisions with non-default registration
 2016-03-07 15:46:13 -08:00
ericrius1
3dc39600cd stop pouring on release 2016-03-07 15:32:40 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -08:00
Philip Rosedale
7c765f3d5a Merge pull request #7258 from hyperlogic/tony/better-lean-detection 
MyAvatar: use a box instead of a sphere for horizontal re-centering
 2016-03-07 15:05:10 -08:00