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

40161 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
afbec33f36 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-08 16:12:21 -08:00
Seth Alves
80e4864324 Merge pull request #7283 from ZappoMan/fixSceneNotStable 
Fix scene not stable bug
 2016-03-08 16:07:24 -08:00
Brad Hefta-Gaub
8d4ef28411 CR feedback 2016-03-08 15:29:04 -08:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
Chris Collins
fd53d4de2b Merge pull request #7280 from zzmp/fix/fbx-multiple-mats 
Fix inlined fbx content for identically named texs with different paths
 2016-03-08 14:41:23 -08:00
Brad Hefta-Gaub
d879300413 Merge pull request #7277 from sethalves/edit-vs-mouse-grab 
Edit vs mouse grab
 2016-03-08 14:19:40 -08:00
Chris Collins
48af6b0476 Merge pull request #7275 from jherico/oculus_init 
Oculus updates for upcoming runtime changes
 2016-03-08 14:00:06 -08:00
Clément Brisset
fc98408922 Merge pull request #7279 from jherico/osx_gl_fix 
Bypass baffling OSX GL error
 2016-03-08 13:08:49 -08:00
Bradley Austin Davis
7d046c30a9 Bypass baffling OSX GL error 2016-03-08 12:23:29 -08:00
Zach Pomerantz
77958e2a48 Change FBXReader impl to recognize inlined tex 2016-03-08 12:23:23 -08:00
Seth Alves
40bc66c154 Merge pull request #7272 from imgntn/shapetype 
"Collision Shape Type" in edit.js instead of "Shape Type"
 2016-03-08 11:34:42 -08:00
samcake
5299b06e83 Reintroducing the use of the DiffuseFactor so both Bender and MAya looks closer to Hifi 2016-03-08 11:26:16 -08:00
Brad Davis
166a419e90 Oculus update 2016-03-08 11:20:53 -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
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
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
samcake
3ed5a2afe2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-07 19:07:13 -08:00
samcake
3a810152fb Trying to consolidate the FBX reader for Blender /maya 2016-03-07 18:30:22 -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
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 #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
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
James B. Pollack
2d554f4b40 Merge pull request #7249 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 #7263 from imgntn/masterlightsfix 
Increase brightness of lights in demo
 2016-03-07 14:04:20 -08:00
Seth Alves
e8001d0346 Merge pull request #7264 from imgntn/flashlightbrightfix 
Make the flashlight brighter
 2016-03-07 14:04:02 -08:00