Anthony J. Thibault
2401e6cc4b
Merge branch 'master' into ajt/new-anim-system
2015-09-01 10:58:38 -07:00
Seth Alves
7b6d267c06
Merge pull request #5675 from AndrewMeadows/darmstadtium
...
remove PhysicsEntity class
2015-09-01 10:06:01 -07:00
Anthony J. Thibault
0d98ab3365
Normalize scale on AnimSkeleton bind pose.
2015-08-31 17:27:23 -07:00
Andrew Meadows
5a67865d74
Merge pull request #5679 from jherico/apu
...
Magnetic sticks and balls, rough draft
2015-08-31 13:17:29 -07:00
Andrew Meadows
de6afb4d74
Merge pull request #5660 from sethalves/polyvox
...
Polyvox improvements
2015-08-31 13:14:01 -07:00
Anthony J. Thibault
9786954585
Added support for onDone and onLoop triggers.
2015-08-31 12:13:05 -07:00
Anthony J. Thibault
77b857031b
Take timeScale into account during interps & setCurrentFrame()
2015-08-31 11:01:15 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Brad Davis
dc7d20ff86
Working on ui
2015-08-30 23:50:02 -07:00
Brad Davis
9d07bf1585
Magballs: Removing entity scripts, using onUpdate
2015-08-30 19:20:47 -07:00
Brad Davis
a574251173
Cleaning up and moving entity script
2015-08-29 23:06:23 -07:00
Brad Davis
cffb0be384
Removing edge finding calculations
2015-08-29 22:49:14 -07:00
Brad Davis
ebb530aaac
More magball work
2015-08-29 22:30:21 -07:00
Brad Davis
38b62108af
Magnetic sticks and balls
2015-08-28 23:35:43 -07:00
Anthony J. Thibault
9d983e0614
Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader.
...
Also updated avatar.json to test nested graphs under a SM.
2015-08-28 17:16:32 -07:00
James B. Pollack
08986dcb17
Merge pull request #5669 from ZappoMan/breakdanceToy
...
first cut at breakdance toy
2015-08-28 16:36:00 -07:00
Brad Davis
f353d34479
Merge pull request #5680 from highfidelity/revert-5677-bart
...
Revert "Add common vector constants to JS"
2015-08-28 16:27:31 -07:00
Brad Davis
08e4fe2dc2
Revert "Add common vector constants to JS"
2015-08-28 16:26:56 -07:00
Seth Alves
f6fbf4f324
fix whitespace
2015-08-28 14:08:30 -07:00
Brad Hefta-Gaub
1e2374da87
Merge pull request #5677 from jherico/bart
...
Add common vector constants to JS
2015-08-28 13:43:13 -07:00
Seth Alves
7614cababb
adjust whitespace
2015-08-28 13:21:34 -07:00
Brad Davis
2aa1976b5d
Add common vector constants to JS, add some missing quaternionin functionality
2015-08-28 13:05:39 -07:00
Seth Alves
752c787f0b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-28 12:50:31 -07:00
Seth Alves
540af4afcb
remove unneeded call to computeShapeInfoWorker
2015-08-28 12:47:04 -07:00
Seth Alves
0ca9b60be5
Merge pull request #5671 from birarda/ice-server-crash
...
don't read ice-server packets that are too small
2015-08-28 12:46:23 -07:00
Seth Alves
a5cd3ff046
release _threadRunning if decompressVolumeDataAsync exits early
2015-08-28 11:04:56 -07:00
Seth Alves
1ac5c19f44
if someone else changes a polyvox, we need to localy recompute the collision shape
2015-08-28 10:39:23 -07:00
Seth Alves
92b5fe3457
fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags
2015-08-28 10:31:28 -07:00
Seth Alves
0bcd6b8ec5
remove no-longer-used #define
2015-08-28 10:30:56 -07:00
Brad Davis
b7dd47efcb
Merge pull request #5674 from birarda/master
...
cleanup of some warnings
2015-08-27 23:34:43 -07:00
Ryan Huffman
4dadfb8ea6
Merge pull request #5668 from ctrlaltdavid/20648
...
Auto refresh entities list upon display of Entities tab
2015-08-27 21:50:11 -07:00
Anthony J. Thibault
21c6ba9bdf
updated avatar.json to match current gist.
2015-08-27 21:27:37 -07:00
Anthony J. Thibault
19e91bb392
Added basic interpolation support to AnimStateMachine
2015-08-27 21:26:31 -07:00
Anthony J. Thibault
3286a32afc
Initial version of AnimStateMachine.
...
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
2015-08-27 20:41:53 -07:00
Stephen Birarda
c5c73b7809
remove _ipd variable from OculusLegacyDisplayPlugin
2015-08-27 18:26:55 -07:00
Stephen Birarda
8ea20b5e5e
fix warning on string literal call to qFatal
2015-08-27 18:26:55 -07:00
Stephen Birarda
f7d32add0c
wrap OVR variables in ifdef for MAJOR_VERSION >= 6
2015-08-27 18:26:55 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892
remove PhysicsEntity class
2015-08-27 18:22:12 -07:00
Brad Hefta-Gaub
542b124146
first cut at breakdance toy
2015-08-27 16:12:33 -07:00
Stephen Birarda
b4e624a64d
don't read packets that are too small
2015-08-27 15:38:18 -07:00
Philip Rosedale
d0db56a4a6
Merge pull request #5667 from howard-stearns/rig-menu-toggle
...
Rig Menu Toggle and new animations
2015-08-27 13:52:12 -07:00
David Rowe
c9d799f5e0
Auto refresh entities list upon display of Entities tab
2015-08-27 13:32:00 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Leonardo Murillo
dd5d58a5e1
Merge pull request #5663 from birarda/master
...
don't request a cert from peer in HTTPSManager
2015-08-27 12:46:24 -07:00
Stephen Birarda
783bc4dafb
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-08-27 12:44:42 -07:00
Howard Stearns
96c74ebbd5
Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
...
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612
Merge pull request #5649 from larsnaesbye/master
...
Move i18n to own dir, update FA
2015-08-27 10:46:29 -07:00
Brad Hefta-Gaub
7b2f944f48
Merge pull request #5561 from ericrius1/particleExtensions
...
Extended Particle entity to allow for more varied effects
2015-08-27 10:45:03 -07:00
