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

7348 commits

Author SHA1 Message Date
Sam Gateau
dd0d45cdc5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-05 10:21:12 -08:00
Sam Gateau
00a9f55bc3 lightings seems to work correctly now 2015-02-05 10:20:19 -08:00
Andrew Meadows
b4da2ddd52 fix physics crash on disconnect from domainserver 2015-02-05 09:13:32 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Sam Gateau
8e1eebbbd4 FInally getting the angular attenuation 2015-02-04 17:24:23 -08:00
Clément Brisset
6a4577b6a5 Merge pull request #4231 from ZappoMan/crashonexit 
BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics
 2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub
af91eee5a0 Merge pull request #4220 from sethalves/rework-bandwidth-meter 
fix several signed/unsigned comps, avoid sprintf in overlay code
 2015-02-04 16:06:22 -08:00
Stephen Birarda
93a3158153 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-04 15:16:23 -08:00
ZappoMan
8fd11e70cc clamp dt for skipTimeForward to prevent near infinite loops 2015-02-04 15:16:18 -08:00
Stephen Birarda
c9c53453c3 repairs to local audio injector cleanup 2015-02-04 14:47:18 -08:00
Brad Davis
02f2f1c1bf Fixing header order and code style 2015-02-04 14:36:03 -08:00
Brad Hefta-Gaub
97f888b340 Merge pull request #4227 from huffman/internal-delete-fix 
Add force delete to internal EntityTree deletes
 2015-02-04 14:02:34 -08:00
Sam Gateau
6c00f29f2b REvisiting the shaders for lighting on deferred pass 2015-02-04 14:01:16 -08:00
ZappoMan
698fcd8116 fix crash on shutdown 2015-02-04 13:54:14 -08:00
Sam Gateau
3c30e70c12 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-04 13:32:02 -08:00
Sam Gateau
7d6161598b REvisiting the shaders for lighting on deferred pass 2015-02-04 13:31:39 -08:00
ZappoMan
4061e14c2d move static members of ResourceManager into DependencyManager 2015-02-04 13:24:37 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Philip Rosedale
fe3f01be7e Merge pull request #4225 from ZappoMan/memleak 
actually delete resources... even on windows
 2015-02-04 11:57:54 -08:00
Stephen Birarda
9461d5d8d1 drop samples from ring buffer if muted 2015-02-04 11:47:53 -08:00
Seth Alves
bcf0846310 merge from master 2015-02-04 11:30:22 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Seth Alves
a645d784d8 uint32_t rather than uint, which mac doesn't like 2015-02-04 11:26:05 -08:00
Stephen Birarda
e47333a808 specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
Stephen Birarda
30afadc7b7 fixes for new settings API 2015-02-04 10:53:05 -08:00
Ryan Huffman
2b00e3fadc Add force option to deleteEntity 2015-02-04 10:49:49 -08:00
ZappoMan
ded035094a actually delete resources... even on windows 2015-02-04 10:45:04 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
a2002d169f fix for exception handled lookup in LimitedNodeList 2015-02-04 10:27:33 -08:00
Brad Davis
0dcf5b001f Some more cleanup 2015-02-03 23:26:15 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
d34c2ae26a Merge branch 'master' into develop 2015-02-03 23:06:49 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
53b0fd409d Tweaking text scaling value to more closely match old text renderer 2015-02-03 22:30:39 -08:00
Brad Davis
1af2b65714 Fixing scaling to lineHeight 2015-02-03 22:21:32 -08:00
Brad Davis
77ce737f61 Working on porting renderable text item to new code 2015-02-03 22:11:24 -08:00
Brad Davis
9a6175a3b9 Starting to work on replacement for clip planes 2015-02-03 22:10:44 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub
01f594b535 Merge pull request #4221 from AndrewMeadows/bispinor 
proof Andrew has a working Windows build on his laptop
 2015-02-03 19:07:01 -08:00
Brad Davis
0c78af9abb Working on text rendering refactor 2015-02-03 18:57:39 -08:00
Atlante45
fc4bf0c325 Don't check gl errors 2015-02-03 18:55:52 -08:00
Atlante45
7a03daa76f Inline setFieldOfView 2015-02-03 18:51:26 -08:00
Brad Hefta-Gaub
79b04afaf8 Merge pull request #4210 from ctrlaltdavid/20280 
CR for Job #20280 - Warn if Interface and Stack have incompatible build level
 2015-02-03 18:51:17 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
Brad Davis
190669d168 Merge branch 'master' into develop 2015-02-03 18:43:51 -08:00
Brad Davis
cab31e7190 Working on text coordinates 2015-02-03 18:43:24 -08:00
Andrew Meadows
547a416c3b merge upstream/master into andrew/bispinor 2015-02-03 18:33:10 -08:00
Sam Gateau
1029af140e tiny bit different... 2015-02-03 18:15:20 -08:00
Seth Alves
450787fde2 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-02-03 17:33:27 -08:00
Sam Gateau
6ad484e13f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 17:26:27 -08:00
Sam Gateau
e502105ad7 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 17:16:48 -08:00
Atlante45
e4591e0d03 Work arount for QVariant not converting to QVariant 2015-02-03 17:11:32 -08:00
Seth Alves
8489ee04f3 fix a couple of signed vs unsigned comparisons. 2015-02-03 16:11:04 -08:00
Sam Gateau
5719e277dd FIx the lightmap not displaying when using the texcoord0 2015-02-03 16:10:31 -08:00
Stephen Birarda
dc84c336ea handle login failure, have AccountManager generate keypair 2015-02-03 16:09:06 -08:00
Stephen Birarda
64fda3253e add a LoginDialog and pass credentials to AccountManager 2015-02-03 15:53:07 -08:00
David Rowe
d9e353e498 Merge branch 'master' into 20280 
Conflicts:
	libraries/networking/src/LimitedNodeList.h
 2015-02-03 14:46:27 -08:00
Sam Gateau
d8d0a28d0f FInd a solution for lightmap without 2nd uvset 2015-02-03 14:34:11 -08:00
Atlante45
78a9d002db Remove settings from InboundAudioStream 2015-02-03 12:47:25 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Atlante45
aacf61609f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-03 10:53:44 -08:00
Seth Alves
d2c70936e3 coding standard, remove unneeded asserts 2015-02-03 10:51:35 -08:00
Sam Gateau
280b41c23a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 10:43:48 -08:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Andrew Meadows
90202591fc remove legacy shapes from EntityItem and friends 2015-02-03 10:05:39 -08:00
Andrew Meadows
28a3c3f469 separate new shape types from legacy 2015-02-03 08:34:06 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
68448daa18 Moving closer to the original coordinate system 2015-02-02 23:29:46 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Atlante45
5388ed1c4a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-02 18:38:09 -08:00
Atlante45
f0b5cd195d Renaming + end of file spaces 2015-02-02 18:37:49 -08:00
Sam Gateau
5c4a8a5cda Fixing the spotlight 2015-02-02 17:24:26 -08:00
Atlante45
9abdb41764 Rearrange settings classes in correct files 2015-02-02 17:17:19 -08:00
Stephen Birarda
28d710877c remove application calls from audio-client 2015-02-02 17:13:08 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Andrew Meadows
0b78156956 remove unnecessary #includes 2015-02-02 16:45:51 -08:00
Andrew Meadows
156c4fcc9f removing legacy collision detection code in Octree 2015-02-02 16:42:05 -08:00
Sam Gateau
16f12dd267 working on the point light shader edge representation 2015-02-02 16:31:36 -08:00
Atlante45
633ec9807d New settings api 2015-02-02 15:56:03 -08:00
Seth Alves
38162380ad coding standard 2015-02-02 15:37:28 -08:00
Seth Alves
82b8595af8 coding standard 2015-02-02 15:34:08 -08:00
Seth Alves
c1ae98fa1a quiet some compiler warnings about signed vs unsigned comparisons 2015-02-02 15:02:29 -08:00
Seth Alves
e779a55e22 remove stray debugging line 2015-02-02 12:30:11 -08:00
Seth Alves
4377105410 formatting and cleanups 2015-02-02 12:13:54 -08:00
Seth Alves
779a0086c4 BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second 2015-02-02 11:56:50 -08:00
Sam Gateau
2eb3c92e1d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-02 11:19:08 -08:00
Sam Gateau
0da38c103f working on the spot light shader 2015-02-02 11:17:35 -08:00
Seth Alves
f1cca2ac92 move bandwidth stats display details out of recorder class into dialog class 2015-02-02 09:26:09 -08:00
Seth Alves
c0a219678c use DependencyManager to keep track of BandwidthRecorder 2015-02-02 08:55:55 -08:00
Seth Alves
b85456b1e9 refactoring, cause BandwidthDialog to only update numbers once per second 2015-02-02 05:28:28 -08:00
Brad Davis
ab1624b0a8 Adding matrix stack (currently not used 2015-02-01 16:25:17 -08:00
Brad Davis
711506e055 Moving implementation details out of header 2015-02-01 14:15:34 -08:00
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08:00
Seth Alves
fc07ecf83d use BandwidthRecorder rather than recompute Mbps and pps in Application 2015-01-31 20:40:18 -08:00
Seth Alves
bee895ba0a capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
3c7cdc16ce Merge branch 'master' into 20280 
Conflicts:
	interface/src/Application.h
 2015-01-30 18:44:14 -08:00
Brad Hefta-Gaub
2eeb2a5ec5 Merge pull request #4205 from AndrewMeadows/isentropic 
small models get box collision shape
 2015-01-30 18:30:55 -08:00
Andrew Meadows
a723c748f5 check initialization of _needsInitialSimulation 2015-01-30 18:08:00 -08:00
Sam Gateau
56925cee00 Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-01-30 17:04:27 -08:00
Sam Gateau
c3e1311ed1 avoid recreating lights every frame, just have a pool of lights edited each frames 2015-01-30 17:03:28 -08:00
dev
6eca52e4f2 point light is working with Mac 2015-01-30 17:01:46 -08:00
Andrew Meadows
9da6b623a3 move shape polymorphism to ModelEntityItem 2015-01-30 16:25:35 -08:00
Andrew Meadows
bc52ba1d29 restore polymorphism for Box and Sphere entities 2015-01-30 16:18:50 -08:00
David Rowe
729fbbf5ac A further custom User-Agent string 2015-01-30 15:56:01 -08:00
Andrew Meadows
80f6f718d0 EntityItem base class now computes shapeInfo 2015-01-30 14:17:29 -08:00
Andrew Meadows
b035c5b082 fix for updating moving models 2015-01-30 14:16:32 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Atlante45
0cc4f5b226 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-30 13:30:17 -08:00
Sam Gateau
38129c2988 Merging with latest build 2015-01-30 12:58: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
19ea9724ab Re-add accidentally removed int size() 2015-01-30 11:41:14 -08:00
Sam Gateau
228e629856 working on the spot light now 2015-01-30 11:40:44 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Sam Gateau
19047f000a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-30 10:20:55 -08:00
Stephen Birarda
3af97b7f8d show GVRInterface in full screen on Android 2015-01-30 10:16:48 -08:00
samcake
331104d1c6 Merge pull request #4194 from thoys/texture-max-area-2M 
changing texture size limit from 1024*1024 to 2M  i.e. (1024 * 2048).
 2015-01-29 17:33:35 -08:00
ZappoMan
66567fd89d CR feedback 2015-01-29 17:24:56 -08:00
ZappoMan
c1bb03e9a8 CR feedback 2015-01-29 17:23:48 -08:00
Thijs Wenker
ff29b1c8cc style/conversion fixes 2015-01-30 02:18:51 +01:00
Sam Gateau
264435b695 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-29 17:14:11 -08:00
Sam Gateau
976239d433 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-29 17:12:32 -08:00
Sam Gateau
471da3935d working on the lighting 2015-01-29 17:11:50 -08:00
Thijs Wenker
a4c82072a2 changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048). It's dynamic and resizes the texture to the best fit within the 2M area. 2015-01-30 02:00:35 +01:00
Atlante45
ff5ce25d19 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-29 16:55:51 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Atlante45
6b7a391885 move a couple avatar initialisations outside avatar maanger 2015-01-29 16:00:57 -08:00
Atlante45
9095eeeeb9 Return WeakPointer in avatarHashMap 2015-01-29 15:50:59 -08:00
Sam Gateau
a2ec6ea2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-29 15:35:15 -08:00
Sam Gateau
b2f16be92a Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:17:55 -08:00
Stephen Birarda
d7ad20e476 fix gpu CMakeLists for Android 2015-01-29 15:01:15 -08:00
Brad Hefta-Gaub
f5e092c0d2 Merge pull request #4187 from huffman/parallel-script-loading 
Parallel script loading
 2015-01-29 13:26:37 -08:00
ZappoMan
534575fd10 fix a couple bugs in 3d textured version of renderQuad 2015-01-29 13:16:14 -08:00
Stephen Birarda
763994da5a handle gverb move to audio-client 2015-01-29 12:44:03 -08:00
ZappoMan
418b97a648 attempt to get color working for 3d textured quads 2015-01-29 12:04:34 -08:00
ZappoMan
87e91a5a94 Revert "attempt to get color working for 3d textured quads" 
This reverts commit 0f390a98b8.
 2015-01-29 11:44:36 -08:00
Stephen Birarda
d3828c7d89 remove gverb from externals 2015-01-29 11:05:16 -08:00
Atlante45
ff88b7d4e6 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 10:59:54 -08:00
ZappoMan
0f390a98b8 attempt to get color working for 3d textured quads 2015-01-29 10:50:13 -08:00
Stephen Birarda
fa166f012f set size of GVRMainWindow to note 4 size 2015-01-29 10:11:46 -08:00
ZappoMan
4abb2481d6 removed old comment 2015-01-29 10:10:53 -08:00
Ryan Huffman
e6caefa023 Add comment to ScriptEngine::include() 2015-01-29 09:08:55 -08:00
Ryan Huffman
ce9e8910e4 Add callback to QScriptEngine::include(QString) 2015-01-29 09:04:57 -08:00
ZappoMan
5d2df7b03f implement color for dashed lines 2015-01-28 18:51:23 -08:00
ZappoMan
efb044ea5e change renderDashedLine() to take a color paramter 2015-01-28 15:08:59 -08:00
ZappoMan
7bd45ba0ca change removing more glColor calls 2015-01-28 14:52:33 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
Atlante45
5bc98f5258 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-28 13:14:08 -08:00
Atlante45
d68b59d4c7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:58 -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
Stephen Birarda
f1c6d26ed1 don't explicitly require LibOVR for android build 2015-01-28 11:20:25 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
ZappoMan
6821f31f14 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	libraries/gpu/src/gpu/GLBackend.cpp
 2015-01-28 10:46:30 -08:00
ZappoMan
30f985a6fe some cleanup 2015-01-28 10:30:05 -08:00
Sam Gateau
3e9e13ce01 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-28 10:27:40 -08:00
Sam Gateau
dc01611f26 Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded 2015-01-28 10:22:37 -08:00
Sam Gateau
3953a4c8c7 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-28 00:10:20 -08:00
Sam Gateau
b6836af071 improving on the poin light attenuatiion formula 2015-01-28 00:09:15 -08:00
ZappoMan
9631761f70 get sphere normals correct 2015-01-27 21:39:59 -08:00
ZappoMan
e7742351b7 get sizing for spheres to work properly 2015-01-27 20:30:58 -08:00
Brad Hefta-Gaub
8994b9f51c Merge pull request #4182 from AndrewMeadows/isentropic 
fix bad integration of rapidly spinning objects
 2015-01-27 18:33:31 -08:00
Brad Hefta-Gaub
aa2011a543 Merge pull request #4160 from samcake/temp0 
Introducing the gpu::Texture class and using it for model rendering
 2015-01-27 18:30:06 -08:00
Atlante45
98fc1836d8 Revert "Use QDickCache for every QNAM" 
This reverts commit 2f39b93823.
 2015-01-27 18:09:22 -08:00
Andrew Meadows
58bb137c4d bulletRotationStep --> computeBulletRotationStep 2015-01-27 17:37:12 -08:00
Andrew Meadows
23bd3f90d9 Bullet-style rotation integration for kinematics 
and for dead reckoning after wire-transfer
 2015-01-27 17:27:15 -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
Andrew Meadows
b9ac5bb915 merge upstream/master into andrew/isentropic 2015-01-27 16:24:45 -08:00
Andrew Meadows
d1cf6559c5 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
 2015-01-27 16:24:11 -08:00
Andrew Meadows
026c39e010 Merge pull request #4131 from Atlante45/pull_out_menu_mess 
Settings - Part I
 2015-01-27 16:23:23 -08:00
Atlante45
505f3f143b Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 16:13:35 -08:00
Andrew Meadows
d5c0c200de optimization for when physics engine doesn't step 2015-01-27 15:54:32 -08:00
Andrew Meadows
aebdd3b335 fix bad extrapolation of rapidly spinning objects 2015-01-27 15:53:37 -08:00
Sam Gateau
b9bbd7745f Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-01-27 15:48:34 -08:00
Sam Gateau
db427cdf5e adding Light class in model and the shader in render utils 2015-01-27 15:45:10 -08:00
Sam Gateau
ae3233b119 in the middle of something 2015-01-27 15:44:10 -08:00
Sam Gateau
f619acc3b5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-27 15:43:27 -08:00
Sam Gateau
4592bdcb4f fixes after review by Brad 2015-01-27 15:42:56 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
 2015-01-27 15:04:17 -08:00
Stephen Birarda
d420674edd apply orientation change to listening position for audio 2015-01-27 14:50:02 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Ryan Huffman
7ececd793a Fix failing QMetaObject::invokeMethod call 2015-01-27 13:59:46 -08:00
David Rowe
44083dd343 Add user warning if domain has mismatched packet versions 2015-01-27 13:10:11 -08:00
Andrew Meadows
e2ffe00c38 Merge pull request #4172 from huffman/fix-image-overlay-rescale 
Fix image overlay rescale
 2015-01-27 13:07:15 -08:00
Brad Hefta-Gaub
a46fda3749 Merge pull request #4174 from huffman/delete-entity 
Update deleteEntity to obey entity locked property
 2015-01-27 13:05:05 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Andrew Meadows
f2f054f689 Merge pull request #4161 from ey6es/master 
Partial implementation of "granularity" setting for metavoxel tools.
 2015-01-27 12:52:32 -08:00
ZappoMan
23892ab1e7 fixed comments 2015-01-27 11:38:14 -08:00
ZappoMan
94e04e2d7d removed extra whitespace 2015-01-27 11:34:46 -08:00
ZappoMan
b1586d4f90 move debug into ifdef 2015-01-27 11:29:17 -08:00
ZappoMan
45dbff67f8 more hacking 2015-01-27 11:15:33 -08:00
Atlante45
0f8e10b275 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 11:14:36 -08:00
Ryan Huffman
9fd352e1dc Break long lines in TextureCache.h/cpp 2015-01-27 10:27:05 -08:00
Ryan Huffman
f65640a593 Update EntityTree.cpp to not delete entity when locked 2015-01-27 10:24:54 -08:00
Ryan Huffman
86f7c28ee9 Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked 2015-01-27 10:24:28 -08:00
Ryan Huffman
1f6932bdcb Update TextureCache to store original image dimensions (pre-scale) 2015-01-27 08:09:20 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
 2015-01-27 01:21:33 -08:00
ZappoMan
83d1cc911a hacking 2015-01-26 19:38:24 -08:00
Atlante45
f84f6e9b66 Restore joints state on stopAnimation 2015-01-26 19:12:18 -08:00
ZappoMan
02c0700db3 support for skipping forward on new edit packets from server 2015-01-26 17:25:06 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
ZappoMan
81185cfe56 removed some debugging 2015-01-26 12:46:22 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
ZappoMan
73b9c06ec0 added some debugging 2015-01-26 11:13:30 -08:00
Stephen Birarda
4198d1d5ca disable output starve detection on android 2015-01-26 10:07:24 -08:00
ZappoMan
f85774c687 adding some debugging 2015-01-26 09:45:33 -08:00
Sam Gateau
1a044b4ea6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-23 23:31:24 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Andrzej Kapolka
23f9c799dd Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-23 18:20:14 -08:00
Andrzej Kapolka
34110b6745 Partial subdivision implementation. 2015-01-23 18:19:45 -08:00
Sam Gateau
c05d627cc1 Clean up 2015-01-23 17:13:26 -08:00
Andrew Meadows
eb4678659a remove EntityItem::getDistanceToBottomOfEntity() 
and also isRestingOnSurface()
 2015-01-23 15:56:44 -08:00
ZappoMan
9a0576adfb remove setting last simulated in setLastEdited() because it may cause problems 2015-01-23 15:54:26 -08:00
ZappoMan
9cc61e90f7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-01-23 15:01:35 -08:00
Andrew Meadows
1ad5f9c7db merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
 2015-01-23 14:04:26 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively 
increasing resolution.
 2015-01-23 13:58:51 -08:00
ZappoMan
c01d2d657c added comment 2015-01-23 13:55:12 -08:00
ZappoMan
fa485d21b7 added comment 2015-01-23 13:52:28 -08:00
ZappoMan
3c38a9eb53 add last simulated to the protocal 2015-01-23 13:32:38 -08:00
Andrew Meadows
b34189115d Merge branch andrew/isentropic 2015-01-23 13:21:45 -08:00
Andrew Meadows
36c20c24fe fix for velocity in units of domain size 2015-01-23 13:20:12 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Andrew Meadows
f2bcdfa2b4 update _lastSimulated for kinematic motion 2015-01-23 13:10:41 -08:00
Stephen Birarda
5b81fa27fc fix for DEFAULT_NODE_AUTH_URL 2015-01-23 13:05:02 -08:00
Atlante45
9e923c453f Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-23 12:59:10 -08:00
Atlante45
ee9f183e14 Update static flag 2015-01-23 12:14:54 -08:00
Atlante45
a616edbb55 Remove avatars dependency on model,gpu,fbx (OpenGL) 2015-01-23 12:14:13 -08:00
Atlante45
bbf6ae7b01 Move Faceshift constants to their own file in shared 2015-01-23 12:11:08 -08:00
Atlante45
6d9deffdaa Remove avatars dependency to octree 2015-01-23 11:58:22 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Stephen Birarda
a3b92e05da support 44.1 for the note 4 2015-01-23 11:48:23 -08:00
Atlante45
9f58865937 Add AvatarHashMap and AvatarManager to DM 2015-01-23 11:46:11 -08:00
Sam Gateau
0d3f9c740d duplicate cleaning code at the end of Model renderCore 2015-01-23 11:14:17 -08:00
Andrew Meadows
eefd32b42b remove KinematicController classes 2015-01-23 11:04:02 -08:00
Andrew Meadows
d173afaa70 add support for non-physical kinematic movement 2015-01-23 11:01:46 -08:00
Sam Gateau
4151833549 cleaning up for pull request 2015-01-23 10:49:04 -08:00
Stephen Birarda
39d9d99045 fix for local loop resample 2015-01-23 10:02:03 -08:00
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -08:00
Stephen Birarda
871d688db9 handle input to output resampling 2015-01-23 09:23:46 -08:00
Sam Gateau
80784a7a33 fixing a bug in texture storage when accessing mip #0 2015-01-22 16:57:33 -08:00
Stephen Birarda
8544fccd84 use soxr resampling for loopback and output 2015-01-22 16:50:42 -08:00
Sam Gateau
258b5fd5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 16:28:05 -08:00
Sam Gateau
49dde269a6 experimenting with linear space vs srgb space 2015-01-22 16:27:17 -08:00
Stephen Birarda
0440576dc2 use libsoxr for input to network resampling 2015-01-22 16:04:57 -08:00
Ryan Huffman
22cdf1cb22 Remove BatchLoader::errorLoadingFile and reorder properties 2015-01-22 14:24:20 -08:00
Ryan Huffman
e27db48e26 Remove qDebug and unnecessary include 2015-01-22 14:20:42 -08:00
Ryan Huffman
b4132f1e7d Remove commented line 2015-01-22 14:16:36 -08:00
Ryan Huffman
38b38eb063 Update ScriptEngine to use BatchLoader 2015-01-22 14:14:21 -08:00
Ryan Huffman
958d853b56 Add BatchLoader 2015-01-22 14:13:54 -08:00
Stephen Birarda
102f076412 look for soxr and not redundant libsoxr 2015-01-22 14:09:29 -08:00
Stephen Birarda
aa6e1607e2 add libsoxr for audio resampling 2015-01-22 14:06:05 -08:00
Andrew Meadows
355759d3d4 Merge pull request #4152 from ZappoMan/fixGlitches 
Fix glitches in bullets and multiple viewers
 2015-01-22 13:49:00 -08:00
ZappoMan
d34764bd55 fix whitespace diff 2015-01-22 13:33:59 -08:00
ZappoMan
6a9a6968f2 debugging stutter 2015-01-22 13:32:57 -08:00
ZappoMan
c6ad1462e6 debugging stutter 2015-01-22 13:31:59 -08:00
ZappoMan
838a549abe debugging stutter 2015-01-22 13:31:09 -08:00
ZappoMan
14c7dc8eb9 debugging stutter 2015-01-22 13:13:18 -08:00
Sam Gateau
aecc8b85bd Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 12:40:30 -08:00
dev
03a5c398ec splitting the GLBackend.cpp in several files and fixing the build for mac 2015-01-22 12:38:24 -08:00
Brad Hefta-Gaub
ad209ee731 Merge pull request #4150 from AndrewMeadows/bispinor 
remove ground collision hack for physics testing
 2015-01-22 10:56:36 -08:00
Andrew Meadows
b2f2a3ad27 Merge pull request #4149 from huffman/improve-loading 
Update ImageOverlay to use TextureCache
 2015-01-22 09:26:10 -08:00
Andrew Meadows
3997b916c1 remove ground collision hack for physics testing 2015-01-22 09:17:51 -08:00
Andrew Meadows
77c4362991 fix typo 2015-01-21 18:14:24 -08:00
Andrew Meadows
b2e79a0157 don't process results when no simulation 2015-01-21 18:06:19 -08:00
Andrew Meadows
2751fab2c3 don't send collision events for inactive pairs 
also throttle collision events to 30/sec
 2015-01-21 18:02:13 -08:00
ZappoMan
9152865116 first cut at supporting streamized spheres 2015-01-21 16:56:41 -08:00
ZappoMan
02a68096c3 add debug for vec4 2015-01-21 16:56:04 -08:00
Sam Gateau
ea37d7cfd0 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-21 16:55:25 -08:00
Sam Gateau
1e84f260a9 Removing gl calls for texture from TextureCache 2015-01-21 16:53:35 -08:00
ZappoMan
d3ae9af8ed Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-21 15:18:41 -08:00
Ryan Huffman
53a70c43e1 Add width and height to NetworkTexture 2015-01-21 15:08:38 -08:00
Andrew Meadows
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -08:00
Stephen Birarda
25016ef157 have RenderingClient handle returned audio frames 2015-01-21 14:10:29 -08:00
Andrew Meadows
1c38b08e8f remane emitEntityCollision... to entityCollision... 2015-01-21 14:07:23 -08:00
Stephen Birarda
a3529e745b fix warning and compile with Multimedia 2015-01-21 13:28:18 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Stephen Birarda
e34fb66be7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-21 12:41:20 -08:00
Stephen Birarda
1a87fa93f4 output signals from AudioClient for I/O bytes 2015-01-21 12:33:20 -08:00
Stephen Birarda
707973f1e5 solve collision in PositionGetter with AddressManager 2015-01-21 12:05:12 -08:00
Stephen Birarda
d2af9a2911 have Application pass audio pos/orientation to AudioClient 2015-01-21 12:03:11 -08:00
Andrew Meadows
6840daa0b5 removing tabs from formatting 2015-01-21 11:55:28 -08:00
Stephen Birarda
e28ca27ccd add a position and orientation getter for AudioClient 2015-01-21 11:55:12 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Andrew Meadows
e49c76656f merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
 2015-01-21 11:35:36 -08:00
Andrew Meadows
86583f3f3f physics collisions emit script collision events 2015-01-21 11:27:32 -08:00
Atlante45
11ea3e4047 Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-21 11:15:31 -08:00
Atlante45
2f39b93823 Use QDickCache for every QNAM 2015-01-21 11:12:11 -08:00
Sam Gateau
33dcbded22 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis 2015-01-21 10:07:58 -08:00
Sam Gateau
d19bfa69f2 Even more gpu::Texture in the model rnedering 2015-01-21 10:07:10 -08:00
ZappoMan
4c9b7f46a2 cleanup 2015-01-21 10:03:25 -08:00
Brad Hefta-Gaub
08e8694ae1 Merge pull request #4139 from AndrewMeadows/bispinor 
lower cost when failing to add entity to physics engine
 2015-01-20 18:17:35 -08:00
Atlante45
850f92eae3 Don't call Settings::set when you don't need too. 2015-01-20 17:54:11 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Sam Gateau
4302db109f First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture 2015-01-20 16:02:26 -08:00
Stephen Birarda
466ea12d0f turn off verbose HTTP request debug 2015-01-20 15:44:14 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Stephen Birarda
94a9bf52fa handle gvr-interface address lookup 2015-01-20 14:38:33 -08:00
Andrew Meadows
790d07d346 track known contacts and generate collision events 2015-01-20 14:18:10 -08:00
Andrew Meadows
5da38834e2 introduce notion of NumSteps vs NumSubsteps 2015-01-20 11:16:40 -08:00