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
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -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
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02: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
Stephen Birarda
fd43c48eac
resolve conflicts on merge with birarda/protocol
2015-08-18 11:48:36 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Stephen Birarda
47d1710208
remove msecTimestampNow that is not used
2015-08-17 16:39: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
Stephen Birarda
0fe3213d38
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-08-05 11:16:34 -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
Atlante45
dfaa16d15c
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-08-05 10:39:02 -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
Stephen Birarda
d340515ab3
complete the initial version of UDTTest
2015-07-30 17:09:25 -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
Atlante45
82545df266
Added msecTimestampNow as usecTimestampNow narrowing
2015-07-23 15:01:46 -07:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
SamGondelman
a4cbb7f412
const references in glmhelpers
2015-07-20 17:30:23 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Brad Davis
5159452335
Fixing invalid vector usage and strange picking crash
2015-07-19 23:03:46 -07:00
Brad Davis
c446bb307d
Adding convenience return *this to many transform methods
2015-07-18 16:56:32 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
ericrius1
a44e5f949c
Merge branch 'master' into polyLineInProgress
2015-07-17 15:01:40 -07:00
Stephen Birarda
7d2495e289
set the generic thread priority once it's actually started
2015-07-17 09:24:00 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
Stephen Birarda
61f23f6a5e
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-07-16 11:56:26 -07:00
ZappoMan
5165210e11
fix Sams comment about comments
2015-07-15 16:35:20 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
ZappoMan
d1e511efcb
more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl
2015-07-15 15:52:12 -07:00
samcake
9df26c8488
removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs
2015-07-15 00:24:43 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
ericrius1
0ce6737b34
merged and normals flipping
2015-07-13 09:43:15 -07:00
Seth Alves
c17c9f1818
quiet compiler
2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Brad Davis
c1b72db18d
Still trying to get jenkins builds to work
2015-07-10 16:00:51 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Stephen Birarda
1b4e333c49
Merge pull request #3 from birarda/atp
...
initial networking API changes for new protocol
2015-07-09 16:51:37 -04:00
Stephen Birarda
2417981c9d
resolve conflicts on merge with clement/protocol
2015-07-09 13:27:59 -07:00
Stephen Birarda
893e1864fd
cleanup _newestEntryAtIndex calc in RBH insert
2015-07-09 13:22:41 -07:00
Atlante45
c0b8f83ca0
Better ring index compute
2015-07-09 13:22:09 -07:00
Stephen Birarda
14b73ae00f
remove qtimespan that isn't used anymore
2015-07-09 12:45:32 -07:00
Brad Hefta-Gaub
489a8b4b3d
Merge pull request #5285 from jherico/homer
...
Move log file writing to a separate thread
2015-07-09 12:22:13 -07:00
Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Stephen Birarda
19c5f0b67c
resolve conflicts on merge with upstream/master
2015-07-08 22:54:36 -07:00
Brad Davis
63dfd570f1
Adding priority support to GenericThread
2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81
Move file log persistence to a separate thread
2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Brad Davis
f2beb79d23
Updating buffer parser to use new heapless API
2015-07-08 18:54:38 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Brad Davis
49a14e3446
Merge remote-tracking branch 'upstream/master' into entity_parsing
2015-07-08 18:37:41 -07:00
Brad Davis
625cc86f83
Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
...
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -07:00
ZappoMan
7790e35d24
added bytes consumed result to decode, and exit early after bytes consumed
2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52
Fixing template specialization compilation error on gcc/clang
2015-07-08 18:17:03 -07:00
