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

25087 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philip Rosedale
5fb79df4c9 dice don't go away unless 'X' key is clicked, added harmonicOscillator test script 2015-05-05 15:18:16 -07:00
samcake
5f19141050 Merge pull request #4773 from AndrewMeadows/bispinor 
fix crash in UserInputMapper::update() for invalid DeviceProxy
 2015-05-05 15:18:16 -07:00
Andrew Meadows
419cfee775 more correct fix for invalid DeviceProxy crash bug 2015-05-05 15:06:51 -07:00
Andrew Meadows
bbb8e2e076 merge upstream/master into andrew/bispinor 2015-05-05 15:00:19 -07:00
Andrew Meadows
0d4d5d024e revert last change (fix for invalid DeviceProxy) 2015-05-05 14:59:22 -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
David Rowe
35dbb9491c Merge branch 'master' into 20518 2015-05-05 13:13:49 -07:00
samcake
7ee4a1baca Merge pull request #4774 from ZappoMan/atmosphereInZones 
change skyboxMode to backgroundMode
 2015-05-05 12:54:35 -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
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
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
Andrew Meadows
00bea4d274 fix crash for NULL deviceProxy 2015-05-05 11:05:28 -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
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
Leonardo Murillo
fa9dfbe073 Merge pull request #4769 from birarda/master 
handle the case where a symlink replaces a copy
 2015-05-05 10:31:29 -06: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
Philip Rosedale
e9476029fb Merge pull request #4724 from jherico/menu_polish 
Menu polish
 2015-05-04 23:44:06 -07:00
David Rowe
7afd990e2e Fix Mixamo avatar clipping in HMD view 2015-05-04 22:27:41 -07:00
Philip Rosedale
4dfc329af2 Merge pull request #4770 from ericrius1/mouseGrab 
added rotation ability to grab script
 2015-05-04 21:22:05 -07:00
ZappoMan
4422c63c79 another sample for changing atmosphere properties 2015-05-04 20:31:37 -07:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
Eric Levin
39efde7e8c added rotation ability to grab script 2015-05-04 18:14:46 -07:00
Philip Rosedale
d52d3513a4 Merge pull request #4768 from jherico/track-camera 
Remove camera wobble caused by having a face tracker enabled
 2015-05-04 18:01:47 -07:00