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

40137 commits

Author SHA1 Message Date
Brad Davis
166a419e90 Oculus update 2016-03-08 11:20:53 -08:00
Brad Hefta-Gaub
19ad4314ca Merge pull request from jherico/bookmarks 
Don't trigger modal dialog from menu handler
 2016-03-08 10:29:29 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request 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 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
James B. Pollack
9db528d7a3 Merge pull request 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 from imgntn/noavatarheadbody 
Remove avatar head and body from package model selections
 2016-03-08 09:00:59 -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
268a328fd4 Merge pull request from imgntn/pingponggunfix 
Adjust ping pong gun dimensions
 2016-03-07 20:14:28 -08:00
Chris Collins
5078f486b1 Merge pull request 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
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Andrew Meadows
dfe0575237 Merge pull request from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
Andrew Meadows
592d29fc7c Merge pull request from sethalves/fix-hulls-for-non-default-registration 
fix collisions with non-default registration
 2016-03-07 15:46:13 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -08:00
Philip Rosedale
7c765f3d5a Merge pull request 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
James B. Pollack
2d554f4b40 Merge pull request from ericrius1/playaFireworks 
Playa fireworks and associated tutorial
 2016-03-07 14:32:06 -08:00
ericrius1
ca747bb4e9 fixed dates 2016-03-07 14:29:17 -08:00
James B. Pollack
567039ef82 Update createPingPongGun.js 2016-03-07 14:28:16 -08:00
ericrius1
caca60c039 added headers to tutorial code 2016-03-07 14:09:21 -08:00
Seth Alves
320645de8d Merge pull request from imgntn/masterlightsfix 
Increase brightness of lights in demo
 2016-03-07 14:04:20 -08:00
Seth Alves
e8001d0346 Merge pull request from imgntn/flashlightbrightfix 
Make the flashlight brighter
 2016-03-07 14:04:02 -08:00
Seth Alves
34a76f1962 Merge pull request from ctrlaltdavid/fix-treeview 
Fix Running Script's tree view
 2016-03-07 14:03:50 -08:00
Seth Alves
cc16fca7a6 Merge pull request from birarda/ac-logs 
disable AC child file logging by default
 2016-03-07 14:03:23 -08:00
David Rowe
e6b81b31d8 Fix Running Script's tree view 2016-03-08 09:59:00 +13:00
James B. Pollack
9cd0762040 brighter 2016-03-07 12:26:21 -08:00
James B. Pollack
247ebb380b Merge pull request from hyperlogic/tony/distance-holding-fixes 
HandControllerGrab: fixes for distance holding
 2016-03-07 12:12:58 -08:00
James B. Pollack
15feb7a414 add falloffRadius to sconce lights in toybox 2016-03-07 12:07:22 -08:00
Chris Collins
7850ca3576 Merge pull request from hyperlogic/tony/eye-look-at-fixes 
Avatar eye look at fixes for HMD and desktop
 2016-03-07 11:50:16 -08:00
Seth Alves
40c953e0b9 fix model hulls 2016-03-07 11:40:18 -08:00
James B. Pollack
6d82dcb533 not the targets 2016-03-07 11:38:05 -08:00
Seth Alves
8b8604f9b0 move offset handling for models back to how it was before this PR 2016-03-07 11:32:25 -08:00
Anthony Thibault
2cbb41fd38 MyAvatar: bug fix for forward/backward lean detection 2016-03-07 10:11:22 -08:00
Anthony J. Thibault
aefeff2493 MyAvatar: Use a box instead of a sphere for horizontal re-centering 2016-03-07 09:50:38 -08:00
Anthony Thibault
b096e062e6 Merge pull request from ZappoMan/smallFix 
fix a couple bugs in this script
 2016-03-07 09:13:58 -08:00
Brad Hefta-Gaub
3fe89c0cdf Merge pull request from samcake/orange 
Fix the text rendering Bug
 2016-03-07 09:11:55 -08:00
Chris Collins
86f60671a7 Merge pull request from ZappoMan/hackathonMusicPlayer 
Music Player
 2016-03-07 09:01:58 -08:00
Chris Collins
d03fb797e7 Merge pull request from sethalves/fix-polyvox-rendering-again 
fix polyvox fragment shader
 2016-03-07 08:59:22 -08:00
James B. Pollack
830a61b874 update 2016-03-06 15:04:47 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
b6a478d970 Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-06 14:35:38 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00