Commit graph

37358 commits

Author SHA1 Message Date
Brad Hefta-Gaub
8ffd30f89a Merge pull request #6844 from jherico/web_crash
Fix JS web window crash caused by race condition
2016-01-15 16:44:51 -08:00
Andrew Meadows
84282d0114 final repairs after rebase 2016-01-15 15:28:26 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
Brad Davis
bb02a1eda2 Fix JS web window crash caused by race condition 2016-01-15 14:45:40 -08:00
Zach Pomerantz
5c1c1e3a3b Change LightStage setFrustum signature to near/farDepth 2016-01-15 12:57:31 -08:00
Zach Pomerantz
d6e5e2de81 Fix orientation of shadow frustum 2016-01-15 12:43:45 -08:00
Zach Pomerantz
986af50b71 Remove unneccessary const 2016-01-15 10:50:42 -08:00
Zach Pomerantz
b423bc38ba Remove magic numbers 2016-01-15 10:46:01 -08:00
Zach Pomerantz
e914f02445 Use near/far in LightStage setFrustum 2016-01-15 10:28:52 -08:00
Zach Pomerantz
710fb5df53 Fix shadowed orientation in LightStage 2016-01-15 10:18:29 -08:00
Philip Rosedale
210b3ba1ec Merge pull request #6819 from sethalves/grab-script-fixes
grab script fixes
2016-01-15 09:40:57 -08:00
Seth Alves
fcd2284dc8 Merge pull request #6843 from AndrewMeadows/sadness
fix bug causing grab to disappear objects
2016-01-15 09:27:02 -08:00
Andrew Meadows
b9352d3eaa prevent nan inside spring action 2016-01-15 08:44:52 -08:00
AlessandroSigna
41e6dd48e0 Overlay manager exposing findRayIntersection 2016-01-14 18:27:17 -08:00
AlessandroSigna
e4501e3a8f Added cart, cash, inspect and readme 2016-01-14 18:23:39 -08:00
EdgarPironti
40279c8fc5 Item, Review, Shop and Vendor scripts. 2016-01-14 18:20:40 -08:00
Zach Pomerantz
e2158e48a1 Declare Corners explicitly 2016-01-14 18:03:58 -08:00
Philip Rosedale
c5556b1c29 Merge pull request #6841 from ericrius1/diceOverlay
added dice icon back to dice.js script
2016-01-14 17:49:04 -08:00
ericrius1
d4491a9ec2 added dice icon back to dice.js script 2016-01-14 17:13:07 -08:00
Philip Rosedale
0ec754cf5f Merge pull request #6839 from hyperlogic/tony/squeeze-hands-part-deux
Updated animations for left hand grasp
2016-01-14 16:57:46 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window
Tool window in QML
2016-01-14 16:56:27 -08:00
Brad Davis
98df0d8fcc Merge pull request #6836 from ZappoMan/menuGroups
wire up audio show level meter menu
2016-01-14 19:27:47 -05:00
Anthony J. Thibault
90516d95f2 Updated animations for left hand grasp 2016-01-14 16:22:58 -08:00
Philip Rosedale
a8d13cb947 Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux
Simplify grab animation logic
2016-01-14 15:49:00 -08:00
Brad Davis
e76e13c05c Removing close button on tool window, fixing dragging 2016-01-14 14:20:31 -08:00
Zach Pomerantz
ec496f1907 Return copy of Light from LightStage 2016-01-14 14:06:32 -08:00
Zach Pomerantz
c704a8d8c5 Add RenderShadowTask 2016-01-14 13:53:11 -08:00
Brad Hefta-Gaub
0ad39feeb6 juggle developer menus a bit 2016-01-14 13:31:01 -08:00
Brad Hefta-Gaub
2177765b09 wire up audio show level meter menu 2016-01-14 13:12:16 -08:00
Anthony J. Thibault
51d678670d Updated grab animations for right hand 2016-01-14 12:57:30 -08:00
Zach Pomerantz
7744b89ba5 Prepare shadowMap pipeline to debug in color 2016-01-14 12:56:28 -08:00
Zach Pomerantz
b9b407fea0 Remove static shadowMap 2016-01-14 12:49:43 -08:00
Zach Pomerantz
0776ae7e72 Add LightStage for rendering lights 2016-01-14 12:49:42 -08:00
Zach Pomerantz
82f7ea515d Clean up task construction 2016-01-14 12:49:42 -08:00
Seth Alves
58668654d0 Merge pull request #6835 from AndrewMeadows/fix-grab
fix problem where distance grab stops on slow movement
2016-01-14 10:56:07 -08:00
Andrew Meadows
72928fdbd6 fix problem where grab stops on slow movement 2016-01-14 10:42:27 -08:00
Brad Davis
d924e042bc Merge pull request #6834 from ZappoMan/hmdFixes
fix issues with HMD lookout 2D, and cleanup
2016-01-14 12:42:23 -05:00
Howard Stearns
5c1eef6a65 Merge pull request #6830 from AndrewMeadows/fix-arrows
Fix for arrows that stop moving too early
2016-01-14 09:36:26 -08:00
Anthony J. Thibault
c267d672d2 Updated hand grab animations
Left hand is old squeeze hands poses
Right hand is new hydra grasp poses
2016-01-14 08:57:27 -08:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Andrew Meadows
82e261480f Merge pull request #6827 from howard-stearns/physics-timing
Physics timing
2016-01-14 08:39:29 -08:00
Zach Pomerantz
ed5c53f23c Add getCorners to ViewFrustum 2016-01-14 01:29:49 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master
Fix skybox not always rendering correctly
2016-01-13 21:00:48 -08:00
Philip Rosedale
30199106ec Choice of hand ray pick or head pick 2016-01-13 20:47:05 -08:00
Brad Hefta-Gaub
ec344f7f86 Merge pull request #6822 from jherico/local_script_stop
Fix inability to stop local scripts
2016-01-13 20:26:36 -08:00
David Rowe
a59cbd1aca Merge branch 'master' into 20763 2016-01-14 17:25:44 +13:00
Zach Pomerantz
1436b4f6b1 Guard against unspecified deferredDebugMode 2016-01-13 18:17:40 -08:00