Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 11:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19651 commits 76 branches 59 tags 1.2 GiB
Commit graph

19651 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
3f9b1bf3e7 Merge remote-tracking branch 'hifi/master' 2014-12-01 13:17:47 -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
Ryan
7905a340de Merge remote-tracking branch 'hifi/master' 2014-12-01 12:02:44 -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
Ryan
7822a7263a Merge remote-tracking branch 'hifi/master' 2014-12-01 09:40:10 -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
Ryan
a519b4700d Merge remote-tracking branch 'hifi/master' 2014-11-30 19:08: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
Stephen Birarda
59432e8d29 complete sharing of local domain-server port to local AC 2014-11-30 17:54:10 -08:00
Stephen Birarda
fed7d789f6 have the domain-server write its local port into shared memory 2014-11-30 17:29:18 -08:00
Ryan
13951d0aa1 Merge remote-tracking branch 'hifi/master' 2014-11-30 15:31:34 -08:00
Brad Hefta-Gaub
b8be76d597 Merge pull request #3877 from samcake/fbx 
Hack for avoiding lightmaps loading in starchamber
 2014-11-30 15:30:39 -08:00
Sam Gateau
321d651d77 Hack for avoiding lightmaps loading in starchamber 2014-11-30 12:54:43 -08:00
Brad Hefta-Gaub
91fe014411 Merge pull request #3875 from PhilipRosedale/master 
Auto-turn body when head yaw is beyond 45 degrees in HMD
 2014-11-30 05:40:55 -08:00
Philip Rosedale
709a40516d Add auto-turn of body when head is beyond 45 degrees 2014-11-29 12:17:38 -08:00
Ryan
5330dbbc22 Merge remote-tracking branch 'hifi/master' 2014-11-29 10:27:11 -08:00
ZappoMan
5c2cc20313 fixes the stutter in animation when observer moves 2014-11-28 17:36:55 -08:00
Brad Hefta-Gaub
28091f5866 Merge pull request #3874 from ctrlaltdavid/fix-hydra-vr-cursors 
Fix Hydra cursors in VR display
 2014-11-28 13:46:31 -08:00
David Rowe
583e079d3a Fix Hydra cursors in VR display 
They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
 2014-11-28 10:01:15 -08:00
Ryan
1bcf96db8e Merge remote-tracking branch 'hifi/master' 2014-11-27 13:18:00 -08:00
Brad Hefta-Gaub
8a86b2d239 Merge pull request #3873 from samcake/tot 
Fix lighmaps for VC demo 12/1/2014
 2014-11-27 13:01:10 -08:00
Sam Gateau
c78af1c982 fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why 2014-11-27 10:48:36 -08:00
Ryan
916d46a5e5 Merge remote-tracking branch 'hifi/master' 2014-11-27 10:31:25 -08:00