Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 10:36:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23015 commits 25 branches 0 tags 1.1 GiB
Commit graph

7555 commits

Author SHA1 Message Date
Seth Alves
a180eadc91 remove stray control-Ms 2015-03-08 18:07:07 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -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
Sam Gateau
518d52b1c4 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-08 10:54:24 -07:00
Sam Gateau
23a6326aa1 testing the shader features in Model and refining the shader making workflow 2015-03-08 10:53:29 -07:00
Seth Alves
b2cfed8bca removed unused blob of code 2015-03-08 09:04:00 -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
Seth Alves
1a1863679d bump entity-data message version number 2015-03-07 20:32:41 -08:00
Seth Alves
d713d5596f bump entity-data message version number 2015-03-07 20:32:28 -08:00
Seth Alves
b8cdf1a318 quiet warning 2015-03-07 20:31:53 -08:00
Seth Alves
804d4a0963 coding standard 2015-03-07 20:31:37 -08:00
Seth Alves
96d94e1b09 collision model url 2015-03-07 20:31:04 -08:00
Seth Alves
58bd8a5c65 collision model url 2015-03-07 20:30:29 -08:00
Seth Alves
bcfd1d8a89 collisionModelURL property 2015-03-07 20:27:20 -08:00
Seth Alves
630b5dd03b collisionModelURL property 2015-03-07 20:27:02 -08:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Seth Alves
05e0fe3536 object display correctly now? 2015-03-07 11:28:30 -08:00
Seth Alves
bb0f6b4d28 uninitialized variable 2015-03-07 11:27:52 -08:00
Seth Alves
b96e455b72 uninitialized variable 2015-03-07 11:27:27 -08:00
Seth Alves
f807384dfe build a joint and caclulate extents. obj models now show up, though not correctly. 2015-03-07 07:55:04 -08:00
Seth Alves
4a7dd2b3e6 allow downloading of obj files 2015-03-07 07:53:25 -08:00
Seth Alves
d7c8f22246 stray control-Ms 2015-03-07 07:53:04 -08:00
Seth Alves
6772847d0b make it so I don't have to count 2015-03-07 07:52:39 -08:00
Seth Alves
8a4339e57f stray control-Ms 2015-03-07 07:52:20 -08:00
Seth Alves
591edc0527 _mesh instance variable doesn't appear to be in use. 2015-03-07 07:51:47 -08:00
Virendra Singh
5465853ef7 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-07 17:50:21 +05:30
Seth Alves
6e79fc8b68 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-06 18:46:13 -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
Andrew Meadows
f5352333f0 entities use radians per second for angular velocity 2015-03-06 16:42:06 -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
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
ZappoMan
ffab6ffe48 tweaks to hacks for detecting mixamo files 2015-03-06 15:11:02 -08:00
Seth Alves
858d15d0ba obj reader sort-of works 2015-03-06 13:15:53 -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
Virendra Singh
84e05e361e Accuracy improved to 0.01 2015-03-06 22:07:35 +05:30
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
Ryan Huffman
2c68d56059 Update Entity::sendEntities to return new entity ids 2015-03-05 12:34:05 -08: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
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
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
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
Stephen Birarda
3005f74411 fix localhost port check to not kill user lookup 2015-03-03 23:11:02 -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
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
Seth Alves
5d4ef8d5b8 initial flailing 2015-03-03 14:30:26 -08:00
Virendra Singh
4627d2e7b5 Parallel axis theorem correction 2015-03-04 03:52:59 +05:30
Virendra Singh
1914661bbf Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 03:51:06 +05:30
Ryan Huffman
3fef8a1622 Update Light to set direction when setting orientation 2015-03-03 12:41:51 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Virendra Singh
7a129235c2 Mass properties unit tests 2015-03-04 01:12:20 +05:30
Virendra Singh
cd71f4531d Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 01:10:52 +05:30
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
Sam Gateau
cad2184927 FIxing the compilation issue for linux 2015-03-03 11:09:11 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
Sam Gateau
598b791aee FIxing the compilation issue for linux 2015-03-03 11:01:47 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
eb8e8e9a62 Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem 
pass more localhost ports via shared memory
 2015-03-03 10:05:24 -08:00
Philip Rosedale
c9f97b312e Merge pull request #4365 from sethalves/log-only-once 
Log message type just once
 2015-03-02 20:38:54 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Ryan Huffman
98e0f235cc Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users 2015-03-02 14:47:26 -08:00
Seth Alves
bb7b132b78 Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once. 2015-03-02 14:18:26 -08:00
Brad Hefta-Gaub
6d8ccfbc2a Merge pull request #4357 from huffman/update-light-entity-properties 
Update light entity properties
 2015-03-02 13:51:48 -08:00
Virendra Singh
3d558dae64 MassProperties of a 3D mesh 2015-03-03 01:51:35 +05:30
Ryan Huffman
38a361dcf0 Remove class scope on _entityScriptingInterface property references 2015-03-02 11:32:07 -08:00
Ryan Huffman
75a943386b Remove nullptr comparison 2015-03-02 10:44:32 -08:00
Ryan Huffman
a443157dd7 Update ScriptEngine::entityScriptingInterface to be static pointer 
Statically allocating the EntityScriptingInterface means we can't make
sure it is initialized AFTER NodeList has been initialized
 2015-03-02 10:40:46 -08:00
Ryan Huffman
9a302eebed Add Entities.canAdjustLocksChanged 2015-03-02 10:40:29 -08:00