Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 15:59:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42580 commits 25 branches 28 tags 1.2 GiB
Commit graph

42580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
3f0ffc0aff update ice-server address with API, add failed and clear denials 2016-04-14 10:33:17 -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
Ryan Huffman
e76ed6f73a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling 2016-04-14 09:47:03 -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
623bfa3c35 Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix 
Fix for occasional invisible avatars
 2016-04-14 09:32:46 -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
Stephen Birarda
55002b8d5e add ice server address to hearbeat if full networking is on 2016-04-14 09:27:43 -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
Brad Hefta-Gaub
b48503a82d only export joint values if they've been explicitly set by scripts 2016-04-13 19:52:50 -07:00
Seth Alves
63468f8faa Merge pull request #7660 from zzmp/feat/debug-trackers 
Make shared Debug header
 2016-04-13 16:56:11 -07:00
Chris Collins
47522e1774 Merge pull request #7659 from ZappoMan/newLODSettings 
improve reset settings
 2016-04-13 16:49:22 -07:00
Brad Hefta-Gaub
eef3445ede Merge pull request #7361 from imgntn/homereset 
Home reset and content
 2016-04-13 16:27:31 -07:00
Ryan Huffman
b0084926c0 Merge pull request #7644 from birarda/sandbox-ds-settings 
replace Sandbox default content set with Home
 2016-04-13 16:08:00 -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
James B. Pollack
4c9c5a10f6 fanning 2016-04-13 14:33:23 -07:00
Stephen Birarda
d7450b8178 release pending ATP script request for active AssetServer 2016-04-13 14:25:23 -07:00
Stephen Birarda
c7d184ad6b update comment for completed untar 2016-04-13 14:02:14 -07:00
Stephen Birarda
8850ebd158 update electron/electron-prebuilt, remove gunzip option 2016-04-13 14:02:14 -07:00
Stephen Birarda
149bf0be92 allow zlib as much memory as possible for faster speed 2016-04-13 14:02:14 -07:00
Stephen Birarda
db4f1a8acb split gunzip and untar errors 2016-04-13 14:02:14 -07:00
Stephen Birarda
7dbdc9ca0a use tar-fs and zlib for content extraction 2016-04-13 14:02:14 -07:00
Ryan Huffman
bc247ec058 Remove unused Application::crashApplication() 2016-04-13 14:01:41 -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
Brad Hefta-Gaub
9c437c0824 CR feedback 2016-04-13 13:36:28 -07:00
Atlante45
785eda44cd CR 2016-04-13 13:29:00 -07:00
Brad Hefta-Gaub
67af3917bc improve reset settings 2016-04-13 13:18:23 -07:00
Zach Pomerantz
dbd7dd104e Merge pull request #7654 from ZappoMan/newLODSettings 
new default LOD settings, and support for reset settings without crashing
 2016-04-13 13:09:10 -07:00
Brad Hefta-Gaub
1c2c6804ac Merge pull request #7656 from samcake/orange 
Fixing the resize of gpu::framebuffer to avoid unecessary re validation every frame
 2016-04-13 12:34:47 -07:00
Brad Hefta-Gaub
4b3b917af6 add support for avatar licenses in FST files 2016-04-13 12:26:09 -07:00
James B. Pollack
0767f4eef0 robot position 2016-04-13 11:50:45 -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
2d39551a35 Fix style in CrashReporter.cpp 2016-04-13 10:56:27 -07:00
Brad Davis
3421c10c1b Fixing vive hand controllers 2016-04-13 10:35:39 -07:00
Ryan Huffman
fa49c213cc Add threaded crashes 2016-04-13 10:24:56 -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
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
Brad Hefta-Gaub
93f8cfc80a new default LOD settings, and support for reset settings without crashing 2016-04-13 09:26:01 -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