Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 13:58:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68649 commits 67 branches 56 tags 1.2 GiB
Commit graph

68649 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
e806348eeb MS15916: Fix multiple issues with Spectator Camera 2018-06-14 12:20:57 -07:00
Stephen Birarda
883c758722
Merge pull request #13144 from huffman/fix/remove-entity-server-backups 
Remove old entity backups and OctreePersistThread refactoring
 2018-06-13 15:25:46 -07:00
Stephen Birarda
4142280e2b
Merge pull request #12999 from birarda/bug/avatar-data-max-allowed 
allow avatar data to use full segment size
 2018-06-13 14:00:26 -07:00
Ryan Huffman
2b49d84a22 Add better error logging in Octree::writeToJSONFile 2018-06-13 12:57:06 -07:00
Zach Fox
ce0e66a7af
Merge pull request #13367 from zfox23/MS15858_360SnapCrash 
Fix MS15858: Prevent Interface deadlock during 360 Snap capture
 2018-06-13 12:36:24 -07:00
Ryan Huffman
c2f08dfdba Update Octree to atomically persist data 2018-06-13 12:24:09 -07:00
Ryan Huffman
b8f987f02e
Merge pull request #13359 from huffman/fix/script-resources-load 
Fix resources path URLs not working with Script.resolvePath
 2018-06-13 12:19:46 -07:00
Ryan Huffman
6b159d6124 Remove redundant read of octree data on startup 2018-06-13 11:54:20 -07:00
Clément Brisset
11d84e780d
Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta 
Add uncompressed KTX files to baked texture output
 2018-06-13 11:49:41 -07:00
Zach Fox
e49df4a0ab Fix MS15858: Prevent Interface deadlock during 360 Snap capture 2018-06-13 11:42:18 -07:00
John Conklin II
27f81c891b
Merge pull request #13360 from gcalero/android_version_code 
Set android versionCode and versionName through gradle parameter RELE…
 2018-06-13 11:26:00 -07:00
Ryan Huffman
4e230c9e5d Remove redundant setvbuf and update signal/slot syntax in OctreeServer 2018-06-13 11:23:37 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers 
handle semantic version numbers in interface/sandbox update
 2018-06-13 11:16:56 -07:00
Stephen Birarda
765850eee1
Merge pull request #13365 from huffman/fix/bake-texture-crash 
Fix crash in image baking due to undefined mip format
 2018-06-13 10:44:07 -07:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags 
Scripted Blendshapes and Procedural Face Movement Flags
 2018-06-13 10:32:59 -07:00
Sam Gondelman
e25c6c5316
Merge pull request #13356 from gcalero/show_jump_button 
Don't hide jump button while moving
 2018-06-13 09:52:30 -07:00
Ryan Huffman
569f7dc308 Fix crash in image baking due to undefined mip format 
A recent change caused formatMip to no longer be specified. This causes
an issue deeper in the code when generating mips, causing a
Q_UNREACHABLE to be hit.
 2018-06-13 08:33:22 -07:00
John Conklin II
48002ee9fa
Merge pull request #13363 from Atlante45/new-master 
The last merge back
 2018-06-12 17:55:06 -07:00
Clément Brisset
91d7990d7a
Merge pull request #12854 from birarda/bug/hdr-format-static 
fix skybox bake assert on HDR_FORMAT static order initialization
 2018-06-12 17:19:27 -07:00
Stephen Birarda
09a3d5d91c
Merge pull request #13320 from birarda/wireshark-plugin 
add domain packet dissector, improve entity dissector
 2018-06-12 17:05:03 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
Ryan Huffman
a558f71fcd Fix resoruces path URLs not working with Script.resolvePath 
Depending on the context, "/~/" means different things. The ScriptEngine
resolves this path to `/scripts`, but everywhere else it resolves to
`/resources`. This change forces us to expand those paths instead of
storing the "/~/" path, which will be incorrectly resolved once the
ScriptEnging is using it.
 2018-06-12 16:55:31 -07:00
Stephen Birarda
016a6dcd84 use ref for HDR_FORMAT to avoid static order 2018-06-12 16:31:57 -07:00
Howard Stearns
6f011b70ac
Merge pull request #13358 from howard-stearns/drill-down-to-place-and-stack-goto-cards 
MS15788: drillDownToPlace and isStacked based on server data.
 2018-06-12 16:18:54 -07:00
Gabriel Calero
395767ed80 Set android versionCode and versionName through gradle parameter RELEASE_NUMBER 2018-06-12 20:11:22 -03:00
Stephen Birarda
4713d8d44c fix reference to builds URL for sandbox check 2018-06-12 16:06:17 -07:00
Zach Fox
ffb9a47be0
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots 
Interface Fix for MS14314: Make use of original image filename when sharing
 2018-06-12 15:10:22 -07:00
Anthony Thibault
027c4f6b9e
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68 
Large avatars should instantly shrink when entering small height domains
 2018-06-12 14:57:07 -07:00
Anthony Thibault
717093abf7
Merge pull request #13171 from luiscuenca/handTouchToDefault 
Enable Avatar Hand Touch Script by Default
 2018-06-12 14:54:26 -07:00
John Conklin II
8816aa4376
Merge pull request #13223 from highfidelity/RC68 
Beta Release 68 - branched at Developer Release 8318
 2018-06-12 14:04:19 -07:00
howard-stearns
05d3f92867 drillDownToPlace and iStacked based on server data. 2018-06-12 13:18:44 -07:00
Gabriel
649ffbe259
Don't hide jump button while moving 2018-06-12 16:15:54 -03:00
Zach Fox
bf5d6de780 Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots 2018-06-12 11:19:05 -07:00
Zach Fox
cf9cf45d02
Merge pull request #13348 from zfox23/MS14129_buyButtonStuck 
Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state
 2018-06-12 11:02:52 -07:00
Luis Cuenca
9126a6f66d
hide debug lines 2018-06-12 10:12:28 -07:00
John Conklin II
ae795115f2
Merge pull request #13352 from AndrewMeadows/RC68-without-PR13162 
Rc68 without pr13162
 2018-06-12 09:40:07 -07:00
Zach Fox
860f9db939 Remove logging 2018-06-12 09:25:09 -07:00
Andrew Meadows
d31ee52d79 revert PR-13162 from RC68 2018-06-12 03:51:55 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Zach Fox
14034f29a1 Interface Fix for MS14314: Make use of original image filename when sharing 2018-06-11 17:10:09 -07:00
Ryan Huffman
015c092e1c Update oven to only produce uncompressed ktx for cubemaps 2018-06-11 16:37:40 -07:00
Ryan Huffman
38df5d3db5 Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta 2018-06-11 16:17:56 -07:00
Sam Gateau
f769b63c3d
Merge pull request #13308 from jherico/fix/13677 
Fix for black text rendering white in web elements
 2018-06-11 16:17:31 -07:00
Sam Gondelman
e8ec32c7f8
Merge pull request #13340 from SamGondelman/modelTextures 
Try to fix ModelOverlay texture loading
 2018-06-11 16:09:10 -07:00
Zach Fox
a90283e54f
Merge pull request #13328 from zfox23/MS15673_bubbleResizeExperiment 
MS15673: Do some experiments on bubble size
 2018-06-11 15:30:34 -07:00
Stephen Birarda
1b42ddd898
Merge pull request #13252 from birarda/bug/sandbox-backup-instructions 
remove confusing sandbox content update/backup system
 2018-06-11 14:04:07 -07:00
Stephen Birarda
7509e4237f
Merge pull request #13253 from Atlante45/fix/sandbox-logs 
Move Sandbox logs to AppDataLocal
 2018-06-11 13:46:41 -07:00
Zach Fox
7fbc7bf1a5
Merge pull request #13347 from zfox23/MS15721_deleteApp 
Fix MS15721: Delete app.json if installed script isn't running
 2018-06-11 13:28:05 -07:00
Zach Fox
688d82b286 Go back to 60% 2018-06-11 13:23:41 -07:00
Zach Fox
dbd10cc2f0 Merge branch 'master' of github.com:highfidelity/hifi into MS15673_bubbleResizeExperiment 2018-06-11 13:20:34 -07:00