Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 10:36:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40559 commits 76 branches 59 tags 1.2 GiB
Commit graph

40559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clément Brisset
fc0675d0b8 Merge pull request #91 from birarda/atp-mappings 
add short-circuiting for invalid paths or hashes
 2016-03-10 12:46:41 -08:00
Stephen Birarda
e3cae5b026 change setMapping for new disconnected error case 2016-03-10 12:26:00 -08:00
Stephen Birarda
50a05df721 fix asset loading with error changes 2016-03-10 11:58:57 -08:00
Stephen Birarda
9c53f40fbe remove nullptr check in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
2bbeac6597 short circuit asset request for invalid hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
fccad7dca4 remove nullptr request checks in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
b0c326fa2c Merge pull request #92 from huffman/atp-more 
Atp more
 2016-03-10 10:51:12 -08:00
James B. Pollack
c05e996913 remove lifetime 2016-03-10 10:38:49 -08:00
Ryan Huffman
0df05d273d Implement addToWorld in asset window 2016-03-10 10:25:51 -08:00
Ryan Huffman
b42bec78dc Add Entities.addModelEntity 2016-03-10 10:25:20 -08:00
Ryan Huffman
3df8f4ad26 Merge pull request #90 from birarda/atp-mappings 
error message boxes for mapping operation errors, reload on load
 2016-03-10 10:22:34 -08:00
Brad Hefta-Gaub
1547fc15aa Merge pull request #7305 from PhilipRosedale/editHandles 
Adjust edit handle sizes
 2016-03-10 09:46:43 -08:00
samcake
a26f522f33 Merge pull request #7308 from jherico/shaders 
Fix link problem with shaders that use transparency and normal maps
 2016-03-10 09:35:35 -08:00
Brad Hefta-Gaub
99d26e0ef5 Merge pull request #7310 from jherico/crashes 
Addressing thread safety issues
 2016-03-10 09:26:49 -08:00
Brad Hefta-Gaub
ee727b0632 Merge pull request #7304 from Atlante45/master 
Fix messed up LogDialog multi-lines
 2016-03-10 09:23:35 -08:00
Stephen Birarda
899595183e add reload of mappings on component complete 2016-03-10 09:02:45 -08:00
Stephen Birarda
f1919031de error message boxes for mapping errors 2016-03-10 08:57:37 -08:00
Philip Rosedale
ee1e4b898e Merge pull request #7278 from AndrewMeadows/simulation-priority 
adjust simulation priorities
 2016-03-10 08:52:18 -08:00
Brad Davis
ee017cf0a5 Make script cache thread safe 2016-03-10 08:47:11 -08:00
Brad Davis
f97e61e305 Make scripting interface members thread safe 2016-03-10 08:46:09 -08:00
Brad Hefta-Gaub
aaed1d333b Merge pull request #7309 from jherico/compositor_threading_fix 
Handle fake mouse events properly when triggered from a script
 2016-03-10 08:37:30 -08:00
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