Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 21:47:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19216 commits 25 branches 0 tags 1.1 GiB
Commit graph

19216 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
6e89437bce simplify audio scope menu(s) 2014-11-20 19:34:56 -06:00
Andrzej Kapolka
2adb519193 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 17:34:51 -08:00
Andrzej Kapolka
03e302c508 Removed a debug statemen. 2014-11-20 17:34:37 -08: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
Andrzej Kapolka
d4693232d3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 17:17:09 -08:00
Andrzej Kapolka
f2f7335f58 Increase the block size, reduce the overhead. 2014-11-20 17:16:52 -08: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
Andrzej Kapolka
1e294e043b Batch voxel drawing, too. 2014-11-20 16:37:37 -08: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
Andrzej Kapolka
da85714dc8 Batch heightfield sections for better performance. 2014-11-20 15:09:38 -08: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
Andrzej Kapolka
53809803dd These edits need to be sent reliably 2014-11-20 12:56:56 -08:00
Andrzej Kapolka
d351a65999 Increase the smoothing cutoff. 2014-11-20 12:09:33 -08:00
Andrzej Kapolka
0a976ad262 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 11:26: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
Sam Gateau
7daff18101 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-20 09:57:59 -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
Sam Gateau
764ad72471 adding the light map support from FBX 2014-11-20 09:54:41 -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
Andrzej Kapolka
fa122b505a Further improvement to normals. 2014-11-19 17:38:45 -08: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
Andrzej Kapolka
82fc75b2c4 Tweak to normal computation on dual contour surfaces. 2014-11-19 17:27:10 -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