Howard Stearns
63db6d0f72
A script to test rendering load by creating a rectangular matrix of the specified objects, with no physical or entity changes after creation, either in front of you or overhead.
2016-01-16 11:17:13 -08:00
Brad Hefta-Gaub
29b9592c8c
Merge pull request #6838 from ctrlaltdavid/20763
...
Fix reading model's "textures" property
2016-01-15 17:02:14 -08:00
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
Brad Davis
bb02a1eda2
Fix JS web window crash caused by race condition
2016-01-15 14:45:40 -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
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
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
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
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
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
Anthony J. Thibault
75b3523c33
Simplify grab animation logic
...
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js
Deleted old hydra/squeezeHands.js to avoid confusion.
Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
samcake
1a2764a38c
Merge pull request #6829 from Atlante45/render-shape-update
...
Fix render engine memory leak
2016-01-13 17:18:28 -08:00
U-GAPOS\andrew
0126684a96
collisionMask shouldn't override ignoreForCollisions
2016-01-13 16:58:34 -08:00
U-GAPOS\andrew
3aa1837e07
disable collisions between arrow and bow
...
(the bow is currently kinematic while held)
2016-01-13 16:57:51 -08:00
Philip Rosedale
ac61a33b63
Merge pull request #6825 from ericrius1/handGrabPositioningTweaks
...
Adjusted relative hand grab data for gun, ping ponger, and bow to to …
2016-01-13 16:08:09 -08:00
ericrius1
9a51a011c5
further tweaks
2016-01-13 15:51:22 -08:00
Brad Davis
b6272b7824
Migrate tool window to overlay/QML
2016-01-13 15:40:37 -08:00
ericrius1
5a9d533e70
ping pong and gun tweaks
2016-01-13 15:30:12 -08:00
Atlante45
ef5af45acd
Replce GPUObjectWrapper by public const member
2016-01-13 15:01:54 -08:00
ericrius1
cda6d6e4ea
bow tweaks
2016-01-13 14:44:42 -08:00
ericrius1
f02cc8fd46
Tweaked bow position
2016-01-13 14:43:52 -08:00
Atlante45
504939f193
Use a unique_ptr to track gpu objects
2016-01-13 14:07:48 -08:00
Atlante45
8da027c56f
Encapsulate GPUObject in a safer way
2016-01-13 13:51:53 -08:00
howard-stearns
830dcb582a
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing
2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95
Split physics perf timing into three parts: updateStates, stepSimulation,
...
and harvestChanges.
2016-01-13 13:31:37 -08:00
samcake
e41c49b19f
Merge pull request #6818 from Atlante45/render-shape
...
Move shape rendering code in DeferredLightingEffect to GeometryCache
2016-01-13 12:27:27 -08:00
Atlante45
741c22c0ac
Move SimpleProgramKey to cpp
2016-01-13 11:47:43 -08:00
Atlante45
1789878be1
Remove dead code
2016-01-13 11:47:43 -08:00
Atlante45
c30569cd55
Naming coding standard
2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43
Remove unused headers
2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261
Move primitive rendering out of DeferredLightingEffect
2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1
Fix doInBatch lambdas
2016-01-13 11:47:43 -08:00
