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
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
samcake
28521aa66a REmoving uneeded changes 2016-04-19 11:01:41 -07:00
samcake
21b0341e50 REmoving extra cruff 2016-04-19 10:51:44 -07:00
samcake
a997f9bb1b Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-19 10:49:53 -07:00
samcake
1a154bb3be Revert the changes to use SSAO AND 2 buffers 2016-04-19 10:47:54 -07:00
Zach Pomerantz
fc61f85bf9 Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback 
Added MyAvatar onLoadComplete Callback
 2016-04-19 10:36:20 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd Merge pull request #7697 from samcake/orange 
Introduce a simple state sort for drawing opaque items
 2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
d16750c590 Merge pull request #7681 from hyperlogic/tony/character-controller-leak-fix 
Memory leak on exit for CharacterController
 2016-04-19 07:51:08 -07:00
Brad Hefta-Gaub
c41b320d40 Merge pull request #7706 from zzmp/fix/text3d-font 
Fix text3d to allow transparent text
 2016-04-19 07:50:36 -07:00
Brad Hefta-Gaub
b0f3b24caa Merge pull request #7699 from OmegaHeron/gcc53 
Gcc53
 2016-04-19 07:34:24 -07:00
Brad Hefta-Gaub
8f19eba5c2 Merge pull request #7685 from zzmp/debug/sub 
Add sub to Debug Counter
 2016-04-19 07:27:49 -07:00
Brad Hefta-Gaub
523d365ce7 Merge pull request #7680 from Atlante45/fix/clear-atp-cache 
Don't use invalidated iterators
 2016-04-19 07:24:07 -07:00
Brad Hefta-Gaub
2780ade3bd Merge pull request #7686 from zzmp/clean/bufferview 
Consolidate BufferView ctors to cpp
 2016-04-19 07:21:57 -07:00
samcake
7c7cd6e9e5 Go simple with a a true map for the unifrom mappings 2016-04-18 19:05:49 -07:00
samcake
4bbe0ddc6d Go simple with a a true map for the unifrom mappings 2016-04-18 19:01:15 -07:00
samcake
85fd1dcb5b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-18 18:25:16 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Omega Hereon [J.L.]
647e991b05 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:14:00 +00:00
Brad Hefta-Gaub
a572ac31dc Merge pull request #7704 from samcake/lemon 
Exposing the CPU TIming of the Render Jobs to the JS API
 2016-04-18 18:12:14 -07:00
Omega Hereon [J.L.]
64f6a59bb3 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:11:35 +00:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir 
Remove fix for old QT file path bug in OSX
 2016-04-18 18:01:47 -07:00
Zach Pomerantz
6d7f8f4a6f Make RateCounter rate atomic 2016-04-18 17:42:45 -07:00
samcake
c6deff16d6 Resoving to master... 2016-04-18 17:24:55 -07:00
samcake
d25a366962 Resoving to master... 2016-04-18 17:23:57 -07:00
samcake
7951284e9c Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-04-18 16:54:17 -07:00
Stephen Birarda
93cf5a1035 fixes for CR comments 2016-04-18 16:53:02 -07:00
samcake
9087de22bd Fixing the extra spaces 2016-04-18 16:10:11 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Zach Pomerantz
2d9dcc8595 Fix text3d to allow transparent text 2016-04-18 16:02:45 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
70ddd8529b Merge pull request #7684 from zzmp/fix/runaway-loading-resources 
Fix ResourceCacheSharedItems::_loadingRequests removals
 2016-04-18 15:46:45 -07:00
Brad Hefta-Gaub
d5891e9073 remove abortEvaluation() since it has no effect for the test cases and might cause unexpected side effects 2016-04-18 15:28:33 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing 
Manually generate mipmaps for textures while loading
 2016-04-18 15:09:12 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
Seth Alves
65f51322fa Merge pull request #7700 from Atlante45/fix/cleanup-iodevice 
Cleanup disk cache io device
 2016-04-18 14:28:41 -07:00
Zach Pomerantz
62c252e8ef Set GL in QML immediately 2016-04-18 14:23:23 -07:00
Stephen Birarda
9cce964013 use nextPacketTimestamp only to catch up, not stay ahead 2016-04-18 14:19:36 -07:00
Atlante45
c9fa91936a Cleanup disk cache io device 2016-04-18 14:10:51 -07:00
Seth Alves
4bf98a80b9 Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash 
fix entity-server crash when entity moves out of bounds
 2016-04-18 14:09:21 -07:00
Anthony J. Thibault
1f383680aa Rig: removed unnecessary emitOnLoadComplete method 2016-04-18 13:35:13 -07:00
Brad Hefta-Gaub
bf8cdabd1b CR feedback 2016-04-18 12:50:29 -07:00
Brad Hefta-Gaub
55010cebb7 remove unhelpful comment 2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
9e13b1bbae more CR feedback 2016-04-18 12:25:46 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -07:00
samcake
0ae54b9abc Typo 2016-04-18 11:45:48 -07:00
Omega Hereon [J.L.]
b3b58b8176 Fix instances of error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04 
In all but these 3 files isnan is glm::isnan
 2016-04-18 18:45:15 +00:00
Brad Hefta-Gaub
c26115cf2e one small tweak 2016-04-18 11:40:17 -07:00
Anthony J. Thibault
1682598be7 Added onLoadComplete signal to MyAvatar 
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
 2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
1c111e20bd fix possible thread issue with Entities.callEntityMethod() 2016-04-18 11:20:26 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -07:00
samcake
88c58cc276 Adding the simple state sort to draw opaque deferred 2016-04-18 10:51:31 -07:00
Brad Hefta-Gaub
47900df3e7 cleanup 2016-04-18 10:43:08 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Seth Alves
b943a664b6 Merge pull request #7691 from ctrlaltdavid/20886 
Fix QML warnings at shutdown
 2016-04-18 10:26:09 -07:00
Seth Alves
dea748d132 Merge pull request #7683 from zzmp/clean/texture 
Remove unused static method gpu::Texture
 2016-04-18 10:25:53 -07:00
Brad Hefta-Gaub
a4f562672a cleanup 2016-04-18 10:08:33 -07:00
Brad Hefta-Gaub
9db0fe0d11 switch to using QSharedPointer for _entitiesScriptEngine 2016-04-18 09:46:04 -07:00
samcake
0531f90675 Adding state sorting for free 2016-04-18 00:22:05 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
3a969eed47 Manually generate image mip levels when loading textures 2016-04-17 10:22:24 -07:00
Brad Davis
0d3bf366c1 Support loading multiple mips in texture transfer 2016-04-17 10:22:24 -07:00
Brad Davis
ac3d6c77b9 Add default parameter to mip loaded notifications 2016-04-17 10:20:02 -07:00
Brad Davis
c35d81260d Load local texture files through the same code as network 2016-04-17 10:20:01 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
a3221f36c8 Merge branch 'master' of https://github.com/highfidelity/hifi into resetScriptEngineOnDomainChange 2016-04-17 10:03:06 -07:00
Brad Hefta-Gaub
4b7a4e80ff Merge pull request #7675 from samcake/orange 
Fixing the Bump Map generating Normal Map path
 2016-04-17 10:00:45 -07:00
Brad Hefta-Gaub
71d57295eb handle possibly deleted ScriptEngine in getScriptContents 2016-04-16 19:39:45 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
samcake
d2cb017a04 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-16 10:44:56 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
samcake
c1ed0e2e14 Enabling sbo 2016-04-15 20:02:15 -07:00
samcake
554247193c Trying SSBO for the object matrices 2016-04-15 19:55:52 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Zach Pomerantz
0d06d8ea93 Clear freed loading resources 2016-04-15 17:34:45 -07:00
Zach Pomerantz
d2426f30c6 Mv ResourceCacheShared to top of impl 2016-04-15 16:40:07 -07:00
Zach Pomerantz
f2b9acd84d Rm Texture::createFromStorage 2016-04-15 16:40:05 -07:00
Zach Pomerantz
5c004e2a5c Add comment on storage texture ptr 2016-04-15 16:40:04 -07:00
Zach Pomerantz
263dcbb535 Consolidate BufferView ctors to cpp 2016-04-15 16:40:00 -07:00
Zach Pomerantz
cf9d160602 Add sub to Debug Counter 2016-04-15 16:39:57 -07:00
Chris Collins
7b49552066 Merge pull request #7677 from howard-stearns/RateCounter-adjustment 
Don't truncate time when accumulating, and then divide by non-truncated.
 2016-04-15 15:59:13 -07:00
Chris Collins
c0f4b8573c Merge pull request #7673 from zzmp/fix/cache-tallies 
Decrement cache tallies for uncached resources
 2016-04-15 15:59:03 -07:00
Anthony J. Thibault
0b7a5c4df8 CharacterController: leak fix for btRigidBody and it's shape 2016-04-15 15:05:54 -07:00
Brad Hefta-Gaub
a7b5ea50d7 Merge pull request #7670 from hyperlogic/tony/validate-anim-state-handler-args 
Validate arguments to MyAvatar.addAnimationStateHandler()
 2016-04-15 14:26:22 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Atlante45
dfc3e5d488 Don't use invalidated iterators 2016-04-15 13:57:48 -07:00
Anthony J. Thibault
38418d0169 Moved isListOfStrings into shared/ScriptValueUtils 
Also fixed some single line ifs.
 2016-04-15 13:47:30 -07:00
Howard Stearns
e4f8a67e60 Merge pull request #7649 from hyperlogic/tony/simplify-away-mode 
away.js: fix for permanent disabling avatar IK
 2016-04-15 13:35:14 -07:00
Zach Pomerantz
cff5886313 Use correct resources lock 2016-04-15 10:46:19 -07:00
Brad Hefta-Gaub
50856b715e Merge pull request #7674 from zzmp/leak/font 
Change Font to use shared_ptr instead of freeing on _exit
 2016-04-15 10:25:09 -07:00
howard-stearns
089e7eb6b3 Don't truncate time when accumulating, and then divide by non-truncated. 2016-04-15 10:17:57 -07:00
samcake
fc29397d91 Clening up from review comments 2016-04-15 10:10:04 -07:00
samcake
920ab88ef3 remove a debug code 2016-04-15 01:00:57 -07:00
samcake
637da18e5c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-15 00:42:15 -07:00
samcake
30d0bfcfd3 FIxing the bump map loading which got broken in the past PR, fixed a double call to the glTexSUbIMage function and fixed a texel.Format 2016-04-15 00:41:37 -07:00
Zach Pomerantz
fc9de4b7e6 Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-tallies 2016-04-15 00:37:03 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Brad Hefta-Gaub
3e03f85f07 Merge pull request #7650 from Atlante45/fix/clear-atp-cache 
Clear atp mapping cache between domain
 2016-04-14 18:44:20 -07:00
samcake
a9fefcc802 Trying ti debug the bad normal maps 2016-04-14 18:16:14 -07:00
Brad Hefta-Gaub
21f30f1a10 Merge pull request #7672 from zzmp/fix/name-caches 
Name exposed cache objects
 2016-04-14 18:02:36 -07:00
Atlante45
b3b2f98f6c Merge branch 'master' of https://github.com/highfidelity/hifi into fix/clear-atp-cache 2016-04-14 17:59:36 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Zach Pomerantz
2e4e1dd590 Fix leaking Font 2016-04-14 17:00:23 -07:00
Zach Pomerantz
32e9c49cf0 Fix cache tallies for uncached resources 2016-04-14 17:00:20 -07:00
Zach Pomerantz
bb02af793c Name exposed cache objects 2016-04-14 17:00:18 -07:00
Anthony J. Thibault
253e4cbb73 validate arguments to MyAvatar.addAnimationStateHandler() 
Also validate arguments to MyAvatar.removeAnimationStateHandler() and the return result from the user provided callback function.
 2016-04-14 16:25:17 -07:00
Brad Hefta-Gaub
91334d6a39 Merge pull request #7664 from ZappoMan/reduceJointProperties 
only export joint values if they've been explicitly set by scripts
 2016-04-14 15:30:04 -07:00
Andrew Meadows
a263091c94 fix entity-server crash for out of bounds 2016-04-14 15:23:14 -07:00
Seth Alves
f114888c1c Merge pull request #7665 from birarda/ice-server-redundancy 
allow domain-server to cycle through ice-servers when failing
 2016-04-14 14:36:29 -07:00
Stephen Birarda
bc0b3b38b3 remove narrowing conversion for ICE_SERVER_DEFAULT_PORT 2016-04-14 12:25:47 -07:00
Brad Hefta-Gaub
ea4da05cba Merge pull request #7643 from AndrewMeadows/faster-bullet 
faster Bullet kinematics
 2016-04-14 12:16:54 -07:00
Andrew Meadows
4d7efbc43f faster isNaN() and friends 2016-04-14 11:18:10 -07:00
Andrew Meadows
bb59860cfe update Aabb's of static objects when they move 2016-04-14 11:18:10 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon 
add a heuristic for deciding when it's safe to enable bullet
 2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5 Merge pull request #7655 from sethalves/dont-spam-about-expired-actions 
don't flood log with messages about expired actions
 2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
37dcfdad8a Merge pull request #7652 from huffman/feat/crash-menu 
Move crash menu items to submenu and add new crash types
 2016-04-14 09:32:36 -07:00
Brad Hefta-Gaub
dd4589269d Merge pull request #7661 from zzmp/fix/track-resources 
Track resources as they fall out of cache
 2016-04-14 09:29:58 -07:00
Seth Alves
ba0549dddd Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-14 09:18:58 -07:00
samcake
c6414208e8 Use the dumber version of the stereo technique and fix a warning 2016-04-14 03:25:32 -07:00
samcake
6c3e011b89 Expose cleanely the 3 different techniques 2016-04-14 02:43:28 -07:00
Brad Hefta-Gaub
b48503a82d only export joint values if they've been explicitly set by scripts 2016-04-13 19:52:50 -07:00
samcake
41d4d3b2d7 Providing a cleaner way to try different paths and exploring a simpler way 2016-04-13 19:21:17 -07:00
Zach Pomerantz
774eb1c45a Make shared Debug header 2016-04-13 15:48:26 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Zach Pomerantz
e20acb1d42 Track resources as they fall out of cache 2016-04-13 15:44:14 -07:00
Ryan Huffman
47c2a1722b Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu 2016-04-13 14:40:46 -07:00
Brad Hefta-Gaub
07f734f4dd Merge pull request #7640 from jherico/vive_timewarp 
Vive timewarp
 2016-04-13 14:39:59 -07:00
Howard Stearns
f24c2c7714 Merge pull request #7657 from ZappoMan/avatarLicenseSupport 
add support for avatar licenses in FST files
 2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5 Merge pull request #7617 from jherico/vr_menu 
VR menu fixes
 2016-04-13 13:53:36 -07:00
Ryan Huffman
9ee81a73c7 Fix clang warning in CrashHelpers::newFault 2016-04-13 13:41:45 -07:00
Atlante45
785eda44cd CR 2016-04-13 13:29:00 -07:00
Brad Hefta-Gaub
4b3b917af6 add support for avatar licenses in FST files 2016-04-13 12:26:09 -07:00
Ryan Huffman
e563de9ef8 Fix 'array is too large' warning 2016-04-13 11:28:54 -07:00
Ryan Huffman
6cbd31fa51 Cleanup unnecessary scoping in pureVirtualCall 2016-04-13 11:28:37 -07:00
samcake
7653fa2c37 Fixing the resize of framebuffer to avoid reassigning the render buffer every frame 2016-04-13 10:56:29 -07:00
Ryan Huffman
7fbaa77c0b Fix missing brace in namespace 2016-04-13 10:24:39 -07:00
samcake
f6dc7eb746 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-13 10:08:33 -07:00
samcake
e4d3e848f6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-13 10:05:06 -07:00
samcake
bba2517669 Merge branch 'red' of https://github.com/samcake/hifi into red 2016-04-13 10:04:25 -07:00
Seth Alves
3288bff963 don't flood log with messages about expired actions. also, try to remove such actions 2016-04-13 09:47:07 -07:00
Ryan Huffman
91da4229ac Fix unused variable warning in CrashHelpers.h 2016-04-13 09:42:20 -07:00
Seth Alves
d6673fb3c0 Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-13 09:01:43 -07:00
samcake
e9a0365454 Removing an include not needed 2016-04-13 00:16:04 -07:00
Brad Hefta-Gaub
0f8842f582 Merge pull request #7637 from zzmp/fix/tex-transfer-free 
Cleanly shutdown the texture transfer thread on quit
 2016-04-12 19:28:51 -07:00
Seth Alves
298fe1e188 Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-12 19:21:03 -07:00
Stephen Birarda
8832a9d9ed add ICEServerHeartbeatACK packet type 2016-04-12 17:59:07 -07:00
Brad Davis
1a02220886 Fixing wobble 2016-04-12 17:50:59 -07:00
samcake
0477f89b1b Justing exposing the timer correctly 2016-04-12 17:05:23 -07:00
Brad Davis
3325c58ceb Vive timewarp implementation 2016-04-12 16:44:15 -07:00
Ryan Huffman
0c1277ae7a Add CrashHelpers.h and add to separate submenu 2016-04-12 16:44:11 -07:00
samcake
49af41afca Merging with master 2016-04-12 16:14:24 -07:00
Atlante45
0f62d5c997 clear ATP assets on domain change 2016-04-12 15:30:53 -07:00
Atlante45
7c652aa3ca Add lock on ResourceCache data structs 2016-04-12 15:30:39 -07:00
samcake
ff1df0d45e Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb Trying something a bit more radical for timing 2016-04-12 15:29:31 -07:00
Anthony J. Thibault
a1bbb63ec4 Rig: save and restore user animations across resets 2016-04-12 14:51:17 -07:00
Brad Hefta-Gaub
88ca5520be Merge pull request #7647 from jherico/rate_counter 
Fixing rate counter
 2016-04-12 14:48:05 -07:00
Brad Davis
9f2eabe6ce Fixing rate counter 2016-04-12 14:11:56 -07:00
Atlante45
364f935b89 Allow cleanup of the old request 2016-04-12 13:51:11 -07:00
Atlante45
c8aeecdabd Don't fire onGeoMappLoading twice 2016-04-12 13:51:11 -07:00
Atlante45
05895f628a Revert to using a Resource 2016-04-12 13:51:11 -07:00
Atlante45
5cc90ce8f0 Make sure resource req are cleaned up with there parents 2016-04-12 13:51:11 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
5eb4f63573 Use ResourceManager in anim loader 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Seth Alves
2b63c2a8ba Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix 
Rename CPUID to CPUIdent to fix XCode 7.2 builds
 2016-04-12 12:48:15 -07:00
Seth Alves
460fdc0761 Merge pull request #7536 from samcake/orange 
First pass at using compressed format when uploading textures
 2016-04-12 11:59:10 -07:00
Brad Davis
dfc1d896cd Fix shutdown crash 2016-04-12 11:49:55 -07:00
Seth Alves
e4c91e5064 add a heuristic for deciding when it's safe to enable bullet 2016-04-12 11:46:00 -07:00
Brad Davis
4b02e8437c Fix menu items created by plugins 2016-04-12 11:15:06 -07:00
Anthony J. Thibault
32ccc1d68e Windows build fixes 2016-04-12 10:53:04 -07:00
Chris Collins
0faab41057 Merge pull request #7624 from birarda/new-home-set 
allow ATP scripts to be used by scripted Agent
 2016-04-12 09:42:14 -07:00
samcake
70ac8ac8a5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-12 08:56:15 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
ad8d7b2ffa Merge pull request #7620 from sethalves/make-fixupMissingParents-more-thread-safe 
guard access to _missingParent vector with a lock
 2016-04-12 08:32:38 -07:00
Brad Hefta-Gaub
9a687bea44 Merge pull request #7628 from jherico/save_scripts 
Save the set of running scripts when they change, as well as at shutdown
 2016-04-12 08:32:10 -07:00
Brad Hefta-Gaub
c5840f217a Merge pull request #7630 from jherico/fps_fix 
Fix FPS counter
 2016-04-12 08:31:58 -07:00
samcake
042a419669 Adding counters, not sure they are really useful or that this is the best way to do this... 2016-04-12 02:44:10 -07:00
samcake
816a35099a Adding tcpu timer on some jobs 2016-04-11 18:34:52 -07:00
samcake
90fd9d77a5 Merging with Master 2016-04-11 18:34:14 -07:00
Zach Pomerantz
c72a5f3605 Exit cleanly in debug with GL logger 2016-04-11 16:32:55 -07:00
Zach Pomerantz
666bf8d42b Reset GL tex canvas while still running 2016-04-11 14:04:34 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70 Move gl info queries to GLHelpers 2016-04-11 13:28:18 -07:00
Zach Pomerantz
1b7256d344 Clean shutdown for Texture Transfer thread 2016-04-11 12:59:53 -07:00
samcake
8a233ec9a1 the stereo rendering is working correctly, will now look for more performances 2016-04-11 12:32:59 -07:00
Anthony J. Thibault
470aac3acf Rename CPUID to CPUIdent to fix XCode 7.2 builds 2016-04-11 11:54:17 -07:00
samcake
f23f3a8c2d Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-11 10:10:58 -07:00
Seth Alves
1d63f6d354 Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe 2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
b758acb7d8 Merge pull request #7610 from zzmp/fix/standard-qt-gl 
Codify qt qml version in one header
 2016-04-11 09:45:21 -07:00
Brad Hefta-Gaub
47ff5c090d Merge pull request #7623 from ZappoMan/fixAnimationFrameExport 
fix export of animation properties
 2016-04-11 09:37:47 -07:00