Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:51:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24908 commits 25 branches 0 tags 1.1 GiB
Commit graph

125 commits

Author SHA1 Message Date
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
ZappoMan
32ef0c2010 removed some dead code 2015-05-04 15:49:21 -07:00
ZappoMan
8c47736c3b add skybox mode property 2015-05-04 11:41:03 -07:00
ZappoMan
78f7870cbb more tweaks to atmosphere properties 2015-05-04 11:13:05 -07:00
ZappoMan
7ae5ed1aaf next pass at atmosphere properties 2015-05-01 17:48:09 -07:00
Seth Alves
6139fc0d73 Merge pull request #4738 from huffman/entity-naming 
Add 'name' property to entities
 2015-05-01 11:58:30 -07:00
Ryan Huffman
c506c36d7c Fix initialized-out-of-order warnings for name property 2015-05-01 11:26:43 -07:00
Ryan Huffman
b49a04c638 Add name property to entities 2015-05-01 08:40:24 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
Atlante45
a26d9ef353 Fix ShapeType/String conversion 2015-04-24 16:49:18 +02:00
Atlante45
f117941c8d Macro fixing 2015-04-23 13:25:14 +02:00
Atlante45
9cec256142 Rename collisionModelURL members/methods 2015-04-22 21:16:09 +02:00
Atlante45
7f3be9c89b Add shapeType/compoundShapeURL to ZoneEntities 2015-04-22 21:14:10 +02:00
Atlante45
b446644549 Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
ZappoMan
19386d5a5d Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-04-22 09:35:08 -07:00
ZappoMan
e436c95212 first cut at reworking zones 2015-04-21 14:36:13 -07:00
Seth Alves
1484d6e37f fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version 2015-04-16 16:10:01 -07:00
Seth Alves
d7059d8f2d add code for uuids in wire protocol. some debugging prints 2015-04-16 14:46:38 -07:00
Andrew Meadows
5b81b5b11b removing SHAPE_TYPE_CONVEX_HULL from entities lib 2015-04-14 14:56:32 -07:00
Seth Alves
62ff8bf735 set PROP_LAST_ITEM automatically 2015-04-08 17:07:20 -07:00
Seth Alves
51a0fdf3d4 formatting 2015-04-08 15:43:49 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Seth Alves
d4461f1ecb put avatars and embedded-webserver and entities logging into their own QLoggingCategory 2015-04-06 16:22:54 -07:00
Ryan Huffman
81cb1e98ba Rename attribution to marketplaceID 2015-03-27 13:35:58 -07:00
Atlante45
d3ae7cf5cf Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-19 16:25:26 +01:00
Andrew Meadows
517b2648ca Merge pull request #4465 from sethalves/avatars-can-collide 
One convex hull shape for models that provide decomposition data.
 2015-03-18 12:52:52 -07:00
Atlante45
8b5ade10b8 Initial add of the Attribution property 2015-03-18 18:57:05 +01:00
Seth Alves
ecb958687d don't crash if we encounter an unknown shape type 2015-03-16 11:53:47 -07:00
Seth Alves
89b58e2681 trying to get loaded callback for model hooked up to PhysicsEngine 2015-03-13 09:11:15 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -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
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -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
630b5dd03b collisionModelURL property 2015-03-07 20:27:02 -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
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -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
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
Ryan Huffman
84691f922c Remove old light color properties 2015-02-27 14:04:56 -08:00
Ryan Huffman
093e5db90d Update entity light properties to use new model 
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
 2015-02-27 13:42:56 -08:00
Andrew Meadows
3cd0a70641 store shapeType whenever it is explicitly changed 2015-02-23 14:35:44 -08:00
Andrew Meadows
2e1c122915 moved ShapeType boilerplate stuff macos 2015-02-23 11:38:56 -08:00
Andrew Meadows
0fc4c732f7 use macro for copying shapeType string to script 2015-02-23 10:13:47 -08:00
Andrew Meadows
27e6f99deb use strings for shapeType for JS Entity properties 2015-02-20 16:54:58 -08:00
Andrew Meadows
ff27ab74ae expose _shapeType to script and server 2015-02-11 08:46:41 -08:00
Andrew Meadows
ccc50dd94f use density instead of mass 2015-01-14 15:47:44 -08:00
Andrew Meadows
04b4a95ccb fix for bad cleanup (3 places) 2015-01-13 14:21:41 -08:00