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

21531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Grayson Stebbins
14f9d627f6 Note about Qxmpp version and support for Oculus Rift 2015-01-27 17:16:31 -08:00
Grayson Stebbins
dc1051b6a9 Reminder that everything should be 32-bit 2015-01-27 17:10:09 -08:00
ZappoMan
5df45c7dce build buster and warnings fixes 2015-01-27 16:55:16 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -08:00
Andrew Meadows
b9ac5bb915 merge upstream/master into andrew/isentropic 2015-01-27 16:24:45 -08:00
Andrew Meadows
d1cf6559c5 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
 2015-01-27 16:24:11 -08:00
Andrew Meadows
026c39e010 Merge pull request #4131 from Atlante45/pull_out_menu_mess 
Settings - Part I
 2015-01-27 16:23:23 -08:00
Brad Hefta-Gaub
1dd037c7cf Merge pull request #4180 from huffman/edit-focus 
Update editEntities to auto-focus on selection
 2015-01-27 16:03:05 -08:00
Ryan Huffman
1ba398c0e3 Remove blank line 2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e Update editEntities to auto-focus on selection 2015-01-27 15:56:24 -08:00
Andrew Meadows
d5c0c200de optimization for when physics engine doesn't step 2015-01-27 15:54:32 -08:00
Andrew Meadows
aebdd3b335 fix bad extrapolation of rapidly spinning objects 2015-01-27 15:53:37 -08:00
Sam Gateau
f619acc3b5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-27 15:43:27 -08:00
Sam Gateau
4592bdcb4f fixes after review by Brad 2015-01-27 15:42:56 -08:00
Stephen Birarda
346381efc9 Merge pull request #4179 from Atlante45/move_setup_essentials 
Move setApplication/Organisation to setupEssentials
 2015-01-27 15:39:41 -08:00
Grayson Stebbins
baba56a793 Add another link back to BUILD.md 2015-01-27 15:34:54 -08:00
Atlante45
a28195a334 Move setApplication/Organisation to setupEssentials 2015-01-27 15:28:06 -08:00
Grayson Stebbins
e6673327a2 Minor edits, addition of note about PATH 2015-01-27 14:37:22 -08:00
Brad Hefta-Gaub
2403533e0e Merge pull request #4178 from huffman/fix-mesh-textures 
Fix failing QMetaObject::invokeMethod call
 2015-01-27 14:00:58 -08:00
Ryan Huffman
7ececd793a Fix failing QMetaObject::invokeMethod call 2015-01-27 13:59:46 -08:00
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
David Rowe
44083dd343 Add user warning if domain has mismatched packet versions 2015-01-27 13:10:11 -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