Andrew Meadows
084ba8abc0
Merge pull request #5874 from howard-stearns/AndrewMeadows-ik-repairs-003
...
cleanup IK implementation plusplus
2015-09-22 14:51:41 -07:00
ericrius1
5546a04f4d
Added flashlight to master script
2015-09-22 13:48:10 -07:00
Seth Alves
e7999fa7f5
Merge pull request #5876 from ZappoMan/fixWarning
...
remove dead code and fix warning
2015-09-22 13:33:17 -07:00
ericrius1
135b34d82a
Merge branch 'master' into toybox
2015-09-22 13:32:08 -07:00
ericrius1
a28cf5ce8b
updated grab script
2015-09-22 13:29:16 -07:00
ericrius1
a0bf7b6529
doll animation fixes
2015-09-22 13:20:17 -07:00
ericrius1
6298dcb2fc
attempt fix for doll animation
2015-09-22 13:03:44 -07:00
Eric Levin
00e0523872
Merge pull request #5851 from imgntn/flashlight_updates_1
...
Flashlight updates
2015-09-22 13:01:26 -07:00
ericrius1
d273852bf9
New wand script
2015-09-22 12:56:01 -07:00
James Pollack
561b4ca8e1
Remove update loop refs, remove unload method
2015-09-22 12:52:24 -07:00
ericrius1
a266e8d65a
updated reset script to use new wand script
2015-09-22 12:49:45 -07:00
James Pollack
e5c42c76a2
Remove update loop refs
2015-09-22 12:41:00 -07:00
ericrius1
2557b32e1a
Updated switch model to be fbx
2015-09-22 12:40:09 -07:00
James Pollack
0ad238a508
Enlarge flashlight
2015-09-22 12:39:48 -07:00
Brad Hefta-Gaub
5bb908f081
remove dead code and fix warning
2015-09-22 12:34:47 -07:00
David Rowe
fed5e8e573
Don't run Script Editor scripts from the cache
2015-09-22 11:35:34 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
Eric Levin
37efb80945
Update BUILD_WIN.md
2015-09-22 10:19:01 -07:00
Philip Rosedale
c09ac51d75
Merge pull request #5871 from ctrlaltdavid/20688
...
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
2015-09-22 10:17:28 -07:00
Howard Stearns
7e52d38870
Don't include the root rot, because it seems that this is already accounted for in the head params.
...
Restore the hmd conditional on setting head position. This had been removed when failing to pin it cause lean.
I believe that lean was being caused by coordinate system issues that are now addressed by the above and Andrew's big cleanup.
2015-09-22 10:12:59 -07:00
Howard Stearns
8f1dde69cc
Always keep targets, even when both position and rotation are unset. (Get from underpose.)
...
Filtering these was necessary before when the underpose coordinate was wrong, but now that we have that working, there shouldn't be any need to filter.
2015-09-22 10:10:29 -07:00
ericrius1
b704ebd934
modified dice starting position
2015-09-22 09:55:24 -07:00
ericrius1
98faf3d712
Added light switch sound
2015-09-22 09:53:22 -07:00
Thijs Wenker
f38bb77d0a
less calls to QHash
2015-09-22 18:48:46 +02:00
Howard Stearns
0ccf2346fa
Merge branch 'ik-repairs-003' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-ik-repairs-003
2015-09-22 09:45:22 -07:00
Thijs Wenker
90b89cbb45
Merge branch 'master' of https://github.com/worklist/hifi into 20655
2015-09-22 18:44:25 +02:00
ericrius1
703545bac3
Modified lightSwitch entity to use new incoming grab API
2015-09-22 09:34:54 -07:00
Brad Hefta-Gaub
0072b6d7d0
Merge pull request #5681 from samcake/orange
...
NetworkGeometry and FBXReader refactoring for splliting Material from Mesh
2015-09-22 09:27:11 -07:00
ericrius1
e984afa1dd
Merge branch 'master' into toybox
2015-09-22 08:56:39 -07:00
ericrius1
68bee8228b
abstracted toggle logic to work with mouse click as well
2015-09-22 08:53:46 -07:00
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621
Code tidying
2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098
Fix HMD 3rd person view
2015-09-21 21:08:13 -07:00
BOB LONG
a23a90bf5f
Code simplification
...
Simplify the code a bit as suggested:
1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation
Correct the js sample file header.
testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
2015-09-21 19:11:13 -07:00
samcake
91b9940fe9
Merging and a fix for the diffuse map floating around
2015-09-21 18:09:25 -07:00
Andrew Meadows
3869887610
splitting AnimNode implementation into two files
2015-09-21 17:53:59 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
James B. Pollack
bf22d5a942
dont delete wand at cleanup from createWand.js
2015-09-21 17:43:05 -07:00
James B. Pollack
f8d743aff0
Update to use new grab methods, only specifically request properties that we are actually using
2015-09-21 17:38:49 -07:00
James B. Pollack
92152b250a
Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2
2015-09-21 17:37:23 -07:00
Andrew Meadows
e6776ef5eb
split AnimIK::evaluate() into sub-functions
...
also IK targets now in model-frame instead of root-frame
2015-09-21 17:29:39 -07:00
Brad Davis
7b5cbbf758
Merge pull request #5868 from ctrlaltdavid/20687
...
Fix HMD fullscreen mirror view
2015-09-21 17:07:31 -07:00
James B. Pollack
81358b7f14
wand changes
2015-09-21 17:01:31 -07:00
samcake
21f53f1bbd
debugging the lighting issue on the craps table
2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
Brad Davis
483884196c
Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles
...
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 16:48:29 -07:00
James B. Pollack
2cb875e40d
Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2
2015-09-21 16:45:37 -07:00
James B. Pollack
cd6ad306ac
start transitioning to new grab methods
2015-09-21 16:45:23 -07:00
Brad Davis
8f3c2af55e
Merge pull request #5863 from ZappoMan/fixParticleEffect
...
fix a couple of properties
2015-09-21 16:43:12 -07:00
