Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 18:57:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25842 commits 74 branches 59 tags 1.2 GiB
Commit graph

271 commits

Author SHA1 Message Date
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
ZappoMan
63c19f7c11 fix build buster from bad merge 2015-05-27 20:19:59 -07:00
ZappoMan
763e6dd97b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 19:58:11 -07:00
Andrew Meadows
aba539928d fix grab glitches and failure to own simulation 2015-05-27 18:05:59 -07:00
Atlante45
3d7a834356 Ignore new entity dimensions if one of them is 0 2015-05-24 20:20:20 +02:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Atlante45
21d9ae7cf3 Transform compute + Magic numbers 2015-05-15 21:34:54 +02:00
Atlante45
c13ad83cc4 Rename getCenter by get CenterPosition 2015-05-15 18:34:28 +02:00
Atlante45
92d4b08c38 Init _transform with correct values 2015-05-15 17:52:06 +02:00
Atlante45
d0cd18d6c0 Replace entities pos/rot/dim with transform 
Removed _position, _rotation, _dimensions
Added Transform _transform
 2015-05-15 17:35:24 +02:00
Andrew Meadows
53e241fb07 merge upstream/master into andrew/thermonuclear 2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-14 10:09:55 -07:00
ZappoMan
0dcb89fce7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 20:33:10 -07:00
Howard Stearns
dc2e923583 Ordering for packets. 2015-05-13 15:51:11 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -07:00
Andrew Meadows
4872a565c9 bid for simulation ownership 2015-05-12 21:46:52 -07:00
ZappoMan
98474376de consolidate READ_ENTITY_PROPERTY() macros into single typesafe version 2015-05-12 15:59:45 -07:00
ZappoMan
83d212861d make APPEND_ENTITY_PROPERTY type safe 2015-05-12 11:41:04 -07:00
Andrew Meadows
289dcb0e7f only set ACTIVATE flag on non-zero velocity 2015-05-08 15:39:45 -07:00
Andrew Meadows
1879a67804 cleanup 2015-05-07 14:42:09 -07:00
Seth Alves
f52747d8c1 re-enable code that ignores old packets 2015-05-07 11:53:57 -07:00
Andrew Meadows
6e6fec158d split ignore/activation thresholds for updates 2015-05-06 11:47:33 -07:00
Seth Alves
c35edd8eb4 some debugging on Andrew's refactor 2015-05-05 16:40:10 -07:00
Seth Alves
1cd93b9ec8 pull andrew's branch, add back in visual indicator of an entity being active in bullet 2015-05-05 13:14:22 -07:00
Andrew Meadows
25ff9e4b59 fix warning about order of ctor initialization 2015-05-05 10:27:48 -07:00
Andrew Meadows
aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
 2015-05-05 10:24:17 -07:00
Andrew Meadows
d5f4c5a0ef add/delete/cleanup of physical entities works 2015-05-05 10:10:08 -07:00
Ryan Huffman
b49a04c638 Add name property to entities 2015-05-01 08:40:24 -07:00
Andrew Meadows
9f8b266a03 fix some compile problems 2015-04-30 13:56:37 -07:00
Andrew Meadows
195dd1420c DIRTY_PHYSICS_ACTIVATION not DIRTY_PHYSICS_NO_WAKE 
also add separate flag for rotation
and separate flags for linear vs angular velocity
and some combined flag masks for convenience
 2015-04-30 13:17:13 -07:00
Andrew Meadows
14b6ee608a more PhysicalEntitySimulation implementation 
with changes to API's accordingly (does not compile yet)
 2015-04-28 15:07:37 -07:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Seth Alves
26511575c2 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 06:44:59 -07:00
Andrew Meadows
b760a03360 pass arguments by const reference 2015-04-26 15:24:00 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Seth Alves
ac46f84291 cleanups 2015-04-24 18:36:41 -07:00
Seth Alves
03706359f5 cleanups 2015-04-24 17:44:52 -07:00
Seth Alves
218393a2b3 rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken 2015-04-24 17:37:19 -07:00
Seth Alves
6e6793cbcc remove debugging prints 2015-04-24 15:18:02 -07:00
Andrew Meadows
3ecf959b3e removed cached copies of damping and restitution 2015-04-24 14:50:37 -07:00
Seth Alves
fea8d84618 sync 2015-04-24 14:09:10 -07:00
Seth Alves
a27f8f3f10 sync 2015-04-24 11:28:44 -07:00
Seth Alves
b40e78311b disable hack to notice that the server is sending the same thing repeatedly 2015-04-24 11:00:06 -07:00
Seth Alves
cf0499e671 various physics-related experiments 2015-04-23 21:07:04 -07:00
Seth Alves
bc65616bb3 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-23 13:09:22 -07:00