Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 20:36:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21049 commits 69 branches 56 tags 1.2 GiB
Commit graph

21049 commits

This branch
This branch
All branches
Author SHA1 Message Date
Grayson Stebbins
e290fa2e7f Small changes, removed VS section 
Removed the Visual Studio section -- now that we have a better Visual Studio 2013 section it was unnecessary.
 2015-01-27 13:42:24 -08:00
Grayson Stebbins
acb1494e3e Small edits to links 2015-01-27 13:38:58 -08:00
Grayson Stebbins
36e9f6b9e0 Reminder about all dependencies 2015-01-27 13:33:29 -08:00
Andrew Meadows
e2ffe00c38 Merge pull request #4172 from huffman/fix-image-overlay-rescale 
Fix image overlay rescale
 2015-01-27 13:07:15 -08:00
Brad Hefta-Gaub
0c4dc4100d Merge pull request #4176 from huffman/fix-inspect 
Fix inspect + editEntities cameras from clashing
 2015-01-27 13:05:33 -08:00
Brad Hefta-Gaub
0c53193e79 Merge pull request #4175 from cozza13/20283 
CR for Job #20283 - Clean up scripts that have recently been added.
 2015-01-27 13:05:17 -08:00
Brad Hefta-Gaub
a46fda3749 Merge pull request #4174 from huffman/delete-entity 
Update deleteEntity to obey entity locked property
 2015-01-27 13:05:05 -08:00
Brad Hefta-Gaub
064f49db3d Merge pull request #4173 from thoys/patch-2 
Update README.md
 2015-01-27 13:04:53 -08:00
Andrew Meadows
6b6e846378 Merge pull request #4177 from ZappoMan/fixGlitches 
Some physics improvements
 2015-01-27 13:02:11 -08:00
Andrew Meadows
f2f054f689 Merge pull request #4161 from ey6es/master 
Partial implementation of "granularity" setting for metavoxel tools.
 2015-01-27 12:52:32 -08:00
Grayson Stebbins
1ce92c1939 added bullet to externals list 2015-01-27 11:45:26 -08:00
ZappoMan
23892ab1e7 fixed comments 2015-01-27 11:38:14 -08:00
Chris Collins
283a056a43 remove VRui 
remove VRui
 2015-01-27 11:37:31 -08:00
ZappoMan
94e04e2d7d removed extra whitespace 2015-01-27 11:34:46 -08:00
ZappoMan
b1586d4f90 move debug into ifdef 2015-01-27 11:29:17 -08:00
Ryan Huffman
80002551f9 Update editEntities camera to not enable if camera is in independent mode 2015-01-27 11:28:39 -08:00
Ryan Huffman
2556b4790b Update inspect.js to not activate if camera is in independent mode 2015-01-27 11:28:20 -08:00
ZappoMan
45dbff67f8 more hacking 2015-01-27 11:15:33 -08:00
Chris Collins
411541b884 Tidy up some scripts. 
Tidy up scripts. Make some changes to some script references and
reorganize.
 2015-01-27 11:04:50 -08:00
Grayson Stebbins
a012562323 Correct bullet link, change order of build guides 2015-01-27 10:52:15 -08:00
Ryan Huffman
9fd352e1dc Break long lines in TextureCache.h/cpp 2015-01-27 10:27:05 -08:00
Ryan Huffman
f65640a593 Update EntityTree.cpp to not delete entity when locked 2015-01-27 10:24:54 -08:00
Ryan Huffman
86f7c28ee9 Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked 2015-01-27 10:24:28 -08:00
Thijs Wenker
5f2cfc3cde Update README.md 
default number of assignment-clients to start
 2015-01-27 19:16:20 +01:00
Grayson Stebbins
f085b81cde Add specifics on env variable setting location 2015-01-27 10:10:10 -08:00
Ryan Huffman
6a9f135e1c Cleanup image clipping in ImageOverlay 2015-01-27 08:11:37 -08:00
Ryan Huffman
d27a26967f Update ImageOverlay to take texture rescaling into account 2015-01-27 08:09:47 -08:00
Ryan Huffman
1f6932bdcb Update TextureCache to store original image dimensions (pre-scale) 2015-01-27 08:09:20 -08:00
Philip Rosedale
4c10f6f23b Merge pull request #4171 from Atlante45/hydra_grab_fix 
Hydra grab fix
 2015-01-26 19:48:30 -08:00
ZappoMan
83d1cc911a hacking 2015-01-26 19:38:24 -08:00
Atlante45
cf631bf3fc Remove unnecessary stopAnimation in script to get rid of sacades 2015-01-26 19:20:47 -08:00
Atlante45
f84f6e9b66 Restore joints state on stopAnimation 2015-01-26 19:12:18 -08:00
Philip Rosedale
2108cac38e Merge pull request #4170 from Atlante45/hydra_grab_fix 
Fixed mapped rotation + doubled it
 2015-01-26 18:27:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
78e1769468 Merge pull request #4169 from Atlante45/hydra_grab_fix 
Hydra grab fix
 2015-01-26 17:31:13 -08:00
ZappoMan
02c0700db3 support for skipping forward on new edit packets from server 2015-01-26 17:25:06 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
Stephen Birarda
3ceadf31b3 Merge pull request #4165 from murillodigital/ice-monitoring 
Check just for http availability
 2015-01-26 14:30:33 -08:00
ZappoMan
d9835701b0 added comment 2015-01-26 12:48:57 -08:00
ZappoMan
81185cfe56 removed some debugging 2015-01-26 12:46:22 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
Brad Hefta-Gaub
d207304db0 Merge pull request #4166 from ctrlaltdavid/20279 
Temporarily re-enable audio selection on Windows
 2015-01-26 12:08:53 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
David Rowe
9aaa3a6fe4 Temporarily re-enable audio selection on Windows 
This is to test current behavior on different users' PCs before
re-enabling permanently.
 2015-01-26 11:48:44 -08:00
Leonardo Murillo
d26804e68c Check just for http availability 2015-01-26 13:45:14 -06:00
ZappoMan
73b9c06ec0 added some debugging 2015-01-26 11:13:30 -08:00
ZappoMan
f85774c687 adding some debugging 2015-01-26 09:45:33 -08:00
Andrzej Kapolka
23f9c799dd Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-23 18:20:14 -08:00
Andrzej Kapolka
34110b6745 Partial subdivision implementation. 2015-01-23 18:19:45 -08:00