Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 10:36:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27607 commits 71 branches 56 tags 1.2 GiB
Commit graph

767 commits

Author SHA1 Message Date
David Rowe
7afd990e2e Fix Mixamo avatar clipping in HMD view 2015-05-04 22:27:41 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
ZappoMan
664d126465 remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit 2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693 dont change camera scale with avatar scale 2015-04-28 16:26:17 -07:00
ZappoMan
bfbad539e0 hack test 2015-04-28 14:54:58 -07:00
ZappoMan
62a421361c fix crash in scripts using useAvatar methods 2015-04-27 16:58:34 -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
Andrew Meadows
7cd9023e23 build Avatar shape on SkeletonModel load 2015-04-24 13:26:26 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
Brad Hefta-Gaub
72f9ae3e85 Merge pull request #4643 from ctrlaltdavid/fix-auto-start-animation 
Fix auto start animation
 2015-04-15 10:14:26 -07:00
David Rowe
2c5201f116 Fix animation not automatically starting at start-up 2015-04-14 16:54:14 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
ZappoMan
174e9f2133 more tweaks to preferences UI 2015-04-14 12:38:29 -07:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation 
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
 2015-04-13 23:57:08 +01:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting 
CR for Animation fixes
 2015-04-09 11:39:13 +02:00
Andrew Meadows
40c94fa00e merge upstream/master into andrew/isentropic 2015-04-07 16:23:38 -07:00
Andrew Meadows
b5f0c57dd1 jumping and hovering works with dynamic controller 2015-04-07 15:07:46 -07:00
David Rowe
09b929b729 Restart looped animation running at shutdown when Interface starts 2015-04-07 14:02:24 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
ZappoMan
0bc1b02895 improvements to tracking model names 2015-04-03 17:24:53 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
ZappoMan
aaf191b6dc first cut at new avatar preferences UI 2015-04-03 14:31:43 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Andrew Meadows
f804b2311d remove hover-friendly behavior 2015-04-02 08:40:47 -07:00
Andrew Meadows
b37384d759 exit hover now not quite automatic when over floor 
remove MyAvatar::jump() method for more general API
 2015-04-01 15:13:27 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
Andrew Meadows
821ac605f5 smoother motion on steps 
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
 2015-03-26 19:48:52 -07:00
Andrew Meadows
d497620976 avatar can jump with E key when walking 2015-03-24 23:05:46 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Brad Hefta-Gaub
96bfb96936 Merge pull request #4468 from ctrlaltdavid/20399 
CR for 20399 - Fix near field clipping on avatars with large heads
 2015-03-19 20:02:17 -07:00
David Rowe
648a2e3b1d Set clip distance on rendering frustum rather than camera 
This fixes wrong clipping distance used for rendering in FPV if also
have rear view mirror.
 2015-03-18 12:43:49 -07:00
David Rowe
7b54443bda Adjust clip distance as HMD head moves backwards 2015-03-17 16:33:20 -07:00
David Rowe
a04bd09b83 Set clip near distance per skeleton model if no separate head model 2015-03-17 16:32:59 -07:00
Ryan Huffman
870f1112e4 Fix thrust not being applied w/ Physics + Avatar 2015-03-17 16:17:44 -07:00
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Stephen Birarda
471e55c8ce fix some lingering warnings 2015-03-12 12:36:39 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Seth Alves
ac0c4e8512 cap max speed at MAX_WALKING_SPEED 2015-03-04 19:57:06 -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
b4998e9c53 falling onto an object works 2015-03-04 08:48:48 -08:00
David Rowe
aad3f1dfd9 Automatically switch to default model if avatar model is skeletonless 2015-03-03 22:34:07 -08:00
David Rowe
30b77d4200 Don't crash if avatar model at start-up or loaded is skeletonless 2015-03-03 22:34:06 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -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
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
Stephen Birarda
fc2f6d47bb remove references to PrioVR in interface code 2015-02-26 17:28:00 -08:00
Atlante45
fdf9fdd877 Relax head/lean when not tracking 2015-02-26 20:05:47 +01:00
Atlante45
e37ef226fc Simplify lookForward compute 2015-02-26 19:21:14 +01:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
09a9f82256 More settings update 2015-02-03 10:52:50 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Stephen Birarda
f885dc229b final fixes for Audio includes in Interface 2015-01-21 12:31:10 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Atlante45
2b3f12a7c4 More settings hooks 2015-01-20 16:52:42 -08:00
Atlante45
e4fa9e508e Moved loadSetting to MyAvatar 2015-01-20 00:56:25 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu 
Moved them to ViewFrustum
 2015-01-17 22:37:02 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-01-14 17:55:03 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
ZappoMan
873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/Menu.h
 2015-01-06 12:27:16 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
ZappoMan
7cf4bd1860 remove head mouse 2015-01-05 16:29:02 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
fbfa40e3c9 remove hair 2014-12-30 13:44:25 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -08:00
Stephen Birarda
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
Stephen Birarda
e86c5ff683 remove Audio dependency on Menu 2014-12-16 15:45:17 -08:00
Stephen Birarda
e0752cef54 remove collision sound creation calls 2014-12-16 15:35:37 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -08:00