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

19305 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
Andrzej Kapolka
9753041a1a Height brush bits. 2014-12-02 16:11:29 -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
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
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
Andrzej Kapolka
b4b1559e32 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 12:07:38 -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
Stephen Birarda
0a92374ca6 fix an incorrect connection to script load error 2014-12-02 10:39:20 -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
Andrzej Kapolka
a46b46b5a2 Fix for merging. 2014-12-01 19:10:10 -08:00
Andrzej Kapolka
46f1fc7c0f More work on spanner heightfield edits. 2014-12-01 18:50:24 -08:00
Andrzej Kapolka
5b4869f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-01 16:43:39 -08:00
Andrzej Kapolka
3fbbd6c2de Working on transitioning functions to quadtree equivalents. 2014-12-01 16:43:03 -08:00
Ryan Huffman
9d9a7ead5b Remove unnecessary overlay property updates 2014-12-01 16:39:36 -08:00
Ryan Huffman
a8eb49a822 Remove now-unused *Offset variables 2014-12-01 16:38:40 -08:00
Ryan Huffman
0b7ddb009d Fix tabification of tool windows 2014-12-01 16:33:51 -08:00
Ryan Huffman
ce4d407378 Update normalizeDegrees to be exclusive on the -180 end 2014-12-01 16:12:18 -08:00
Ryan Huffman
06ab17987b Fix position of rotation degrees display 
The position of the display was not always correct depending on the
camera orientation relative to the selection.
 2014-12-01 16:08:50 -08:00
Ryan Huffman
4f0683dc5e Fix stretch tools not following mouse correctly 2014-12-01 15:07:03 -08:00
Ryan Downe Karpf
ea62194057 Merge pull request #3883 from samcake/fbx 
Adding a filter on the apartment model to get better lightmaps
 2014-12-01 13:17:29 -08:00
dev
21d3892094 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx 2014-12-01 13:03:18 -08:00
Ryan Huffman
da568c96ce Add rotation degrees overlay 2014-12-01 12:24:51 -08:00
Ryan Huffman
fc5adef501 Update the tool window to use tabbed windows 2014-12-01 12:24:40 -08:00
Ryan Huffman
2c524cd70c Darken colors of selection/highlight boxes 2014-12-01 12:24:34 -08:00
Ryan Huffman
1950ce5a4b Add option for white grid color 2014-12-01 12:24:24 -08:00
Philip Rosedale
b0877414a4 Merge pull request #3880 from ZappoMan/bugFixes 
oculus mirror lean hack
 2014-12-01 12:01:20 -08:00
Sam Gateau
845e687fc5 Adding a Hack for the apaartment model to boost the lightmaps 2014-12-01 11:45:07 -08:00
David Rowe
09eb150edc Update build instructions for VS2013 Community and Professional 2014-12-01 11:40:35 -08:00
David Rowe
7f36a11f35 Find Oculus libraries when using Visual Studio 2013 2014-12-01 10:40:37 -08:00
ZappoMan
6d7f799dbe oculus mirror lean hack 2014-12-01 10:32:35 -08:00
Stephen Birarda
40db44e4bd fix for custom hifi URL lookup 2014-12-01 09:59:51 -08:00
Stephen Birarda
c77bcb916e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-01 09:51:38 -08:00
AndrewMeadows
1b5b4c0b44 Merge pull request #3872 from ZappoMan/cleanupMenus 
remove Entities developer menu items from C++ menu, make them available through script
 2014-12-01 09:29:56 -08:00
Stephen Birarda
8449575fa2 fix for ice-server heartbeat without an access token 2014-12-01 09:25:21 -08:00
Philip Rosedale
72ad8061ba Merge pull request #3878 from birarda/master 
changes required for AC to discover a local DS
 2014-11-30 18:44:32 -08:00
Philip Rosedale
e44ca5a7f7 Merge pull request #3876 from ZappoMan/bugFixes 
fixes the stutter in animation when observer moves
 2014-11-30 18:44:21 -08:00