Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 08:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43067 commits 6 branches 1 tag 1.1 GiB
Commit graph

17516 commits

Author SHA1 Message Date
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
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
Anthony J. Thibault
8e5785cdf8 Avatar animations are now stored locally 
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
 2016-04-19 16:11:14 -07:00
Ryan Huffman
c0a5c8bb18 Merge pull request #7678 from birarda/mixer-sleeps 
use a steady clock for mixer timings
 2016-04-19 12:59:53 -07:00
Ryan Huffman
92339bf5fc Merge pull request #7701 from birarda/udt-fixes 
use nextPacketTimestamp to catch up, not stay ahead
 2016-04-19 12:57:43 -07:00
samcake
4c2cdc8704 A bit more clean up 2016-04-19 12:46:56 -07:00
samcake
71edae6d76 Removing the different versions of stereo drawcall to make a simple PR 2016-04-19 12:38:33 -07:00
samcake
3dad4f576e Merging with master 2016-04-19 11:59:44 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
Brad Davis
882267e08f Merge pull request #7709 from samcake/blue 
Introduce Shader Compilation versions
 2016-04-19 11:14:22 -07:00
Brad Hefta-Gaub
d88185eb6c Merge pull request #7703 from zzmp/fix/gl-qml 
Set GL in QML immediately
 2016-04-19 11:11:27 -07:00
samcake
474d667f27 One more uneeded change 2016-04-19 11:03:35 -07:00