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

17726 commits

Author SHA1 Message Date
Zach Pomerantz
7f496ea069 Fix colliding fbx tex names 2016-05-05 17:54:00 -07:00
samcake
e306a24a1b INtroducing the unlit mode for fragments 2016-05-05 17:08:52 -07:00
Zach Pomerantz
6a6d6dd20f Defer mipmap gen to gpu 2016-05-05 16:34:02 -07:00
Seth Alves
cb523a3a71 disable webSurface differently 2016-05-05 16:01:05 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2 provide session ID for metaverse heartbeat once received 2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415 send fallback socket, don't send HB if send usage disabled 2016-05-05 15:35:37 -07:00
Seth Alves
96174468b3 use reliable and ordered packets for avatar identity 2016-05-05 15:27:30 -07:00
Atlante45
f65b15803a Fix potential iterator invalidation 2016-05-05 15:04:39 -07:00
Atlante45
bc6544a3c5 Fix MyAvatar's velocity change 2016-05-05 14:55:28 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e Fix avatars collision sounds 2016-05-05 14:55:28 -07:00
Seth Alves
cd934bab90 set _actionDataDirty when adding an action. 2016-05-05 14:16:13 -07:00
Zach Pomerantz
79c8001d7a Audit thread safety of ResourceCache 2016-05-05 11:17:38 -07:00
Seth Alves
ec50744aa1 Merge pull request #7817 from AndrewMeadows/ignore-echo-of-stale-data 
fix bug preventing sim ownership release
 2016-05-05 11:14:55 -07:00
Seth Alves
3c41df53e4 Merge branch 'ignore-echo-of-stale-data' of github.com:AndrewMeadows/hifi into grab-fixes 2016-05-05 11:00:55 -07:00
Andrew Meadows
967a67256e fix bug preventing sim ownership release 2016-05-05 10:52:53 -07:00
Seth Alves
0c794cac5d Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 10:13:07 -07:00
Seth Alves
929d831212 Merge pull request #7807 from AndrewMeadows/ignore-echo-of-stale-data 
fix object position glitch of owned simulations on networks with long ping-time
 2016-05-05 10:11:02 -07:00
samcake
a78719bc85 Merge pull request #7813 from ZappoMan/fixRecursiveMutex 
fix recursive mutex in Entites.callEntityMethod()
 2016-05-05 10:06:58 -07:00
Seth Alves
f5be64ed96 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 09:52:33 -07:00
Seth Alves
24289b1e66 Merge pull request #7815 from birarda/stuck-assignment 
add warnings for socket error and unexpected state change
 2016-05-05 08:58:51 -07:00
Andrew Meadows
3202a723b8 remove warning about unused variable 2016-05-05 08:54:09 -07:00
Brad Hefta-Gaub
1df4cf4db0 Merge pull request #7812 from zzmp/fix/scripting-thread-dtor 
Properly shut down scripting thread
 2016-05-05 08:49:51 -07:00
Seth Alves
d76b8f2335 action->locallyAddedButNotYetReceived is unneeded with isMine available 2016-05-05 06:44:52 -07:00
Brad Hefta-Gaub
1e30ba43ea Merge pull request #7781 from zzmp/log/pipeline-flood 
Avoid missing pipeline log flood
 2016-05-05 00:15:10 -07:00
samcake
f1b236f3be adding the DeferredBUfferRead.slh 2016-05-04 18:51:35 -07:00
samcake
2d573963bb Introducing the unlit material 2016-05-04 18:50:52 -07:00
Andrew Meadows
be9a572fb0 fix grab motion glitch on long-ping connections 2016-05-04 16:50:42 -07:00
Stephen Birarda
8a3336ae95 use the networking logging category 2016-05-04 16:31:12 -07:00
Seth Alves
91af732516 if we receive an update from the entity-server that doesn't include one of our actions, resend the action data 2016-05-04 16:30:38 -07:00
Stephen Birarda
effa2fc235 typo fix for comment 2016-05-04 16:28:26 -07:00
Stephen Birarda
7192ad301f add debug for socket errors and state changes 2016-05-04 16:23:40 -07:00
Andrew Meadows
8c7ee00849 Merge pull request #7808 from ctrlaltdavid/20904 
Increase maximum friction value from 0.99 to 10.0
 2016-05-04 16:11:43 -07:00
Zach Pomerantz
1553f532ba Specialize usleep for Win32 2016-05-04 15:40:53 -07:00
Seth Alves
9db839bc13 don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0 2016-05-04 15:01:00 -07:00
Zach Pomerantz
526143b097 Improve perf of Win32 usleep 2016-05-04 13:36:07 -07:00
Zach Pomerantz
0f6162d683 Use appropriate units for timing tests 2016-05-04 13:23:10 -07:00
David Rowe
4b05d8ed95 Increase maximum friction to 10.0 - Bullet's maximum 2016-05-05 07:50:15 +12:00
Seth Alves
382a0c48da fix warning 2016-05-04 12:09:26 -07:00
Zach Pomerantz
56ec0e5db0 Abort infinite JS loops on quit 2016-05-04 12:02:08 -07:00
Seth Alves
b6918f59a6 remove extra qualification 2016-05-04 11:33:41 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Brad Hefta-Gaub
2c9608489f fix recursive mutex in Entites.callEntityMethod() 2016-05-04 10:01:20 -07:00
Zach Pomerantz
284feaf5d4 Properly shut down scripting thread 2016-05-03 20:29:31 -07:00
samcake
3c80767ec3 Adding the shadingMOdel read from the fbx material 2016-05-03 18:43:20 -07:00
howard-stearns
acc216726a Cleanup 2016-05-03 16:32:53 -07:00
howard-stearns
fdf9c0a217 Fix offset so that non-full-size window can be located anywhere on screen. 2016-05-03 16:26:45 -07:00
David Rowe
d1064bf5ea Increase maximum friction to 1.0 - bullet can handle it 2016-05-04 10:58:33 +12:00
Seth Alves
9e53055d43 parentID and parentJointIndex are now protected by simulation ownership 2016-05-03 15:48:50 -07:00
Brad Hefta-Gaub
42169ddcb3 Merge pull request #7806 from Atlante45/fix/warnings 
Fix couple OSX warnings
 2016-05-03 15:42:47 -07:00
howard-stearns
adb11c9266 Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-05-03 14:03:10 -07:00
David Rowe
bc04d1b477 Increase maximum friction value from 0.99 to 0.9999 2016-05-04 09:01:26 +12:00
Andrew Meadows
ba226b9cb4 promote priority immediately when already owned 2016-05-03 13:43:08 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue 
Improve Translucent shapes global lighting with support for the ambient map reflection
 2016-05-03 11:14:06 -07:00
Brad Hefta-Gaub
754ef071eb Merge pull request #7786 from sethalves/web-scripts-use-local-libs 
allow scripts on the web to refer to local libraries with /~/
 2016-05-03 11:10:48 -07:00
Zach Pomerantz
0bc89d6b18 Avoid missing pipeline log flood 2016-05-03 09:39:31 -07:00
Brad Hefta-Gaub
eb209c7483 Merge pull request #7752 from Geenz/master 
Correction To sRGB Conversions
 2016-05-03 08:01:51 -07:00
Howard Stearns
773770a7fc All but origin-correction. 2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
ad285ff9a1 Merge pull request #7769 from ZappoMan/abortForInfiniteLoops 
add support to abort evaluation of long running scripts on shutdown
 2016-05-02 20:44:12 -07:00
Brad Hefta-Gaub
2b54813075 Merge pull request #7783 from zzmp/fix/script-engine-deletion 
Fix script engine deletion
 2016-05-02 18:16:07 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Atlante45
eb21b9c5d7 OSX warnings 2016-05-02 17:18:57 -07:00
Seth Alves
1da041de9b don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity 2016-05-02 15:09:08 -07:00
Brad Hefta-Gaub
b98419e537 add units to debug message 2016-05-02 14:58:38 -07:00
Seth Alves
ae8f502808 keep track of actions we are editing and ignore updates from server for these actions 2016-05-02 14:23:36 -07:00
Brad Hefta-Gaub
4569032314 more CR feedback 2016-05-02 12:44:07 -07:00
Clément Brisset
2ef87557fc Merge pull request #7798 from zzmp/clean/override 
Fix warnings on vanilla XCode compilations
 2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub
a447ce4633 Merge pull request #7770 from AndrewMeadows/avoid-crosseyes 
don't cross the eyes
 2016-05-02 10:13:25 -07:00
Brad Hefta-Gaub
e117f280cc Merge pull request #7779 from zzmp/fix/fst-crash 
Avoid crashing on missed pipelines
 2016-05-02 10:12:17 -07:00
samcake
a5b32b59a7 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-05-02 09:54:54 -07:00
Seth Alves
a9897f1cc4 Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-05-02 07:25:42 -07:00
ZappoMan
6026e055aa more CR feedback removed redundant abort code 2016-04-30 15:45:42 -07:00
ZappoMan
00838d1e1e more CR feedback removed redundant abort code 2016-04-30 15:38:37 -07:00
ZappoMan
ee4748fee9 CR Feedback 2016-04-30 15:31:09 -07:00
ZappoMan
73ff0308a9 some CR feedback 2016-04-30 15:23:50 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Geenz
043fe3508a Add SRGBA color format. 2016-04-30 15:47:42 -04:00
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
Ryan Huffman
5dadfa9e7e Merge pull request #7792 from Atlante45/fix/crash-asset-request 
Fix dangling reference into container
 2016-04-29 17:58:11 -07:00
Atlante45
6d9080162c Make slots private method 2016-04-29 17:39:53 -07:00
Seth Alves
351a5d2cb1 remove debug print 2016-04-29 13:24:12 -07:00
Seth Alves
b28cfd27ec fix problem where canonicalFilePath will strip a trailing slash 2016-04-29 13:17:59 -07:00
Seth Alves
36e84e6266 Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-04-29 11:04:23 -07:00
Seth Alves
f03130ff5a more work toward keeping /~/../.. from working 2016-04-29 11:04:08 -07:00
samcake
52c403e980 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-29 10:59:23 -07:00
samcake
257c8c94c3 clean up the lighting function and put the global specular lighting in a separate function 2016-04-29 10:58:55 -07:00
Brad Hefta-Gaub
d2d4ba277d Merge pull request #7791 from birarda/anon-events 
use a setting handle for UAL disabled to fix startup race
 2016-04-28 19:11:09 -07:00
Seth Alves
ced18fe6be trying some more to get /~/ to work right 2016-04-28 18:29:54 -07:00
Seth Alves
8c2b89b910 trying to get /~/ from web sorted out 2016-04-28 18:29:46 -07:00
Seth Alves
82b43dbfec Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-04-28 18:29:40 -07:00
samcake
88f816fab4 Adding reflection of the ambient map for translucent 2016-04-28 18:18:18 -07:00
Stephen Birarda
09981db834 use a setting handle for UAL disabled to fix startup race 2016-04-28 18:05:06 -07:00
Atlante45
9a7bebaaa2 Fix dangling reference into container 2016-04-28 18:04:04 -07:00
Brad Hefta-Gaub
19e069f6ef Merge pull request #7790 from birarda/anon-events 
don't require authentication to send usage data
 2016-04-28 18:01:33 -07:00
Stephen Birarda
6883891748 don't require authentication to send user activity 2016-04-28 17:08:40 -07:00
Brad Hefta-Gaub
e92e4e57b1 Merge pull request #7772 from AndrewMeadows/minor-optimizations 
minor cleanup and optimizations around EntityItem::getDimensions()
 2016-04-28 17:04:42 -07:00
Seth Alves
648e6a74d7 don't let people access scripts outside of /~/ 2016-04-28 15:43:58 -07:00
Seth Alves
8c278563f5 allow scripts on the web to refer to interface-local javascript libraries 2016-04-28 13:41:50 -07:00
Zach Pomerantz
30e7b950a1 Fix script engine deletion 2016-04-28 11:41:36 -07:00
Andrew Meadows
b95c81d0ba Merge pull request #7763 from huffman/fix/gpu-ident-debug 
Fix assert crash in GPUIdent
 2016-04-28 08:02:11 -07:00
Zach Pomerantz
2f20e58301 Avoid crashing on missed pipelines 2016-04-27 19:54:52 -07:00
Zach Pomerantz
854c0ea3e3 Clean out updateMemoryCost 2016-04-27 19:20:43 -07:00
Zach Pomerantz
1e8d45aecb Put ScriptableResource state enum in prototype 2016-04-27 19:20:43 -07:00
Zach Pomerantz
0c78d5bdd1 Change ScriptableResource signal to state 2016-04-27 19:20:42 -07:00
Zach Pomerantz
de8145ec71 Nest TextureType JS interface in Type 2016-04-27 19:20:41 -07:00
Andrew Meadows
9c0aeb9b81 remove cruft 2016-04-27 16:58:13 -07:00
Andrew Meadows
8a691cf449 Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle 
Improve eye tracking when face to face
 2016-04-27 16:54:07 -07:00
Andrew Meadows
4160e0c1df Merge pull request #7773 from imgntn/defaultScripts 
change path for defaultscripts.js in scriptengine
 2016-04-27 16:35:51 -07:00
James B. Pollack
bced3c2c3c change path for defaultscripts.js in scriptengine 2016-04-27 13:34:42 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Zach Pomerantz
6b53c1e85d Avoid leaking ScriptableResource 2016-04-27 11:55:02 -07:00
Andrew Meadows
5042561e80 Merge pull request #7730 from imgntn/defaultScripts 
/scripts for launch
 2016-04-27 11:36:20 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Andrew Meadows
c686418be0 optimize use of EntityItem::getDimensions() 2016-04-27 10:34:29 -07:00
Andrew Meadows
f6aa0a11a8 Merge pull request #7766 from ZappoMan/fixAutoResize 
fix auto resize of models on import
 2016-04-27 10:03:18 -07:00
Andrew Meadows
93f4bc759d Merge pull request #7743 from samcake/color 
group several separate glUniform parameters into a single Uniform Buffer
 2016-04-27 10:02:56 -07:00
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
Brad Hefta-Gaub
19416fe722 Merge pull request #7761 from samcake/lemon 
Add support for equi-rectangular skymaps (2 by 1)
 2016-04-26 17:15:24 -07:00
Brad Hefta-Gaub
48e63ea828 add support to abort evaluation of long running scripts on shutdown 2016-04-26 16:24:53 -07:00
Brad Hefta-Gaub
a21bc66fa3 add support to abort evaluation of long running scripts on shutdown 2016-04-26 16:21:11 -07:00
James B. Pollack
afb2342781 Merge remote-tracking branch 'upstream/master' into defaultScripts 2016-04-26 16:16:56 -07:00
Geenz
bf31fc728a And another. 2016-04-26 18:54:02 -04:00
James B. Pollack
37fa703279 use system path instead of default for loading scripts 2016-04-26 15:50:45 -07:00
Geenz
83d6f7f1e3 Quick fix for incorrect conversion. 
We want sRGB to linear, not linear to sRGB.
 2016-04-26 18:49:03 -04:00
Brad Hefta-Gaub
b597f7001b fix auto resize 2016-04-26 15:13:11 -07:00
Geenz
ef7098b39a Missed a few. 2016-04-26 17:12:04 -04:00
Geenz
dacc2bdb09 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-26 17:01:16 -04:00
Geenz
ae5ef6d948 Remove toLinearVec3 from ColorUtils 
toGamma22Vec3 should probably stay since that is a valid conversion from linear to a gamma space of 2.2.
 2016-04-26 17:00:59 -04:00
Anthony J. Thibault
d9063b199e GeometryUtils: coneSphereAngle test 2016-04-26 13:31:06 -07:00
Brad Hefta-Gaub
ee277dcf9d Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes 2016-04-26 11:44:51 -07:00
Andrew Meadows
3d1abf8fb1 use the new JS script location 2016-04-26 11:20:08 -07:00
Ryan Huffman
e5f2658fd9 Update GPUIdent to take address of spInstance directly 2016-04-26 09:23:08 -07:00
Geenz
d6ee569963 Add sRGB conversions to shaders. 2016-04-25 23:52:33 -04:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
samcake
91bed86b32 ANd one more warning 2016-04-25 19:04:02 -07:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
samcake
8f2435daf0 No more warnings ? 2016-04-25 18:39:37 -07:00
samcake
e8691c2f20 Fixing comments, code style and constnats 2016-04-25 18:15:52 -07:00
samcake
0e13b1623b Adding support for Equirectangular skymaps 2016-04-25 15:55:12 -07:00
Geenz
ba5fa70b83 Convert sRGB values for materials. 2016-04-25 13:31:50 -04:00
Seth Alves
16bf59f8a6 fix a crash in RenderableModelEntityItem::getModel 2016-04-25 10:26:32 -07:00
Geenz
97931d96b8 Move sRGB calcs to ColorUtils 
And start consolidating any conversions with calls into ColorUtils.
 2016-04-25 12:59:16 -04:00
samcake
dd189747f5 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-25 09:41:44 -07:00
Geenz
ed9c0dd74d Apply the correct sRGB conversions. 
sRGB does not use a gamma curve of 2.2 - instead it uses a piece-wise
gamma curve that 2.2 is approximate of.  This will cause very subtle
color differences between proper sRGB and "approximate" sRGB -
differences that are noticeable nonetheless.
 2016-04-25 02:35:26 -04:00
Seth Alves
c9df446879 web-entities don't yet work right on Linux 2016-04-24 08:15:10 -07:00
Brad Hefta-Gaub
8c7ef31636 Merge pull request #7746 from AndrewMeadows/supress-spurious-logs 
reduce warnings about truncated kinematic timesteps
 2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
samcake
f587398ca3 Adding support for plate carree 2016-04-22 18:00:22 -07:00
Andrew Meadows
d984ce4792 properly update _lastSimulated for kinematic objs 2016-04-22 17:19:00 -07:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request #7745 from jherico/mac_texture_fix 
Fixing texture storage allocation on OSX/GL 4.1
 2016-04-22 17:07:12 -07:00
Bradley Austin Davis
d87c92baee Fixing memory detection on OSX 2016-04-22 16:30:36 -07:00
Bradley Austin Davis
472d3dc45f Still working on mac breakage 2016-04-22 16:25:23 -07:00
Bradley Austin Davis
407e0c0dd7 Fixing texture storage allocation on OSX/GL 4.1 2016-04-22 15:48:18 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
79a1e6264e Merge pull request #7714 from hyperlogic/tony/default-anims-are-local 
Avatar animations are now stored locally
 2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c962cfbda3 Merge pull request #7712 from zzmp/guard/obj-access 
Guard OBJ at operators
 2016-04-22 13:43:59 -07:00
Brad Hefta-Gaub
410bf3c95a Merge pull request #7711 from AndrewMeadows/faster-kinematics 
faster hifi kinematic motion calculations take-4
 2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Andrew Meadows
34d622e498 add warning about truncated kinematic timestep 2016-04-22 13:10:23 -07:00
Brad Hefta-Gaub
de17834dd1 Merge pull request #7740 from ctrlaltdavid/20887 
Don't display "Reveal Scripts Folder" control in HMD mode
 2016-04-22 13:04:07 -07:00
Brad Hefta-Gaub
f0659a985c Merge pull request #7726 from Atlante45/fix/pmtu-disc-fail 
Fix for path MTU discovery fail
 2016-04-22 12:24:44 -07:00
Seth Alves
e827a99222 Merge pull request #7732 from Atlante45/fix/settings-crash 
Fix crash on exit in Settings
 2016-04-22 11:46:30 -07:00
Seth Alves
4561962db1 Merge pull request #7736 from huffman/fix/asset-request-crash 
Fix AssetClient not properly cleaning up canceled requests
 2016-04-22 11:45:26 -07:00
samcake
43caca901f Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-04-22 10:57:14 -07:00
samcake
fd3efa37e3 Cleanup the shaders to avoid any uniform in genral, fixed a bug woith the emissive params applied twice for model_lightmap.slf 2016-04-22 10:56:21 -07:00
Ryan Huffman
3b5b6a2609 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/asset-request-crash 2016-04-22 10:02:21 -07:00
Ryan Huffman
1416e397e4 Merge branch 'playEntityCollisionSound-crash' of github.com:sethalves/hifi into fix/asset-request-crash 2016-04-22 10:02:00 -07:00
Andrew Meadows
2bd83764e7 remove some debug cruft 2016-04-22 09:38:43 -07:00
Andrew Meadows
872622c6f7 fix acceleration of for server-side kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
14abb15216 set kinematic accel before stepping 2016-04-22 09:38:43 -07:00
Andrew Meadows
8efb07cfd8 correctg measured acceleration for kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
a3c66d8c91 reduce number of updates for fast-moving objects 2016-04-22 09:38:43 -07:00
Andrew Meadows
a79f49a5cd don't stop slow kinematic objs when sending updates 2016-04-22 09:38:43 -07:00
Andrew Meadows
afcf6d68a7 move deactivation thresholds to shared header 2016-04-22 09:38:43 -07:00
Andrew Meadows
ad045bc439 remove second-order term from kinematic motion 2016-04-22 09:38:43 -07:00
Andrew Meadows
8cbec06616 fix bug where kinematic objs pop on first step 2016-04-22 09:38:43 -07:00
Andrew Meadows
c8f0b0501a avoid active object update cycles 2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e optimize kinematic motion math 2016-04-22 09:38:43 -07:00
Andrew Meadows
905c5398c4 add EntityItem::set/getTransformAndVelocities() 2016-04-22 09:38:43 -07:00
Andrew Meadows
771727890c more finely grained Bullet profiling 2016-04-22 09:38:43 -07:00
samcake
5a67411d75 Removing separate uniforms for the texcoord transforms and lightmap params, shader still failing 2016-04-21 18:35:37 -07:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
Stephen Birarda
5ea8b83745 use noquote so URLs are not quoted 2016-04-21 17:16:21 -07:00
Zach Pomerantz
069065dc23 Fix recursive invokes of ResourceCache::prefetch 2016-04-21 17:15:11 -07:00
Stephen Birarda
19702a9cd4 cleanup check for resource retry 2016-04-21 17:14:07 -07:00
Stephen Birarda
8cd330f431 add back on fail when server unavailable 2016-04-21 17:07:29 -07:00
Stephen Birarda
3a8c2144bf move asset retry debug to print before retry 2016-04-21 16:55:49 -07:00
Ryan Huffman
9e46b43489 Add threading related asserts to AssetClient 2016-04-21 16:39:57 -07:00
Ryan Huffman
da5bbe51d1 Fix AssetClient not properly disconnecting from callbacks 2016-04-21 16:37:21 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
0f966e934e Merge pull request #7728 from ctrlaltdavid/20887 
Add link in Running Scripts that opens scripts folder
 2016-04-21 16:01:52 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
68b0a3fa02 Merge pull request #7724 from huffman/fix/stars-grid-macro 
Remove #line from starsGrid.slf
 2016-04-21 15:59:06 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Seth Alves
e2025b0d1f lock entity-tree before accessing entities 2016-04-21 15:27:15 -07:00
Seth Alves
b088191966 Merge pull request #7731 from huffman/fix/asset-request-crash 
Fix AssetRequest crash where signal was not disconnected
 2016-04-21 15:22:08 -07:00
Brad Davis
33ec73bfd8 PR comments 2016-04-21 15:11:11 -07:00
Brad Davis
ef466a64bf Add GPUIdent logic for determining video memory 2016-04-21 14:46:13 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Davis
2689f2cc4a Add MB/KB/Byte conversion macros 2016-04-21 14:46:11 -07:00
Brad Davis
e9959df2df Decoupling resourcecache from nodelist 2016-04-21 14:46:09 -07:00
Howard Stearns
7aca95507e comments 2016-04-21 14:46:08 -07:00
Howard Stearns
7f748153c5 Mac code for gpu memory. 2016-04-21 14:46:08 -07:00
Atlante45
0c32f47f50 Don't call virtual method from base dtor 2016-04-21 13:25:31 -07:00
Ryan Huffman
63d98b1b5c Fix AssetRequest crash where signal was not disconnected 2016-04-21 12:12:04 -07:00
Zach Pomerantz
6e12493ed7 Add default NetworkTexture::_textureLoader 2016-04-21 10:54:03 -07:00
Zach Pomerantz
2fd88d9fe1 Add sanity check to ResourceCache::updateTotalSize 2016-04-21 10:45:51 -07:00
Zach Pomerantz
cba5bff89e Make ResourceCache::prefetch private and comment 2016-04-21 10:33:35 -07:00
Zach Pomerantz
62f1e8d129 Fix checked_at in OBJReader to use ref 2016-04-21 10:02:35 -07:00
samcake
018196a070 One more review comment 2016-04-21 09:58:36 -07:00
Brad Hefta-Gaub
f9c4959578 remove some debugging, tweak formatting 2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Stephen Birarda
aaf1fdb71c Merge pull request #7723 from zzmp/log/retry-url 
Add url to resource retry debug log
 2016-04-21 09:04:53 -07:00
Atlante45
778c19d7e4 Make sure the socket allows fragmenting 2016-04-21 08:38:08 -07:00
howard-stearns
c274df6066 uint64 2016-04-20 22:57:33 -07:00
howard-stearns
904e87313e Match the gpu adapter names gainst the vendor and renderer names used by 
the ogl we're using, so that we pick the right GPU to get info from.
 2016-04-20 22:57:32 -07:00
howard-stearns
b403dcb0d9 An experiment to see if dual-card Windows desktops can be made to answer 
the correct card.
 2016-04-20 22:57:32 -07:00
howard-stearns
cb137635db Fix stupid MSVC default indentation. 2016-04-20 22:57:31 -07:00
howard-stearns
c12772e4c6 GPU identification utilities 2016-04-20 22:57:30 -07:00
Zach Pomerantz
92e372f385 Expose Resource progress as a signal 2016-04-20 20:18:22 -07:00
Zach Pomerantz
1a0a623d5f Report ScriptableResource memory cost to engine 2016-04-20 20:18:22 -07:00
Zach Pomerantz
5ec82fa43d Add release invokable to ScriptableResource 2016-04-20 20:18:22 -07:00
Zach Pomerantz
825431829d Add url property to ScriptableResource 2016-04-20 20:18:22 -07:00
Zach Pomerantz
df4857947b Add prefetch overload for texture specificity 2016-04-20 20:18:22 -07:00
Zach Pomerantz
c096b0dfa1 Add TextureType to NetworkTexture for reflection 2016-04-20 20:18:22 -07:00
Zach Pomerantz
a148a69a35 Move cache to bottom of texture header 2016-04-20 20:18:22 -07:00
Zach Pomerantz
7d9790ecb5 Add request for garbage collection 
Add garbage collection request in prod
 2016-04-20 20:14:15 -07:00
Zach Pomerantz
8ad8b5d0d9 Return ScriptableResource from prefetch 2016-04-20 20:14:15 -07:00
Zach Pomerantz
3c7fc95d6c Allow url-only cache queries for tex, model 2016-04-20 20:14:15 -07:00
Zach Pomerantz
74e1f817a5 Add prefetch to all resource caches 2016-04-20 20:14:15 -07:00
Zach Pomerantz
e3131d2098 Rm prefetchAnimation from avatar/rig 2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
66235acac2 Merge pull request #7725 from howard-stearns/quit-consistently 
Quit consistently
 2016-04-20 19:17:52 -07:00
Brad Hefta-Gaub
5244274ae4 fix warning 2016-04-20 19:06:31 -07:00
Brad Hefta-Gaub
248ac8d760 fix warning 2016-04-20 19:04:39 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
samcake
2bc8191fa6 one more comment from review 2016-04-20 18:04:11 -07:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
Atlante45
492bc75d68 Reduce max packet size to 1492 2016-04-20 15:58:01 -07:00
samcake
f2f092e9c8 Cleanup thanks to review 2016-04-20 15:42:30 -07:00
Ryan Huffman
f90e1aaa23 Remove #line from starsGrid.slf 
Fails to compile with certain drivers.
 2016-04-20 15:04:10 -07:00
howard-stearns
0544bcaacd Simpler cross-platform solution, with comments. 2016-04-20 15:02:41 -07:00
Zach Pomerantz
477d6f40e4 Avoid use of atomic copy ctor in RateCounter 2016-04-20 13:39:57 -07:00
Zach Pomerantz
d28b12ec3c Guard OBJ at operators 2016-04-20 13:04:45 -07:00
Zach Pomerantz
948af75f8a Transfer loaded resources with smart ptrs to avoid shutdown deadlock 2016-04-20 13:00:35 -07:00
Zach Pomerantz
2cc48a6ca6 Add url to resource retry debug 2016-04-20 12:20:05 -07:00
howard-stearns
b221232117 Windows-only version, without changing assignment-client/domain-server 
classes.
 2016-04-20 10:31:26 -07:00
Andrew Meadows
a9cfb5bf16 fix linux build 2016-04-19 18:12:35 -07:00
howard-stearns
a7d2373f3e Use our ShutdownEventListener utility in Interface, and absorb quit 
signal when we handle it.
 2016-04-19 16:17:39 -07:00