Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 19:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19696 commits 74 branches 59 tags 1.2 GiB
Commit graph

19696 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
990a533eea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 17:13:32 -08:00
Sam Gateau
90024ec1ee Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-02 17:09:23 -08:00
Sam Gateau
1aec214138 gabbing the AnbientCOlor value, we will use it as the lighmap global level 2014-12-02 16:23:09 -08:00
Andrzej Kapolka
9753041a1a Height brush bits. 2014-12-02 16:11:29 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958 Update checkMove to only update rotation handles instead of all handles 2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2 Move baseOfEntityProjectionOverlay update to updateHandles() 2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a Increase size of selection boxes 2014-12-02 15:59:56 -08:00
Ryan Huffman
2b5a4e4563 Add selection boxes in multi-selection mode 2014-12-02 15:56:43 -08:00
Ryan Huffman
77365ec282 Move entity selection to click event and add ability to deselect 2014-12-02 15:49:45 -08:00
Ryan
654de8ad48 Merge remote-tracking branch 'hifi/master' 2014-12-02 15:32:22 -08:00
Philip Rosedale
73d358b150 Merge pull request #3888 from PhilipRosedale/master 
Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js
 2014-12-02 15:31:50 -08:00
Philip Rosedale
8c506c0301 Merge pull request #3887 from samcake/tot 
Hack for the Viking Palace scene before demo for good looking lightmaps
 2014-12-02 15:31:15 -08:00
ZappoMan
bb6e302d69 support toggle of light picking in newEditEntities.js 2014-12-02 15:23:05 -08:00
Ryan Huffman
167ab05de4 Default 'Allow Select Large/Small Models' to true 2014-12-02 15:19:51 -08:00
Ryan
c63c0451ac Merge remote-tracking branch 'hifi/master' 2014-12-02 15:05:57 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Philip Rosedale
06b22cf605 ...and don't turn on/off UI from hydra 2014-12-02 14:50:25 -08:00
Andrzej Kapolka
284cd54e28 More detachment fixes. 2014-12-02 14:33:54 -08:00
Philip Rosedale
1ce201c04f add same for rotation 2014-12-02 14:33:19 -08:00
Philip Rosedale
2f11501e5b Fix constant movement with hydra by adding null zone for thrust 2014-12-02 14:28:46 -08:00
Sam Gateau
8b75272cde Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-02 13:49:28 -08:00
Sam Gateau
40df497374 Hack for the Viking Palace scene before demo for good looking lightmaps 2014-12-02 13:48:59 -08:00
Atlante45
bf21376c90 TexturedHemisphere class 2014-12-02 13:34:11 -08:00
Andrzej Kapolka
d7a64260b1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 13:24:46 -08:00
Andrzej Kapolka
b613511b74 Merge pull request #3886 from ey6es/master 
At least on Linux, fixes an annoying issue where closing the application
 2014-12-02 13:24:03 -08:00
Andrzej Kapolka
4d233c09a3 At least on Linux, fixes an annoying issue where closing the application 
window causes it to disappear and reappear briefly before exiting.
 2014-12-02 13:19:39 -08:00
Andrzej Kapolka
a022b7fa17 Fix for successive heightfield placements. 2014-12-02 13:12:45 -08:00
ZappoMan
cc012aad00 reset view frustum 2014-12-02 12:54:10 -08:00
Atlante45
3c5f33f0ac Hemisphere vbo refactoring 2014-12-02 12:28:04 -08:00
Ryan Huffman
89b3a4d987 Fix selection shadow not updating when grid moves 2014-12-02 12:17:10 -08:00
Andrzej Kapolka
b4b1559e32 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 12:07:38 -08:00
ZappoMan
6d385d9a75 get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-02 11:45:33 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Ryan
c496978be2 Merge remote-tracking branch 'hifi/master' 2014-12-02 11:30:43 -08:00
Brad Hefta-Gaub
22bee75f7f Merge pull request #3885 from birarda/double-scripts 
fix for ScriptEngine blocked load
 2014-12-02 11:19:28 -08:00
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -08:00
Stephen Birarda
0a92374ca6 fix an incorrect connection to script load error 2014-12-02 10:39:20 -08:00
Ryan
b68411cf36 Merge remote-tracking branch 'hifi/master' 2014-12-02 10:30:26 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
Brad Hefta-Gaub
9d213f9fb7 Merge pull request #3884 from huffman/entity-tools-polish 
Entity tools polish
 2014-12-02 10:21:20 -08:00
Brad Hefta-Gaub
f379d63182 Merge pull request #3882 from ctrlaltdavid/vs2013-build-instructions 
Update build instructions for VS2013 Community and Professional
 2014-12-02 10:20:16 -08:00
Brad Hefta-Gaub
3f87287870 Merge pull request #3881 from ctrlaltdavid/find-vs2013-libovr 
Find Oculus libraries when using Visual Studio 2013
 2014-12-02 10:19:53 -08:00
Brad Hefta-Gaub
7f8f57b055 Merge pull request #3879 from birarda/master 
fix for ice-server heartbeat without an access token, hifi:// URL
 2014-12-02 10:19:12 -08:00
Stephen Birarda
36f716cd61 have script loading be separate from ScriptEngine constructor 2014-12-02 10:13:43 -08:00
Stephen Birarda
2a9c8c5ed9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-02 09:25:21 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Andrzej Kapolka
a46b46b5a2 Fix for merging. 2014-12-01 19:10:10 -08:00