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
Sam Gateau
d5f6129082
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis
2015-03-06 10:44:15 -08:00
Sam Gateau
c097c6aad2
Adding the self introspection of shaders
2015-03-06 10:41:53 -08:00
Seth Alves
7a2977446a
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-06 08:47:05 -08:00
Virendra Singh
f247138db8
Merge branch 'master' of git://github.com/highfidelity/hifi into 20304
2015-03-06 22:09:10 +05:30
Virendra Singh
84e05e361e
Accuracy improved to 0.01
2015-03-06 22:07:35 +05:30
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
Virendra Singh
42867bf98d
code revamp
2015-03-06 11:10:38 +05:30
Virendra Singh
9c1b9b05cf
Merge branch 'master' of git://github.com/highfidelity/hifi into 20304
2015-03-06 11:06:49 +05:30
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
Seth Alves
0d093b4921
rename binary from vhacd to vhacd-util. vhacd-util outpus obj files
2015-03-05 15:38:55 -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
Atlante45
f4d8ee39dc
Menu item for cache editor
2015-03-05 21:10:02 +01:00
Atlante45
908e946ac5
Hook up disk cache to the dialog manager
2015-03-05 21:09:23 +01:00
Atlante45
53f23d8452
Added disk cache editor
2015-03-05 21:08:14 +01:00
Atlante45
9d7144dab0
Bumped disk cache size to 10GB
2015-03-05 18:52:48 +01:00
Atlante45
1b7fdf5d16
Improve disk cache usage
...
Now we always load from the disk cache if the file is in there.
Then we check the last modidied date from the network file
against the one in the cache.
If needed, we redownload.
2015-03-05 18:49:52 +01:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Seth Alves
034ceab4d3
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-05 06:39:03 -08:00
Seth Alves
af4957ff14
start to write out obj from vhacd
2015-03-05 06:38:42 -08:00
Seth Alves
ac0c4e8512
cap max speed at MAX_WALKING_SPEED
2015-03-04 19:57:06 -08:00
Seth Alves
ef66182ce7
Merge pull request #4379 from AndrewMeadows/thermonuclear
...
fix dark lighting and missing avatars on linux
2015-03-04 19:00:54 -08:00
Andrew Meadows
59a70b5b5f
remove cruft and fix default entity dimensions
2015-03-04 17:32:46 -08:00
Andrew Meadows
26bb677840
remove ViewFrustum::*VoxelScale() function calls
...
we do our math in meters now
2015-03-04 17:26:52 -08:00
Andrew Meadows
d7eaa68193
Merge pull request #4378 from ZappoMan/fixEntitiyImportExport
...
fix bug in export
2015-03-04 17:25:27 -08:00
Seth Alves
7df877ced7
Merge branch 'thermonuclear' of github.com:AndrewMeadows/hifi into avatars-can-collide
2015-03-04 16:56:59 -08:00
Andrew Meadows
c3a4e5d94b
fix dark lighting and missing avatars on linux
2015-03-04 16:52:27 -08:00
ZappoMan
e99ffb8307
fix bug in export
2015-03-04 16:29:34 -08:00
Andrew Meadows
d7d25a6509
Octree::findCapsulePenetration() uses meters
2015-03-04 16:16:49 -08:00
Jason
3522357c8c
High Fidelity interview project -- Jason Rickwald
...
For my project, I decided to add a new entity -- a Particle Effect.
This is really rudimentary to start out with, but you could see where
it's headed.
2015-03-04 16:06:06 -08:00
Andrew Meadows
ca1c9b4105
EntityItem::findEntities() uses meters
2015-03-04 16:05:29 -08:00
Seth Alves
a8b688d540
move _velocity into base class. walking on a cube works
2015-03-04 15:26:02 -08:00
Seth Alves
31624b85e7
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-04 15:08:34 -08:00
Seth Alves
440a4378dd
Merge pull request #4376 from ZappoMan/removeMetavoxels
...
don't add old metavoxels assignment to default assignments
2015-03-04 15:08:15 -08:00
Seth Alves
cee39e177c
Merge branch 'removeMetavoxels' of github.com:ZappoMan/hifi into avatars-can-collide
2015-03-04 14:50:42 -08:00
ZappoMan
05640290da
don't add old metavoxels assignment to default assignments
2015-03-04 14:41:28 -08:00
Seth Alves
910c8da046
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-04 14:19:12 -08:00
Clément Brisset
da6db93508
Merge pull request #4375 from ctrlaltdavid/20370
...
More parentheses to address Xcode compiler warnings
2015-03-04 10:06:54 -08:00
Andrew Meadows
c88f236d1c
get version from packet
2015-03-04 09:41:23 -08:00
