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
Andrew Meadows
aede107058
change version of Entity update packet
2015-03-04 09:41:07 -08:00
Andrew Meadows
b9cbd1ea6e
witch internal EntityItem data to use meters
2015-03-04 09:38:37 -08:00
David Rowe
4c959e8d82
More parentheses to address Xcode compiler warnings
2015-03-04 09:17:19 -08:00
Seth Alves
15609a80ec
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-04 08:48:54 -08:00
Seth Alves
b4998e9c53
falling onto an object works
2015-03-04 08:48:48 -08:00
Chris Collins
90c5595bc6
Merge pull request #4374 from birarda/master
...
fix for localhost domain-server port check
2015-03-03 23:31:49 -08:00
Stephen Birarda
3005f74411
fix localhost port check to not kill user lookup
2015-03-03 23:11:02 -08:00
David Rowe
8686e090c9
Don't upload skeletonless avatar model to HiFi servers
2015-03-03 22:34:07 -08:00
David Rowe
aad3f1dfd9
Automatically switch to default model if avatar model is skeletonless
2015-03-03 22:34:07 -08:00
David Rowe
30b77d4200
Don't crash if avatar model at start-up or loaded is skeletonless
2015-03-03 22:34:06 -08:00
Virendra Singh
4366525da4
Removed unused variables
2015-03-04 08:51:44 +05:30
Virendra Singh
126d3cf237
Merge branch 'master' of git://github.com/highfidelity/hifi into 20304
2015-03-04 08:22:20 +05:30
Virendra Singh
1facbbb844
Removed MSVC specific for each blocks
2015-03-04 08:21:39 +05:30
Seth Alves
a254f017cc
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-03 18:37:40 -08:00
Seth Alves
8eec66c066
merge upstream, avatar can now fall onto a cube
2015-03-03 18:37:16 -08:00
Stephen Birarda
0a74291377
Merge pull request #4373 from birarda/remove-xmpp
...
fix web chat link for IRC
2015-03-03 16:26:12 -08:00
Stephen Birarda
d3682b0297
fix web chat link for IRC
2015-03-03 16:03:47 -08:00
Brad Hefta-Gaub
fc048c3b03
Merge pull request #4368 from ctrlaltdavid/20377
...
CR for 20377
2015-03-03 15:51:42 -08:00
samcake
6b1f42df83
Merge pull request #4366 from ZappoMan/removeMetavoxels
...
remove metavoxels
2015-03-03 15:50:53 -08:00
Brad Hefta-Gaub
9649ed9936
Merge pull request #4371 from huffman/light-radius
...
Update Light to set direction when setting orientation
2015-03-03 15:50:04 -08:00
Seth Alves
7e4b597ca3
keep physics specific code in PhysicsEngine
2015-03-03 15:45:10 -08:00
Clément Brisset
6cefa0d3fb
Merge pull request #4370 from birarda/remove-xmpp
...
remove xmpp chat from interface
2015-03-03 15:27:38 -08:00
Seth Alves
8affca6120
pass -t to children even if run in parent mode. monitor (parent) only interacts with its own children
2015-03-03 14:58:53 -08:00
Seth Alves
5d4ef8d5b8
initial flailing
2015-03-03 14:30:26 -08:00
