Andrew Meadows
ab011d5b30
fix for non-animating models
2014-12-03 16:49:49 -08:00
Brad Hefta-Gaub
f10b656877
Merge pull request #3870 from AndrewMeadows/thermonuclear
...
pull entity simulation out of EntityTree
2014-12-03 14:30:44 -08:00
Andrzej Kapolka
fecb225a06
Prevent erroneous resource download percentages; Qt reports the total bytes as
...
-1 before the actual size is available.
2014-12-03 12:55:58 -08:00
Stephen Birarda
98f56aaa0c
fix URL/filename discrepancy for local scripts
2014-12-03 09:55:55 -08:00
Stephen Birarda
49a087018f
fix for delayed heartbeats, late socket lookup
2014-12-03 08:22:50 -08:00
Andrew Meadows
ff7559c2c2
merge upstream/master into andrew/thermonuclear
2014-12-02 11:41:29 -08:00
Andrew Meadows
b9944edf66
OctreeServer::createTree() is now protected
2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c
moving EntityCollisionSystem back to entities lib
2014-12-02 11:05:17 -08:00
Stephen Birarda
d7f168999d
don't block main thread for a script load
2014-12-02 10:30:23 -08:00
Stephen Birarda
36f716cd61
have script loading be separate from ScriptEngine constructor
2014-12-02 10:13:43 -08:00
Sam Gateau
845e687fc5
Adding a Hack for the apaartment model to boost the lightmaps
2014-12-01 11:45:07 -08:00
Philip Rosedale
72ad8061ba
Merge pull request #3878 from birarda/master
...
changes required for AC to discover a local DS
2014-11-30 18:44:32 -08:00
Philip Rosedale
e44ca5a7f7
Merge pull request #3876 from ZappoMan/bugFixes
...
fixes the stutter in animation when observer moves
2014-11-30 18:44:21 -08:00
Stephen Birarda
fed7d789f6
have the domain-server write its local port into shared memory
2014-11-30 17:29:18 -08:00
Sam Gateau
321d651d77
Hack for avoiding lightmaps loading in starchamber
2014-11-30 12:54:43 -08:00
ZappoMan
5c2cc20313
fixes the stutter in animation when observer moves
2014-11-28 17:36:55 -08:00
Brad Hefta-Gaub
8a86b2d239
Merge pull request #3873 from samcake/tot
...
Fix lighmaps for VC demo 12/1/2014
2014-11-27 13:01:10 -08:00
Andrew Meadows
3781c23480
add entities to simulation after unpacking
2014-11-26 17:09:53 -08:00
Philip Rosedale
91aca51dc6
Merge pull request #3868 from ZappoMan/HMDMode
...
First cut at HMD Tools window
2014-11-26 14:53:25 -08:00
Andrew Meadows
d84f57fafa
merge upstream/master into andrew/thermonuclear
2014-11-26 12:18:19 -08:00
Andrew Meadows
b543434a17
EntityTreeHeadlessViewer gets a simulation
2014-11-26 12:16:52 -08:00
Andrew Meadows
dd3a7b9b9d
EntitySimulation takes EntityItem* rather than ID
2014-11-26 12:12:43 -08:00
Sam Gateau
fa375539d0
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-26 09:42:31 -08:00
Philip Rosedale
7737994399
Merge pull request #3865 from ctrlaltdavid/20197
...
CR for Job #20197 - Bug: Initial ping stats mis-reported
2014-11-26 08:08:50 -08:00
Sam Gateau
77077f4e9c
hack a separate emissive information in the g-buffer
2014-11-25 18:17:28 -08:00
Sam Gateau
cb1850e082
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-25 14:10:30 -08:00
ZappoMan
333f323856
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode
2014-11-25 12:46:18 -08:00
ZappoMan
e9812d0608
added similarStrings() helper
2014-11-25 09:25:49 -08:00
Andrew Meadows
0d98555740
add EntitySimulation and SimpleEntitySimulation
2014-11-24 22:29:24 -08:00
Andrew Meadows
e574c5766b
EntityItem::setSimulationState() now public
2014-11-24 22:28:27 -08:00
Andrew Meadows
1c636fe6b2
more correct entity list maintenance
2014-11-24 20:37:09 -08:00
David Rowe
01867e2459
Display "--" for ping values if not yet valid
2014-11-24 18:32:47 -08:00
dev
ce103acdf6
More debugging of the FBXReader in order to understand how to interpret the material fields
2014-11-24 18:32:36 -08:00
Sam Gateau
6a63099a0f
Fixed syntax issues and review critics, put all the debugging code in a #define block
2014-11-24 15:24:20 -08:00
Sam Gateau
1f22d5b493
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-24 10:05:39 -08:00
Sam Gateau
87471df7a1
First version of the lighmap working
2014-11-21 18:08:34 -08:00
AndrewMeadows
8d9df8570c
Merge pull request #3847 from ey6es/metavoxels
...
Big metavoxel update: removed unused pieces, converted heightfields to "spanners" in order to allow arbitrary transforms, switched to 16 bit heightfields with lossless compression, some rendering improvements.
2014-11-21 15:57:00 -08:00
ZappoMan
bd2adf08e3
fix to drift in usecTimestampNow() caused when computer sleeps
2014-11-21 13:33:53 -08:00
Andrzej Kapolka
41eaf340c6
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-21 12:47:26 -08:00
Andrzej Kapolka
03e302c508
Removed a debug statemen.
2014-11-20 17:34:37 -08:00
Philip Rosedale
cd2a6f0f9c
merge fix
2014-11-20 17:35:50 -06:00
Andrzej Kapolka
0a976ad262
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 11:26:29 -08:00
Brad Hefta-Gaub
168487e0a7
Merge pull request #3840 from huffman/entity-snap-on-create
...
Entity snap on create (+ remove getEntityItemID)
2014-11-20 09:58:54 -08:00
Sam Gateau
7daff18101
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-20 09:57:59 -08:00
Brad Hefta-Gaub
32f60c4255
Merge pull request #3839 from birarda/master
...
trim whitespace for place name lookup, potential lobby crash fix
2014-11-20 09:57:39 -08:00
Sam Gateau
764ad72471
adding the light map support from FBX
2014-11-20 09:54:41 -08:00
Ryan Huffman
6a68281308
Remove EntityScriptingInterface::getEntityItemID
2014-11-20 09:39:41 -08:00
Stephen Birarda
1aa98dfc4c
trim whitespace for place name lookup
2014-11-20 09:24:43 -08:00
Philip Rosedale
5101e469dc
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-19 23:54:31 -06:00
Atlante45
4d5451fafe
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/SkeletonModel.cpp
2014-11-19 17:28:24 -08:00
