Brad Hefta-Gaub
750f8a09fa
Merge pull request #4394 from AndrewMeadows/isentropic
...
EntityItem now stores position in meters and angular velocity in radians/sec
2015-03-09 12:47:00 -07:00
Brad Hefta-Gaub
5686a4a48d
Merge pull request #4397 from ZappoMan/fbxFixes
...
temporarily remove skeleton check from upload
2015-03-09 11:01:20 -07:00
ZappoMan
559945c0c6
temporarily remove skeleton check from upload
2015-03-09 10:50:09 -07:00
Andrew Meadows
e418872f7b
namechanges: setFooInMeters() --> setFoo()
...
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
2015-03-09 09:56:15 -07:00
Andrew Meadows
c3a8c44545
oops, removing a typo
2015-03-09 09:55:35 -07:00
Andrew Meadows
c0ed3edbbb
remove exception when connecting to old server
2015-03-09 09:38:26 -07:00
Brad Hefta-Gaub
2de19ec6b3
Merge pull request #4396 from Atlante45/disk_cache
...
Fix dialog labels
2015-03-09 09:19:42 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Atlante45
61649ee0a5
Fix dialog labels
2015-03-09 13:42:14 +01:00
Brad Hefta-Gaub
e2a1ae41b7
Merge pull request #4393 from ctrlaltdavid/20389
...
CR for Job #20389 - hmdDefaults.js
2015-03-08 11:42:54 -07:00
Brad Hefta-Gaub
80675f8459
Merge pull request #4391 from ZappoMan/fbxFixes
...
different mixamo detection
2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub
e2a367607a
Merge pull request #4384 from ctrlaltdavid/20369
...
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub
21cd7e36e0
Merge pull request #4381 from Atlante45/disk_cache
...
Disk cache tweaks
2015-03-08 11:40:40 -07:00
Brad Hefta-Gaub
375fa4803e
Merge pull request #4377 from jaso-r/master
...
High Fidelity interview project -- Jason Rickwald
2015-03-08 11:31:22 -07:00
Jason
0fd9540bc3
Sync to upstream
...
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
2015-03-07 21:40:06 -08:00
Andrew Meadows
ba6e66f169
merge upstream/master into andrew/isentropic
2015-03-07 18:03:49 -08:00
Andrew Meadows
5b854857c1
fix JS scripts to use radians per second
...
in entity properties
2015-03-07 18:02:41 -08:00
ZappoMan
7088c0287a
different mixamo detection
2015-03-06 18:29:22 -08:00
David Rowe
d112c455e2
Add hmdDefaults.js script
2015-03-06 17:49:31 -08:00
samcake
174e359c50
Merge pull request #4387 from ZappoMan/fbxFixes
...
tweaks to hacks for detecting mixamo files
2015-03-06 17:25:19 -08:00
Brad Hefta-Gaub
c9dd96c98d
Merge pull request #4389 from birarda/master
...
render application overlay only if enabled
2015-03-06 17:06:05 -08:00
Andrew Meadows
f5352333f0
entities use radians per second for angular velocity
2015-03-06 16:42:06 -08:00
Brad Hefta-Gaub
fd6f8c7792
Merge pull request #4382 from huffman/import-export
...
Improvements to Import/Export entities
2015-03-06 16:31:57 -08:00
Jason
cfcc4679e1
Interview project updates (2).
...
Oops, I forgot to convert tabs-to-spaces on EntityTreeRenderer.
Committing it now.
2015-03-06 15:57:38 -08:00
Jason
7a5669f14e
Interview project updates.
...
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project. Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
2015-03-06 15:52:21 -08:00
Andrew Meadows
021510ae68
merge upstream/master into andrew/isentropic
2015-03-06 15:38:10 -08:00
Andrew Meadows
95c7bcb5f8
whoops -- remove last *InTreeUnits() calls
2015-03-06 15:34:35 -08:00
Andrew Meadows
c4dafc74ad
whoops, remove last bestFitBoundsInMeters() call
2015-03-06 15:33:15 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Andrew Meadows
6936d65db9
remove unused *= operator for AABox
2015-03-06 15:31:52 -08:00
Andrew Meadows
6fa1b1c600
remove unused cruft and fix float casts
2015-03-06 15:31:27 -08:00
Stephen Birarda
a4963f1895
render application overlay only if enabled
2015-03-06 15:22:25 -08:00
Stephen Birarda
8eb93c2e01
Merge pull request #4388 from highfidelity/problem-patch-1
...
Update to .com instead of .io in Welcome dialog
2015-03-06 15:19:15 -08:00
Grayson Stebbins
7c78e598b8
Update to .com instead of .io in Welcome dialog
2015-03-06 15:15:48 -08:00
ZappoMan
ffab6ffe48
tweaks to hacks for detecting mixamo files
2015-03-06 15:11:02 -08:00
Brad Hefta-Gaub
00b731a868
Merge pull request #4372 from sethalves/fix-assignment-client-monitor
...
pass -t to children even if run in parent mode. monitor (parent) only i...
2015-03-06 12:08:32 -08:00
Philip Rosedale
6137ad90b6
Merge pull request #4385 from huffman/edit-slow
...
Fix editEntities.js being very slow for some users
2015-03-06 12:07:04 -08:00
Ryan Huffman
b3631de93c
Remove print statements from entityList.js
2015-03-06 12:03:36 -08:00
Clément Brisset
aed208a339
Merge pull request #4383 from huffman/fix-script-editor-icons
...
Fix issue with Script Editor icons not showing up on first show
2015-03-06 06:02:50 -08:00
Andrew Meadows
e4c68bf31c
committing some temp debug stuff to help git diff
...
(will remove this stuff later)
2015-03-05 18:06:08 -08:00
Ryan Huffman
299035bc85
Move script editor show() call to DialogsManager
2015-03-05 15:05:17 -08:00
Ryan Huffman
9247ccd7b3
Remove ExportMenu.js and ModelImporter.js
2015-03-05 13:55:22 -08:00
Ryan Huffman
08b905095d
Remove Paste Models and rename Import/Export to Entities
2015-03-05 13:54:27 -08:00
Ryan Huffman
a2617b2c96
Update editEntities import/export
2015-03-05 13:52:59 -08:00
Ryan Huffman
03c03a20f9
Update pasteEntities to use vec3
2015-03-05 13:52:30 -08:00
Ryan Huffman
6848025504
Add exporting by entity ID to Application
2015-03-05 13:36:16 -08:00
Atlante45
7690301e58
Include functional
2015-03-05 21:49:22 +01:00
Ryan Huffman
71768ef275
Return entity IDs on paste
2015-03-05 12:36:45 -08:00
Ryan Huffman
a922619ebc
Add Clipboard.exportEntities that takes a list of entity IDs
2015-03-05 12:36:10 -08:00
Ryan Huffman
2c68d56059
Update Entity::sendEntities to return new entity ids
2015-03-05 12:34:05 -08:00
