Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40519 commits 71 branches 56 tags 1.2 GiB
Commit graph

40519 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
76ed16314a Add prepended slash on rename if missing 2016-03-10 15:38:20 -08:00
Ryan Huffman
76152906be Fix crash bug in asset manager 2016-03-10 15:37:38 -08:00
Ryan Huffman
c93ba2752b Remove rowDelegate styling for asset window 2016-03-10 14:44:53 -08:00
Ryan Huffman
e4b5c14a4c Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 14:20:22 -08:00
Ryan Huffman
ef8c66c1be Remove commented out code 2016-03-10 14:18:09 -08:00
Ryan Huffman
71bc937533 Remove copy URL button 2016-03-10 13:56:54 -08:00
Ryan Huffman
273acc6a7e Add context menu to asset manager 2016-03-10 13:55:36 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Eric Levin
8828b93062 Merge pull request #7261 from imgntn/newfishes 
Home Fishtank
 2016-03-10 13:23:36 -08:00
Andrew Meadows
a5e94ec087 Merge pull request #7307 from ctrlaltdavid/update-glyphs 
Update HiFi glyphs font file
 2016-03-10 12:55:32 -08:00
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