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

19062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
39042f61cd 1P mirror can lean fwd/back 2014-11-26 19:57:18 -08:00
Philip Rosedale
983975e872 lets you grab an object and turn it near your face to better see it 2014-11-21 20:05:36 -06:00
Philip Rosedale
85419a3e2d limit max distance of movement, don't pull to 3P unless going back 2014-11-21 01:04:52 -06:00
Philip Rosedale
5d6d9ae0df cleaner version 2014-11-20 22:53:49 -06:00
Philip Rosedale
069f1be89d jump with number keys to preset places 2014-11-20 22:48:03 -06:00
Brad Hefta-Gaub
a8d718be82 Merge pull request #3843 from PhilipRosedale/master 
Fix jumpy eyes when turning toward or away from someone
 2014-11-20 20:01:58 -08:00
Philip Rosedale
e07f53d022 remove unused test audio filters 2014-11-20 19:57:24 -06:00
Philip Rosedale
6e89437bce simplify audio scope menu(s) 2014-11-20 19:34:56 -06:00
Philip Rosedale
9a9f6bc485 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 19:20:57 -06:00
Philip Rosedale
57d3bac805 Merge pull request #3844 from ZappoMan/sitEntityScript 
First cut at sit entity script
 2014-11-20 19:20:39 -06:00
Philip Rosedale
6dab28e6c5 Merge pull request #3846 from birarda/lobby 
fix for scaling of lobby and missing reticle
 2014-11-20 19:19:33 -06:00
Stephen Birarda
64d9dc4efa fix for scaling of lobby and missing reticle 2014-11-20 17:05:37 -08:00
Philip Rosedale
ddcd39ea65 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-20 18:51:04 -06:00
Philip Rosedale
2a260f86c8 Merge pull request #3845 from birarda/lobby 
tweaks for new lobby orb
 2014-11-20 18:46:43 -06:00
Philip Rosedale
d8a74a4db4 add max distance at which you will auto-magically look at someone else 2014-11-20 18:34:06 -06:00
Stephen Birarda
7f795ec67c repairs for new lobby shell 2014-11-20 16:20:32 -08:00
Stephen Birarda
4f879a06a6 fix flipped URLs for models in lobby 2014-11-20 16:11:08 -08:00
ZappoMan
3761f24619 fix stand up icon 2014-11-20 16:08:36 -08:00
Stephen Birarda
c15354d935 update lobby for new orb and panel wall 2014-11-20 15:44:05 -08:00
ZappoMan
ee6516970e first cut at entity script for sitting 2014-11-20 15:37:00 -08:00
ZappoMan
b2c342c5c7 add support for unload method 2014-11-20 15:36:28 -08:00
Philip Rosedale
cd2a6f0f9c merge fix 2014-11-20 17:35:50 -06:00
Philip Rosedale
e1ad9d3b4b Fix eyes jittering when turning away/toward someone 2014-11-20 17:26:11 -06:00
Brad Hefta-Gaub
5d2fd9df36 Merge pull request #3842 from AndrewMeadows/thermonuclear 
fix for crash in SkeletonModel::updateStandingFoot()
 2014-11-20 14:40:21 -08:00
Andrew Meadows
1b778603c8 fix for crash in SkeletonModel::updateStandingFoot() 2014-11-20 14:21:08 -08:00
Stephen Birarda
47f86fac68 have QAudioOutput cleaned up with injector thread 2014-11-20 13:48:29 -08:00
Stephen Birarda
0a6ffe3dbd Merge pull request #3841 from birarda/master 
fix oculus mode check for lobby
 2014-11-20 10:55:57 -08:00
Stephen Birarda
81b46d6c2c fix oculus mode check for lobby 2014-11-20 10:55:40 -08:00
Stephen Birarda
7d982abbcc Merge pull request #3838 from ZappoMan/removeVoxelEdit 
remove voxel edit
 2014-11-20 10:45:27 -08:00
Brad Hefta-Gaub
168487e0a7 Merge pull request #3840 from huffman/entity-snap-on-create 
Entity snap on create (+ remove getEntityItemID)
 2014-11-20 09:58:54 -08:00
Brad Hefta-Gaub
32f60c4255 Merge pull request #3839 from birarda/master 
trim whitespace for place name lookup, potential lobby crash fix
 2014-11-20 09:57:39 -08:00
ZappoMan
13b9bc6f5b Merge branch 'master' of https://github.com/highfidelity/hifi into removeVoxelEdit 
Conflicts:
	voxel-edit/src/SceneUtils.cpp
 2014-11-20 09:53:07 -08:00
Brad Hefta-Gaub
ec23200e7c Merge pull request #3837 from Atlante45/death_to_dot_f 
Death to the '.f's
 2014-11-20 09:51:56 -08:00
ZappoMan
3d082160ec fix build buster 2014-11-20 09:42:11 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Stephen Birarda
f3b5102969 remove texture replace fix to avoid a crash 2014-11-20 09:38:41 -08:00
Stephen Birarda
1aa98dfc4c trim whitespace for place name lookup 2014-11-20 09:24:43 -08:00
Ryan Huffman
6f0d5faa5b Update tools to snap to grid on creation 2014-11-20 09:20:22 -08:00
Philip Rosedale
5101e469dc Merge branch 'master' of https://github.com/worklist/hifi 2014-11-19 23:54:31 -06:00
ZappoMan
08ca861b6f remove voxel edit 2014-11-19 17:30:26 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Clément Brisset
2c6a76ec17 Merge pull request #3830 from huffman/entity-list-window 
Entity list window
 2014-11-19 17:05:48 -08:00
Brad Hefta-Gaub
c91f846fb5 Merge pull request #3836 from birarda/master 
have AssignmentClientMonitor catch SIGTERM and cleanup
 2014-11-19 17:00:33 -08:00
Brad Hefta-Gaub
925e2fab66 Merge pull request #3835 from birarda/lobby 
lobby changes, Sound and AudioInjectorOptions stereo tweaks
 2014-11-19 16:59:54 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
63be5ae9bf Merge pull request #3834 from ZappoMan/fixMissingRegistrationPointBug 
fix a major bug in updateEntity() caused by the new properties not containing "registrationPoint"
 2014-11-19 16:42:16 -08:00
Brad Hefta-Gaub
270939dee4 Merge pull request #3833 from AndrewMeadows/thermonuclear 
flag EntityItem when changed by update
 2014-11-19 16:40:40 -08:00
Stephen Birarda
dac980d433 have AssignmentClientMonitor catch SIGTERM and cleanup 2014-11-19 16:40:19 -08:00
Brad Hefta-Gaub
75304fd419 Merge pull request #3832 from Atlante45/fix_left_right_jumping 
Fix left/right audio jumping
 2014-11-19 16:40:04 -08:00
Brad Hefta-Gaub
3a8e89f754 Merge pull request #3831 from ey6es/master 
Clear the saccade when Faceshift is active.
 2014-11-19 16:39:18 -08:00