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

24555 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
a482fa0a6d Working on plugin rendering model: 2015-05-01 10:35:15 -07:00
Brad Davis
ba4ae3762d Working on merging in master 2015-04-30 22:01:03 -07:00
Brad Davis
031b294ae5 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/GlowEffect.h
	libraries/render-utils/src/TextureCache.cpp
 2015-04-30 12:14:07 -07:00
Brad Davis
2fa92af4ab Merge branch 'plugins2' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/plugins/Plugin.h
	interface/src/plugins/render/OculusBaseRenderPlugin.cpp
	interface/src/plugins/render/OculusBaseRenderPlugin.h
	interface/src/plugins/render/RenderPlugin.h
	interface/src/plugins/render/Tv3dRenderPlugin.cpp
	interface/src/plugins/render/Tv3dRenderPlugin.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-04-30 11:04:06 -07:00
Philip Rosedale
5e76e01b20 Merge pull request #4723 from ericrius1/mouseGrab 
added grab.js script, which allows users to grab and fling physical obje...
 2015-04-29 15:10:43 -07:00
Andrew Meadows
5a388a0c14 Merge pull request #4722 from birarda/avatar-mixer-debug 
add option to display AvatarData receive stats with display name
 2015-04-29 10:00:24 -07:00
Stephen Birarda
e933ab2e84 update win required version of OpenSSL 2015-04-29 09:59:20 -07:00
Stephen Birarda
36a26ad416 update BUILD.md for new OpenSSL req 2015-04-29 09:58:54 -07:00
Eric Levin
489fbaac57 added grab.js to defaultScripts.js 2015-04-29 09:45:58 -07:00
Eric Levin
8b9236a18d added grab.js script, which allows users to grab and fling physical objects 2015-04-29 09:44:22 -07:00
Stephen Birarda
61b4025526 remove the uneeded curly braces for default ctor 2015-04-29 09:33:23 -07:00
Brad Hefta-Gaub
7414201845 Merge pull request #4721 from ctrlaltdavid/20514 
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
 2015-04-28 20:44:09 -07:00
Brad Hefta-Gaub
b422ffe528 Merge pull request #4719 from ericrius1/avatarRange 
Added ability to check if an avatar is within specified range of a posit...
 2015-04-28 20:39:03 -07:00
Stephen Birarda
1995fa6a5e fix return value comment in SimpleMovingAverage 2015-04-28 18:28:12 -07:00
Stephen Birarda
c52426385d code review comments for #4713 2015-04-28 18:28:05 -07:00
Stephen Birarda
f9a25d7089 add Menu option to toggle Avatar receive stats 2015-04-28 18:27:54 -07:00
Stephen Birarda
f2dcacffd0 show avatar data receive rate by default with display name 2015-04-28 18:27:42 -07:00
Philip Rosedale
cd159b7ae2 Merge pull request #4690 from AndrewMeadows/bispinor 
use fallback avatar movement logic when skeleton model still downloading
 2015-04-28 17:45:09 -07:00
samcake
ff2b1af18c Merge pull request #4720 from ZappoMan/hackTest 
Fix entities rendering wrong when avatar scale !== 1.0
 2015-04-28 17:30:15 -07:00
Stephen Birarda
404cd67bb7 Merge pull request #4716 from sethalves/assignment-client-exits 
assignment-client shouldn't try to save contents of its nonexistent address bar
 2015-04-28 19:40:44 -04:00
ZappoMan
664d126465 remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit 2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693 dont change camera scale with avatar scale 2015-04-28 16:26:17 -07:00
Andrew Meadows
ce7bad40ac Merge pull request #4717 from ZappoMan/backupErrors 
add call to perror() to get OS level error details on failed backups
 2015-04-28 16:01:01 -07:00
samcake
85cd6cbff2 Merge pull request #4700 from jherico/vr_menus 
VR menus
 2015-04-28 15:59:46 -07:00
Andrew Meadows
a121ac08b3 Merge pull request #4715 from jherico/audio_crash 
Attempting to resolve possible crash case for scripts playing sounds
 2015-04-28 15:58:54 -07:00
Andrew Meadows
5537c9e042 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/physics/src/DynamicCharacterController.cpp
 2015-04-28 15:18:02 -07:00
ZappoMan
bfbad539e0 hack test 2015-04-28 14:54:58 -07:00
Eric Levin
342d3576c9 Added ability to check if an avatar is within specified range of a position from javascript 2015-04-28 14:46:39 -07:00
David Rowe
9576ad19a7 Move "Stereo Audio" option into developerMenu.js 
And rename it "Stereo Input" to better relect what it does.
 2015-04-28 14:14:10 -07:00
ZappoMan
512a109023 add call to perror() to get OS level error details on failed backups 2015-04-28 13:48:51 -07:00
Seth Alves
28ad80936a assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address. 2015-04-28 13:21:14 -07:00
Brad Davis
2575352485 Attempting to resolve possible crash case for scripts playing sounds 2015-04-28 12:51:01 -07:00
Philip Rosedale
20d77fae3c Merge pull request #4704 from sethalves/assignment-scripts-can-rez 
Assignment scripts can rez
 2015-04-28 12:15:19 -07:00
Philip Rosedale
07f30fb9f7 Merge pull request #4714 from sethalves/login-updates-rights 
force reconnection after successful login
 2015-04-28 12:13:34 -07:00
Seth Alves
f9c0493c61 when a login is completed, reset the node list in order to force a re-connection to the domain-server (thereby giving the interface any new rights it deserves, such as the ability to edit entities) 2015-04-28 10:23:08 -07:00
Brad Hefta-Gaub
50eecb15b3 Merge pull request #4712 from Atlante45/compound_zones_fix 
Compound zones fix
 2015-04-28 09:48:05 -07:00
Seth Alves
e6da5ea711 formatting 2015-04-28 09:28:42 -07:00
Andrew Meadows
e646ff6847 Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth 
Fix audio-driven mouth viewed by others
 2015-04-28 09:28:22 -07:00
Seth Alves
49783c1550 formatting 2015-04-28 09:28:17 -07:00
Seth Alves
7aa2013473 formatting 2015-04-28 09:26:39 -07:00
Seth Alves
436fe03d10 formatting 2015-04-28 09:26:20 -07:00
Seth Alves
30e78a37cd formatting 2015-04-28 09:26:03 -07:00
Seth Alves
a1da96e971 formatting 2015-04-28 09:23:30 -07:00
Seth Alves
dc0b033101 formatting 2015-04-28 09:23:19 -07:00
Seth Alves
eb36bf3aa0 formatting 2015-04-28 09:23:00 -07:00
Seth Alves
be8764424e formatting 2015-04-28 09:20:38 -07:00
Seth Alves
8db46d859e formatting 2015-04-28 09:19:45 -07:00
Seth Alves
38ba0ab352 remove useless added code 2015-04-28 09:18:00 -07:00
Atlante45
ab9d81b5e2 Correct comments 2015-04-28 18:09:09 +02:00
Atlante45
fe0bd456e1 Zones now use Models instead of FBXGeometries 2015-04-28 17:07:40 +02:00