Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 08:11:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25201 commits 75 branches 59 tags 1.2 GiB
Commit graph

8762 commits

Author SHA1 Message Date
Andrew Meadows
47f978b86e merge 2015-05-07 10:31:27 -07:00
Andrew Meadows
070140440d fix crash bug when invalid entity ptr accessed 2015-05-07 10:30:22 -07:00
Andrew Meadows
fe5cfdf495 fix crash bug 
when obj deleted but dangling pointer still on _pendingAdd
which would not be removed during getObjectsToDelete()
because backpointers had been disconnected
 2015-05-07 10:28:38 -07:00
Seth Alves
867fe18472 put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked 2015-05-07 10:11:36 -07:00
Seth Alves
ddec6d5207 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 09:54:09 -07:00
Seth Alves
fe14202f51 add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated 2015-05-07 09:53:39 -07:00
Atlante45
cafaeed822 Restore polygon mode after entities rendering 
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
 2015-05-07 13:34:22 +02:00
Atlante45
366964e424 Fix static initialisation fiasco 2015-05-07 13:00:56 +02:00
Atlante45
721eeccce2 Restaure GL to default after we render a batch 2015-05-07 12:01:22 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
Sam Gateau
bba7dcfe5f Try to fix the transform stack issue in 1st person 2015-05-06 23:32:02 -07:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
Seth Alves
fabff7fdf4 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 18:26:00 -07:00
ZappoMan
af2c3d91cf Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 18:05:54 -07:00
Andrew Meadows
00c6944125 merge 2015-05-06 17:49:18 -07:00
Andrew Meadows
411bf1a35c fix for entity-server kinematic simulation 2015-05-06 17:48:10 -07:00
Seth Alves
5ac8558168 flash yellow box when transmitting an edit packet 2015-05-06 17:03:27 -07:00
Seth Alves
cc5f2ee451 in isMovingVsServer look at entity velocity only 2015-05-06 16:26:27 -07:00
Seth Alves
ba6f6d19cc disable updateServerPhysicsVariables 2015-05-06 16:20:16 -07:00
Seth Alves
630f1ce9d9 isMovingVsServer function 2015-05-06 16:13:07 -07:00
Bradley Austin Davis
3b8108e887 Fix inverted icons 2015-05-06 16:09:17 -07:00
Seth Alves
e73503a53d Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-06 16:05:13 -07:00
Seth Alves
b0ccabe38e update a motionstate's idea of what the entity-server thinks when an incoming update packet arrives 2015-05-06 16:05:05 -07:00
Andrew Meadows
452e84d43f only update physics when proper flags are set 2015-05-06 16:02:03 -07:00
Andrew Meadows
7b1886a285 harvest outgoing changes for non-NULL entities 2015-05-06 16:01:25 -07:00
Seth Alves
c63b8a93ec oops fix endless loop 2015-05-06 15:48:45 -07:00
Seth Alves
4c3cbea261 don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership 2015-05-06 15:32:02 -07:00
Stephen Birarda
e540a6dbb3 fix packet sequence number unmarshal 2015-05-06 14:48:10 -07:00
Seth Alves
a057d7dfa3 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 14:41:54 -07:00
ZappoMan
b7dfbd103a Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 14:41:53 -07:00
Brad Hefta-Gaub
5551997cdc Merge pull request #4780 from samcake/blue 
Add support for Skybox and rendering path of background according to Zones
 2015-05-06 14:41:06 -07:00
Seth Alves
fe06ce2931 pull from upstream 2015-05-06 14:31:22 -07:00
Seth Alves
86ec12b22c don't increase moving-without-simulator counter unless the thing is moving enough 2015-05-06 14:30:45 -07:00
Seth Alves
719747ee2d Merge pull request #4725 from howard-stearns/objReader 
Textures for .obj reader:
 2015-05-06 14:30:29 -07:00
Stephen Birarda
ff676958e8 fix hash replacement in PacketHeaders 2015-05-06 14:24:11 -07:00
Sam Gateau
8fd77f964c Fix include filke case for ubuntu... 2015-05-06 14:23:42 -07:00
Seth Alves
fe308c0189 only do infection during collisions if one of the objects is being simulated by this interface 2015-05-06 13:50:14 -07:00
Seth Alves
96a44314c9 don't have interface give up ownership 2015-05-06 13:29:54 -07:00
Sam Gateau
00c45dbb43 missing includes 2015-05-06 12:38:12 -07:00
Howard Stearns
35337ef2c2 Spell out order-of-evaluation for the compiler. 2015-05-06 12:28:45 -07:00
Sam Gateau
0fbccf1d33 get ready for PR, SKY_DOME by default 2015-05-06 12:22:19 -07:00
Sam Gateau
1b5185abeb fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome 2015-05-06 12:19:19 -07:00
Seth Alves
a72ac3ead2 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 12:19:04 -07:00
Bradley Austin Davis
ea6f840fdb Merge remote-tracking branch 'upstream/master' into plugins_pt1 2015-05-06 12:18:04 -07:00
samcake
06e1330e42 Clean up the includes in gpu, make the skybox shader works 2015-05-06 12:12:54 -07:00
Brad Hefta-Gaub
4de6d645e5 Merge pull request #4701 from jherico/infoview 
Infoviews & Browser in QML
 2015-05-06 12:12:21 -07:00
Brad Davis
a9de502e76 removing commented out old implementation. 2015-05-06 12:03:47 -07:00
Howard Stearns
d2dbb2c116 Missing the code! 2015-05-06 11:57:34 -07:00
Stephen Birarda
c5e189bbf2 use new PacketHeaders calls from LimitedNodeList 2015-05-06 11:52:03 -07:00
Andrew Meadows
326d17072e merge seth/dice-on-table-1 into andrew/nova 2015-05-06 11:50:12 -07:00
Andrew Meadows
c97b11a6e9 no ownership of kinematic objects on collision 2015-05-06 11:48:31 -07:00
Andrew Meadows
6e6fec158d split ignore/activation thresholds for updates 2015-05-06 11:47:33 -07:00
Andrew Meadows
f0c778a802 fix bug preventing taking of simulation ownership 2015-05-06 11:46:42 -07:00
Andrew Meadows
646661d037 update body gravity when proper dirty bits are set 2015-05-06 11:46:25 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Stephen Birarda
ba9ed12415 store last sequence number sent with data 2015-05-06 11:35:34 -07:00
Stephen Birarda
e2986f5702 add get seq num, cleanup PacketHeaders methods 2015-05-06 11:34:58 -07:00
ZappoMan
f2ebb6e821 fix output of group names to be lowercase 2015-05-06 11:30:41 -07:00
Seth Alves
f75eef4295 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-06 11:20:45 -07:00
Seth Alves
129a3a82da clear incoming flags after adding an entity to simulation. If an entity has a shape-type of none, don't keep asking it for a shape 2015-05-06 11:20:39 -07:00
Andrew Meadows
e61470517c track all entities added to simulation 2015-05-06 11:01:16 -07:00
samcake
50012ee9de fixing build issues on MAc 2015-05-06 11:00:37 -07:00
Stephen Birarda
b0c7af1714 store last seq for node/packet type combo 2015-05-06 10:41:41 -07:00
Sam Gateau
fe3b5d1867 preparing for PR, back to the default background mode SKy_DOME 2015-05-06 10:27:31 -07:00
Stephen Birarda
5b1514a390 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-06 10:12:17 -07:00
Sam Gateau
c86a8b3944 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-06 09:54:08 -07:00
Sam Gateau
dc81a3ecc2 Cube texture are working with the GL backend, useing it in SKybox successfullly 2015-05-06 09:53:36 -07:00
Atlante45
8de5e636bb Bit of cleanup 2015-05-06 17:39:18 +02:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02:00
Atlante45
52191f922c Render Sphere/Box zones 2015-05-06 16:57:53 +02:00
Atlante45
6d2fe945af Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-06 09:53:57 +02:00
Andrew Meadows
14f925b48e merge seth/dice-on-table-1 into andrew/nova 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
	libraries/physics/src/ObjectMotionState.h
 2015-05-05 16:54:53 -07:00
Andrew Meadows
50f73602f6 cleanup PhysicalEntitySimulation::_outgoingChanges 2015-05-05 16:51:07 -07:00
Andrew Meadows
d4701b4310 namechange getIncomingDF --> getAndClearIncomingDF 2015-05-05 16:49:41 -07:00
Andrew Meadows
550820ee45 set EntityItem::_simulated in the correct location 2015-05-05 16:48:56 -07:00
Seth Alves
4a7fe50084 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-05 16:43:43 -07:00
Seth Alves
c35edd8eb4 some debugging on Andrew's refactor 2015-05-05 16:40:10 -07:00
Seth Alves
c9f97b9d42 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 15:50:24 -07:00
Andrew Meadows
2668ff6d0a check for DIRTY_ROTATION bit when copying rotation 2015-05-05 15:34:50 -07:00
Andrew Meadows
8523a96e2b implement setShouldClaimSimulationOwnership() 2015-05-05 15:34:26 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
Atlante45
8b2442ce6e clear list after loop 2015-05-05 22:56:37 +02:00
Seth Alves
82828f0b93 print when bullet and local octree don't agree on position of an entity 2015-05-05 13:52:10 -07:00
Atlante45
863280300e Fix pickMeshList incorrect arguments 2015-05-05 22:37:00 +02: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
Seth Alves
8aafce6382 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 12:53:28 -07:00
Atlante45
73b7530ec6 Add wireframe pipelines 2015-05-05 21:50:06 +02:00
Stephen Birarda
a481c57315 fix for writeDatagram with hash and sequence number 2015-05-05 12:44:47 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
Atlante45
429c1e1231 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 21:33:55 +02:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Sam Gateau
b1fb05e543 merge 2015-05-05 12:04:30 -07:00
Sam Gateau
13482575d2 merge 2015-05-05 12:03:45 -07:00
Sam Gateau
6d02d4d25e adding skybox step by step 2015-05-05 11:40:00 -07:00
samcake
61f6139f4f Merge pull request #4764 from ZappoMan/atmosphereInZones 
First cut at adding "Atmosphere" support to zone
 2015-05-05 11:00:58 -07:00
Stephen Birarda
c76ae56d64 allow optional sequence numbers in packets 2015-05-05 11:00:27 -07:00
Andrew Meadows
813d702fc5 fix infinite loop in while 2015-05-05 11:00:25 -07:00
Bradley Austin Davis
fbee3c1782 Clearing a GL error from Qt internals that triggers an assert 2015-05-05 10:49:12 -07:00
Bradley Austin Davis
d2a8681139 Merge branch 'master' into infoview 2015-05-05 10:31:19 -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
6be3cc6efb remove debug stuff 2015-05-05 10:18:03 -07:00
Andrew Meadows
cfad016ba3 woops, forgot to these changes in last commit 2015-05-05 10:14:19 -07:00
Andrew Meadows
d5f4c5a0ef add/delete/cleanup of physical entities works 2015-05-05 10:10:08 -07:00
Andrew Meadows
e38bfaa48c allow for EntitityMotionState::_entity to be NULL 2015-05-05 10:09:07 -07:00
Atlante45
e0f3a8212f Add wireframe arg to render fct 2015-05-05 17:23:10 +02:00
Atlante45
46cd1f458b Actually call render on zone entities from tree 2015-05-05 17:20:27 +02:00
Atlante45
40295ab04e Cleanup RenderableZoneEntityItem 2015-05-05 17:19:42 +02:00
Atlante45
6fdb594dfd Forgot member initialisation 2015-05-05 16:40:16 +02:00
Atlante45
bc04685dbf Add isWireframe to RenderKey 2015-05-05 15:15:18 +02:00
Atlante45
0e3061f052 Add isWireframe to model class 2015-05-05 15:14:29 +02:00
Atlante45
34a39250f2 Add basic render to zones 2015-05-05 15:13:00 +02:00
Atlante45
aa10dc3991 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 15:04:11 +02:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
Andrew Meadows
457ae5b0dd Merge pull request #4763 from ericrius1/quatHelpers 
added axis and angle helper methods to Quat class- script user can now g...
 2015-05-04 17:22:52 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
Andrew Meadows
066e36c3e7 fix crash bugs (don't reference NULL pointers) 2015-05-04 16:52:36 -07:00
Eric Levin
6a987fdaf5 now conforming to coding standards 2015-05-04 16:40:04 -07:00
ZappoMan
3f8c52cdd4 attempt to fix unix build buster 2015-05-04 16:36:38 -07:00
Stephen Birarda
ff89831894 fix for object below array in JSONBreakableMarshal 2015-05-04 16:32:26 -07:00
ZappoMan
2c02bfdda5 fix build buster 2015-05-04 16:01:50 -07:00
ZappoMan
32ef0c2010 removed some dead code 2015-05-04 15:49:21 -07:00
ZappoMan
3827e961a7 hook sunBrightness to keyLightIntensity 2015-05-04 15:31:50 -07:00
Eric Levin
e097950277 added axis and angle helper methods to Quat class- script user can now get normalized axis and scalar angle from a quaternion 2015-05-04 15:22:10 -07:00
ZappoMan
403ed6d77b wire up sunlocation from keylight direction 2015-05-04 15:20:16 -07:00
ZappoMan
741323e6c1 wire up atmosphere.hasStars property 2015-05-04 14:19:13 -07:00
Sam Gateau
73177cd81d Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-04 14:07:59 -07:00
ZappoMan
cfe717fe08 only override environment when skyboxMode is atmosphere 2015-05-04 13:53:29 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Sam Gateau
ade404a74d getting rid of QSHaredPointer in favor of std::shared_ptr 2015-05-04 13:43:30 -07:00
Andrew Meadows
0932682c2a remove comment 2015-05-04 13:35:36 -07:00
Andrew Meadows
96acf96b76 entity-entity collision events emit signals again 2015-05-04 13:32:57 -07:00
ZappoMan
8c47736c3b add skybox mode property 2015-05-04 11:41:03 -07:00
Stephen Birarda
a039d5f28c Merge pull request #4753 from samcake/orange 
Introducing UserInputMapper
 2015-05-04 14:26:51 -04:00
ZappoMan
78f7870cbb more tweaks to atmosphere properties 2015-05-04 11:13:05 -07:00
Stephen Birarda
87e586dfe6 remove a stray space 2015-05-04 10:42:58 -07:00
Sam Gateau
936eefd4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-04 10:41:32 -07:00
Stephen Birarda
fb7646b02b add a QDebug for failed conversion in fromString 2015-05-04 10:32:49 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Bradley Austin Davis
fb3e309a64 Merge branch 'master' into plugins_pt1 2015-05-04 10:00:13 -07:00
Stephen Birarda
96b75b57fe Merge pull request #4754 from Atlante45/fix_local_injector_on_win 
Fix local injector modifying system volume
 2015-05-04 12:45:06 -04:00
Atlante45
12fcb35717 Made RenderArgs a default ctor 2015-05-04 17:22:46 +02:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Atlante45
1dcc2f7988 Fix local injector modifying system volume 2015-05-04 15:53:58 +02:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
Andrew Meadows
fef84730bf remake foundation for CollisionEvents 2015-05-03 09:27:15 -07:00
Andrew Meadows
cb37b884d2 add ObjectMotionState::getObjectID() 2015-05-03 09:26:49 -07:00
Andrew Meadows
35ed755b13 make EntityItem::getID() const 2015-05-03 09:26:28 -07:00