Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Brad Davis
08e4fe2dc2
Revert "Add common vector constants to JS"
2015-08-28 16:26:56 -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
Brad Davis
2aa1976b5d
Add common vector constants to JS, add some missing quaternionin functionality
2015-08-28 13:05:39 -07:00
Andrew Meadows
614fad0811
remove warnings from linux build
2015-08-27 19:12:25 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -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
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Anthony J. Thibault
c1333e16ed
Merge branch 'master' into ajt/new-anim-system
2015-08-26 11:59:03 -07:00
Andrew Meadows
f857ccfe16
fix Vectors::MIN
2015-08-26 11:46:50 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
David Rowe
a98a867b06
Delete Interface.ini.lock before accessing to check crash option
2015-08-25 11:07:20 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Brad Hefta-Gaub
b726769f15
Merge pull request #5402 from highfidelity/plugins
...
New plugins architecture
2015-08-11 11:11:27 -07:00
Seth Alves
b25f6df7af
quiet compiler
2015-08-11 10:22:56 -07:00
Howard Stearns
295d655eec
Merge pull request #5545 from AndrewMeadows/chlorine
...
rotation constraints in preparation for inverse kinematics
2015-08-11 09:19:16 -07:00
Andrew Meadows
4655bd21dd
added some comments to clarify algorithm
2015-08-10 23:08:10 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
Andrew Meadows
f9a4b82edd
add swing-twist decomposition util with unit-tests
2015-08-10 14:47:15 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
ericrius1
205a2d53b6
no longer returning early on NaN
2015-08-07 16:15:51 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Andrew Meadows
5be8583b7d
Merge pull request #5494 from sethalves/gzip-json-entity-persist-files
...
gzip json entity persist files
2015-08-05 10:56:03 -07:00
Seth Alves
eb87023416
code review
2015-08-05 10:16:45 -07:00
Anthony J. Thibault
b8bae7cc3f
Debug rendering of MyAvatar’s skeletonModel skeleton
2015-08-04 18:14:47 -07:00
Anthony J. Thibault
f5dee717a1
Added fbx loading via animation cache.
...
* added AnimPose::copyFromNetworkAnim() which
should, re-map bone ids to match the current
skeleton, and fill in missing bones with bind
pose frames.
* added ability to set a skeleton on a node.
I might need to add a recursive version of this.
* it compiles!
* tests run!
2015-08-04 18:14:46 -07:00
Anthony J. Thibault
da809efcd6
WIP commit, DOES NOT BUILD.
...
* Added AnimSkeleton class
* Attempt to copy animation frames when _networkAnimation has
finished loading. Fill in the holes with bind pose.
2015-08-04 18:14:46 -07:00
samcake
59b69be251
Merge pull request #5501 from jherico/lisa
...
CORE PROFILE: Working on HMD crash on mac
2015-08-04 16:27:37 -07:00
Bradley Austin Davis
241ee00ca5
Working on HMD crash on mac
2015-08-04 15:18:01 -07:00
Seth Alves
45643a3aad
try, try again
2015-08-04 14:36:16 -07:00
Seth Alves
a4bf169ade
on windows, copy zlib dll next to programs that link with shared
2015-08-04 14:13:41 -07:00
Seth Alves
ff477b35a8
fix zlib include directory
2015-08-04 11:33:39 -07:00
Seth Alves
fb9fa76018
adjust comments
2015-08-04 08:26:28 -07:00
Seth Alves
adcd91e3ff
Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.
2015-08-04 07:23:24 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Andrew Meadows
ef5e7e9ccc
remove PlaneShape dependency from GeometryUtils
...
also add unit tests for indRayRectangleIntersection()
2015-07-28 15:45:48 -07:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
