Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 18:20:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40540 commits 25 branches 0 tags 1.1 GiB
Commit graph

40540 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
fd53d4de2b Merge pull request #7280 from zzmp/fix/fbx-multiple-mats 
Fix inlined fbx content for identically named texs with different paths
 2016-03-08 14:41:23 -08:00
Zach Pomerantz
883d4ba006 Only cache processed textures 2016-03-08 14:39:53 -08:00
Clément Brisset
3a9140f336 Merge pull request #80 from birarda/atp-mappings 
handle multiple paths for mapping delete operations
 2016-03-08 14:38:25 -08:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Brad Hefta-Gaub
d879300413 Merge pull request #7277 from sethalves/edit-vs-mouse-grab 
Edit vs mouse grab
 2016-03-08 14:19:40 -08:00
Chris Collins
48af6b0476 Merge pull request #7275 from jherico/oculus_init 
Oculus updates for upcoming runtime changes
 2016-03-08 14:00:06 -08:00
James B. Pollack
d4fd9d4157 Update tank.js 2016-03-08 13:55:28 -08:00
James B. Pollack
645f0da280 code cleanupo 2016-03-08 13:50:04 -08:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
James B. Pollack
b08a9baa5c move cellscience 2016-03-08 13:44:03 -08:00
Ryan Huffman
8a61c53292 Merge pull request #79 from Atlante45/feat/atp 
ATP server UI
 2016-03-08 13:33:16 -08:00
Zach Pomerantz
925ea8bcda Add Resource::isCacheable 2016-03-08 13:30:58 -08:00
Atlante45
0bed46d43a Fix typos and file browser directory 2016-03-08 13:24:36 -08:00
Atlante45
74fb1aab55 Add file dialog 2016-03-08 13:15:04 -08:00
Atlante45
e32fd4524c Start wiring UI 2016-03-08 13:13:45 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
e0371929a2 Remove unused variables 2016-03-08 13:13:45 -08:00
Atlante45
51be88d4c3 Reset Window changes 2016-03-08 13:13:45 -08:00
Atlante45
320bd2b4d4 Reset ContentSection scheme 2016-03-08 13:13:45 -08:00
Atlante45
d0e29846f4 Add GlyphButton 2016-03-08 13:13:45 -08:00
Atlante45
6fecb4e1d1 Window fixup 2016-03-08 13:13:45 -08:00
Atlante45
30a6dd8629 Update StaticSection 2016-03-08 13:13:45 -08:00
Atlante45
82d6d3ff01 Small fix to buttons color 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Ryan Huffman
4d49283f25 Merge pull request #78 from birarda/atp-mappings 
client side handling of mappings, persistence of mappings in AssetServer
 2016-03-08 13:12:38 -08:00
Stephen Birarda
969244927b use extension for entity add for drag and drop upload 2016-03-08 13:09:20 -08:00
Clément Brisset
fc98408922 Merge pull request #7279 from jherico/osx_gl_fix 
Bypass baffling OSX GL error
 2016-03-08 13:08:49 -08:00
Bradley Austin Davis
7d046c30a9 Bypass baffling OSX GL error 2016-03-08 12:23:29 -08:00
Zach Pomerantz
77958e2a48 Change FBXReader impl to recognize inlined tex 2016-03-08 12:23:23 -08:00
Stephen Birarda
28af9c51e6 add a missing parenthesis 2016-03-08 12:22:13 -08:00
Stephen Birarda
cf5de317ba use correct error handling for MappingRequest errors 2016-03-08 12:21:54 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
7cc774c5f4 indentation fix for _filesDirectory in AssetServer 2016-03-08 11:55:29 -08:00
Stephen Birarda
e92a9c9741 fix comment for asset packet version push 2016-03-08 11:53:53 -08:00
Stephen Birarda
88c1892bf6 remove a comment block re-added in merge 2016-03-08 11:51:59 -08:00
Stephen Birarda
c4845e5ae5 remove getMapping call from AssetServer that is unused 2016-03-08 11:50:23 -08:00
Stephen Birarda
4608eddb40 remove an extra blank line 2016-03-08 11:47:55 -08:00
Stephen Birarda
7ecfc20dc2 add error handling for asset-server files directory 2016-03-08 11:47:11 -08:00
Stephen Birarda
8107287e6c remove start from mapping request subclasses 2016-03-08 11:42:57 -08:00
Stephen Birarda
4236d8e147 replace toLocal8Bit with toUtf8 for hex conversions 2016-03-08 11:40:35 -08:00
Stephen Birarda
063826638e move handling of get all operation to sep method 2016-03-08 11:39:28 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Seth Alves
40bc66c154 Merge pull request #7272 from imgntn/shapetype 
"Collision Shape Type" in edit.js instead of "Shape Type"
 2016-03-08 11:34:42 -08:00
samcake
5299b06e83 Reintroducing the use of the DiffuseFactor so both Bender and MAya looks closer to Hifi 2016-03-08 11:26:16 -08:00
Stephen Birarda
79e788523b Merge pull request #76 from huffman/atp-mappings 
Atp mappings
 2016-03-08 11:21:18 -08:00
Brad Davis
166a419e90 Oculus update 2016-03-08 11:20:53 -08:00
Ryan Huffman
5368ae3f91 Remove extraneous thread checks in MappingRequest subclasses 2016-03-08 11:20:15 -08:00
Ryan Huffman
93d3fb5ccf Fix network error response for mapping requests 2016-03-08 11:19:08 -08:00