Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:54:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40536 commits 25 branches 0 tags 1.1 GiB
Commit graph

40536 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
55248bc076 Merge pull request #89 from huffman/atp-fixes 
Add mapping sorting, copying, and isKnownMapping
 2016-03-10 08:36:26 -08:00
Brad Hefta-Gaub
82ca78b37b Merge pull request #7300 from sethalves/fix-detach-crash 
fix removing attachments
 2016-03-10 08:23:52 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Brad Davis
f04d1b4998 Handle fake mouse events properly when triggered from a script 2016-03-09 22:11:40 -08:00
Brad Davis
aad2aaa764 Fix link problem with shaders that use transparency and normal maps 2016-03-09 20:01:18 -08:00
Chris Collins
f98b6c3a28 Merge pull request #7303 from jherico/watchdog 
Update the watchdog heartbeat manually during startup
 2016-03-09 19:11:30 -08:00
Ryan Huffman
5a39718645 Merge pull request #88 from birarda/atp-mappings 
fix for leading slash in mapping load, asset-server load of bad mappings
 2016-03-09 19:07:45 -08:00
David Rowe
4c3f374f02 Update HiFi glyphs font file 
Has some new, soon to be used characters, but no other changes.
 2016-03-10 15:10:44 +13:00
Stephen Birarda
ae3c0f6646 add hash and path checking 2016-03-09 18:03:44 -08:00
PhilipRosedale
c11487735f Adjust grab handle sizes 2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31 Adjust grab handle sizes 2016-03-09 17:43:44 -08:00
Stephen Birarda
672f8ec1f7 add checking for leading slash in mapping operations 2016-03-09 17:43:31 -08:00
James B. Pollack
a8ac556103 merge 2016-03-09 17:41:14 -08:00
James B. Pollack
f35ab59044 adjust bubbles and add a treasure chest 2016-03-09 17:36:45 -08:00
Stephen Birarda
6f044e1cd3 handling for leading slashes while loading mappings 2016-03-09 17:36:04 -08:00
Atlante45
f6e01bbd36 Fix messed up LogDialog multi-lines 2016-03-09 17:31:04 -08:00
Stephen Birarda
7b08ae3747 drop invalid mappings on AssetServer load 2016-03-09 17:30:02 -08:00
Brad Davis
9645ed9120 Update the watchdog heartbeat manually during startup 2016-03-09 17:00:45 -08:00
Stephen Birarda
ea5349f7a0 remove ctor and dtor for AssetMappingsScriptingInterface 2016-03-09 16:59:31 -08:00
Stephen Birarda
85fe1349eb fix filename in header comment for AssetMappingsScriptingInterface 2016-03-09 16:58:53 -08:00
Stephen Birarda
0fae72fdab Merge pull request #87 from huffman/atp-model 
ATP Model
 2016-03-09 16:57:26 -08:00
Ryan Huffman
738ae54e8d Remove comment 2016-03-09 16:56:28 -08:00
Ryan Huffman
dd52dd69d9 Fix rename mapping 2016-03-09 16:50:37 -08:00
Ryan Huffman
fa66c0a521 Remove old model code 2016-03-09 16:44:51 -08:00
Ryan Huffman
3467e06199 Fix bugs in mapping model update 2016-03-09 16:44:41 -08:00
Ryan Huffman
232bfc9061 Cleanup AssetServer qml 2016-03-09 16:44:31 -08:00
Howard Stearns
2b576e86f0 Merge pull request #7259 from jherico/crashes 
Crash fixes
 2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Chris Collins
690d877e93 Merge pull request #7292 from zzmp/fix/cache-loaded 
Mark Resource loaded after postprocessing
 2016-03-09 16:31:45 -08:00
Ryan Huffman
ebc6c8ce44 Add proper model updating to asset mapping model 2016-03-09 16:29:51 -08:00
Ryan Huffman
f23057b1c0 Add renaming to Asset qml 2016-03-09 16:29:17 -08:00
Seth Alves
fbbc27213d Merge pull request #7287 from PhilipRosedale/fireflies 
Fireflies
 2016-03-09 15:20:27 -08:00
James B. Pollack
7c44556234 Merge pull request #7301 from ericrius1/growingPlant 
Remove prematurely added VRVJ folder from examples folder
 2016-03-09 15:17:17 -08:00
ericrius1
05d26be300 delete file 2016-03-09 15:15:20 -08:00
ericrius1
7b20fdcc1a add file before delete 2016-03-09 15:14:51 -08:00
James B. Pollack
7cdd3d5b3e Merge pull request #7296 from imgntn/cellscience 
Various Cellscience Fixes
 2016-03-09 15:11:58 -08:00
ericrius1
974189b546 deleted cartridge spawner 2016-03-09 15:10:35 -08:00
Ryan Huffman
d299ce2677 Fix missing semicolon 2016-03-09 14:56:56 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Brad Davis
23a89a63d8 Set deadlock thread name 2016-03-09 14:51:19 -08:00
Brad Davis
6d090895b7 Don't crash on QML menu creation failure 2016-03-09 14:48:20 -08:00
PhilipRosedale
5230d3a705 Added header 2016-03-09 14:45:26 -08:00
Clément Brisset
aeee89eb15 Merge pull request #86 from birarda/atp-mappings 
disable client caching of ATP mappings, fix bug retreiving assets
 2016-03-09 14:40:57 -08:00
Seth Alves
d95d0f59cb keep removed attachment models around for one extra call to fixupModelsInScene 2016-03-09 14:36:50 -08:00
Clément Brisset
9453ff3dea Merge pull request #85 from birarda/atp-rename-mapping 
add folder delete/rename, some AssetServer operation bug fixes
 2016-03-09 14:36:33 -08:00
Brad Davis
3145069a10 Merge pull request #7295 from birarda/raleway-installer-fix 
manually rename Raleway font with incorrect casing after install
 2016-03-09 14:31:13 -08:00
Stephen Birarda
57ea51d244 Merge pull request #84 from Atlante45/feat/atp 
Replace old drag&drop with new UI
 2016-03-09 14:26:49 -08:00
Stephen Birarda
e2b976d9f1 remove debug, fix asset find bug for incorrect folder 2016-03-09 14:24:35 -08:00
Stephen Birarda
96ba57a946 remove client side caching of ATP mappings 2016-03-09 14:24:14 -08:00