Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 14:13:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
23026 commits 71 branches 56 tags 1.2 GiB
Commit graph

23026 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
cde41bd49b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-13 17:01:27 -07:00
Andrew Meadows
748cd09936 Merge pull request #4435 from huffman/edit-lights-overlays 
Add light icons when in edit mode
 2015-03-13 15:56:05 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Stephen Birarda
2b08c20900 Merge pull request #4440 from birarda/master 
remove the close activity from Interface
 2015-03-13 13:46:59 -07:00
Stephen Birarda
9c00663b09 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-13 11:41:35 -07:00
Stephen Birarda
8a6de53ede Merge pull request #4444 from huffman/update-edit-icons 
Update edit icons
 2015-03-13 11:05:25 -07:00
Stephen Birarda
ed45dea0bd Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-13 10:51:45 -07:00
Stephen Birarda
f8c549ab87 Merge pull request #4443 from huffman/fix-svo-path-detection 
Fix issue with .svo's not loading when the url has parameters
 2015-03-13 10:40:29 -07:00
Ryan Huffman
e94bac1971 Fix subimage indexing in toolBars.js 2015-03-13 10:07:31 -07:00
Ryan Huffman
504dceda6b Update edit.js icons 2015-03-13 10:07:12 -07:00
Ryan Huffman
2a84d9a6ab Fix issue with .svo's not loading when the url has parameters 2015-03-13 10:06:49 -07:00
Stephen Birarda
edaee9716b Merge pull request #4438 from huffman/edit-rename 
Move editEntities.js to edit.js
 2015-03-13 09:39:34 -07:00
Clément Brisset
f5777867da Merge pull request #4439 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-13 09:00:14 -07:00
Stephen Birarda
14ed39ac06 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-12 17:50:52 -07:00
Brad Hefta-Gaub
fadd1a09e5 Merge pull request #4433 from ZappoMan/fix3DTV 
fix rendering of models in 3D TV mode
 2015-03-12 16:42:37 -07:00
Brad Hefta-Gaub
a6b5a73844 Merge pull request #4431 from ZappoMan/windowsMenuAssert 
Fix windows assert
 2015-03-12 16:42:10 -07:00
Ryan Huffman
a3c2df5c77 Add menu option to turn on/off showing lights in edit mode 2015-03-12 16:16:29 -07:00
Ryan Huffman
165199c69d Update light overlay size 2015-03-12 15:55:31 -07:00
Stephen Birarda
0fe843db01 Revert "remove the launch activity from UserActivityLogger" 
This reverts commit bc6ac9081f.
 2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f remove the launch activity from UserActivityLogger 2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123 remove the close event from UserActivityLogger 2015-03-12 15:06:44 -07:00
Stephen Birarda
df8864f9b0 Revert "make sure UserActivityLogger::close() waits for the pending log message to complete" 
This reverts commit 3bd3f5a6d2.
 2015-03-12 15:04:51 -07:00
Brad Hefta-Gaub
6e10ed7f9b Merge pull request #4437 from birarda/master 
graceful cleanup of NodeList in Application
 2015-03-12 12:52:58 -07:00
Ryan Huffman
2bedd1cfc7 Move editEntities.js to edit.js 2015-03-12 12:39:06 -07:00
Stephen Birarda
471e55c8ce fix some lingering warnings 2015-03-12 12:36:39 -07:00
Stephen Birarda
09e2c0987e use Dependency customDeleter for Application NL 2015-03-12 12:27:48 -07:00
Stephen Birarda
cd2ce2ee2f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-12 12:14:43 -07:00
Stephen Birarda
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Ryan Huffman
4335a41002 Update editEntities to call setActive on init 2015-03-12 11:38:51 -07:00
Ryan Huffman
c13ba4a318 Add toggling of light visibility 2015-03-12 11:38:29 -07:00
Stephen Birarda
6c7e0eda6a Merge pull request #4432 from Atlante45/dm_update 
Dependency::customDeleter uses a lambda
 2015-03-12 11:33:32 -07:00
Stephen Birarda
278813e47f Merge pull request #4434 from highfidelity/revert-4429-master 
Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList...
 2015-03-12 11:28:13 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045 Merge pull request #4429 from birarda/master 
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
 2015-03-12 11:26:56 -07:00
Ryan Huffman
ccbbba3def Update light default dimensions 2015-03-12 11:18:42 -07:00
Ryan Huffman
d82598327b Add light overlays 2015-03-12 11:18:32 -07:00
Ryan Huffman
5c9ec6bdcc Add add/delete/rename/clear events to EntitiesScriptingInterface 2015-03-12 11:17:07 -07:00
Atlante45
eb5206f8e6 Naming 2015-03-12 19:05:06 +01:00
ZappoMan
bbcce6a891 fix rendering of models in 3D TV mode 2015-03-12 10:59:12 -07:00
Stephen Birarda
3279e19b3d Merge pull request #4430 from Atlante45/update_login_on_launch 
Update Login menu item on creation
 2015-03-12 10:55:07 -07:00
Atlante45
0bd97ce40c Dependency::customDeleter uses a lambda 2015-03-12 18:53:29 +01:00
ZappoMan
cd52bab2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into windowsMenuAssert 2015-03-12 08:59:51 -07:00
Brad Hefta-Gaub
8768b53124 Merge pull request #4416 from Atlante45/package_models 
Package models
 2015-03-12 08:57:46 -07:00
Atlante45
52c0ba817a Remove dead code 2015-03-12 16:32:09 +01:00
Atlante45
d858956ad8 Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 16:31:03 +01:00
Brad Hefta-Gaub
f91a19a918 Merge pull request #4424 from huffman/open-svo 
Handle drag-n-dropped .svos and using interface to open .svo files
 2015-03-12 08:15:25 -07:00
Atlante45
decd240f60 Update Login menu item on startup after creation 2015-03-12 14:53:11 +01:00
Atlante45
bcfd4b50be Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 14:18:37 +01:00
ZappoMan
b798761ec5 test fix for Austin's repro 2015-03-11 23:55:53 -07:00