Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 08:39:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13152 commits 70 branches 57 tags 1.2 GiB
Commit graph

7098 commits

Author SHA1 Message Date
barnold1953
e33cdedeef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-22 17:56:01 -07:00
barnold1953
3a45104793 Made overlays thread safe for write operations, which solved a script 
crash.
 2014-05-22 17:55:25 -07:00
Stephen Birarda
164d3c5fb3 make sure balance is cleared on logout and re-launch 2014-05-22 15:06:16 -07:00
Stephen Birarda
79f09605d5 show credit balance in window title 2014-05-22 14:55:43 -07:00
Leonardo Murillo
60dfa08b30 Merge pull request #2902 from birarda/master 
change node auth URL to data.highfidelity.io
 2014-05-22 15:30:44 -06:00
Brad Hefta-Gaub
5964cb9c96 Merge pull request #2901 from polac/19671_proposal 
Initialise lisencing manager after we have enabled Visage.
 2014-05-22 14:28:20 -07:00
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
barnold1953
a48c6b82e2 Fixed my mistake by unlocking the lock. 2014-05-22 14:17:26 -07:00
barnold1953
f069b70563 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-22 12:46:39 -07:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the 
processEraseMessage wait until it can lock to ensure particles are
deleted.
 2014-05-22 12:45:36 -07:00
Andrew Meadows
b0c3655076 Fix for bad bounding shape for multi-root models. 2014-05-22 11:40:36 -07:00
Atlante45
ea1359c10f Clean up log 2014-05-22 11:11:22 -07:00
barnold1953
4036f929c9 Stopped access violation when erasing particles. 2014-05-22 10:31:30 -07:00
barnold1953
dad2788b8c Moved 'I am looking at' ball to be immediately above name text, and reduced opacity 2014-05-21 17:45:17 -07:00
barnold1953
5b366fe714 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-05-21 16:01:28 -07:00
barnold1953
97c0a2fc98 Made mirror view remain constant no matter what the avatar scale is set to. 2014-05-21 15:32:23 -07:00
barnold1953
21f03a4fb5 Made oculus camera modes only active when AllowOculusCameraModeChange is checked. 2014-05-21 12:43:44 -07:00
Andrzej Kapolka
709a9d75f6 Provide an option for the masked joints in the scriptable method, fix a couple 
of annoying warnings.
 2014-05-21 12:03:47 -07:00
Andrzej Kapolka
0e15c82e49 Allow setting masked joints for each animation. 2014-05-21 11:58:20 -07:00
barnold1953
b5ad295756 Fixed improper coding style in previous pull request 2014-05-21 11:24:39 -07:00
barnold1953
3bc8e0f726 Made third person work with oculus 2014-05-21 11:21:12 -07:00
Andrzej Kapolka
20a931178d Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:03:55 -07:00
Brad Hefta-Gaub
a88de84b1e Merge pull request #2875 from binaryking/19666 
Code Review for Job #19666
 2014-05-21 11:02:29 -07:00
Andrzej Kapolka
6797d1ad81 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:02:05 -07:00
Brad Hefta-Gaub
b4759e02f4 Merge pull request #2888 from Barnold1953/master 
Windows audio and mesh crash
 2014-05-21 11:01:48 -07:00
Andrzej Kapolka
ef9407b1a6 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 10:58:44 -07:00
Clément Brisset
653b89353d Merge pull request #2889 from ZappoMan/bugfix 
Couple of Model Bug Fixes
 2014-05-21 10:53:20 -07:00
Andrzej Kapolka
0dfd787034 Added some basic method to allow scripts to run/stop animations on the avatar. 2014-05-21 10:44:51 -07:00
barnold1953
407a98f00e Added realWorldFieldOfView to preferences. 2014-05-21 10:41:33 -07:00
Andrzej Kapolka
1022f1bec4 Added a priority setting so that we can control the order in which animations 
are applied.
 2014-05-21 09:40:49 -07:00
barnold1953
742543317c Stopped magnifying FOV when wearing Oculus. 2014-05-21 09:12:28 -07:00
Mohammed Nafees
1714f7fb27 Merge branch master from upstream 2014-05-21 11:29:19 +05:30
Andrzej Kapolka
f709ea61b5 Need to initialize this to false. 2014-05-20 17:55:48 -07:00
barnold1953
661de7c62b Fixed poor coding standard 2014-05-20 17:46:52 -07:00
barnold1953
eb5b0c4ddf Made OR work with different camera modes. 2014-05-20 17:43:46 -07:00
Andrzej Kapolka
7124b4a196 Mask joints from animation when explicitly set. 2014-05-20 17:10:53 -07:00
Brad Hefta-Gaub
a29a9dad70 Merge pull request #2882 from ey6es/master 
Restore specular lighting--but, per the OpenGL spec, shut off specular
 2014-05-20 17:01:32 -07:00
ZappoMan
2665f3af67 properly bail on version mismatch 2014-05-20 16:31:03 -07:00
ZappoMan
22a6e4679a properly discard piggy back packets that don't match expected version 2014-05-20 16:19:14 -07:00
Andrzej Kapolka
d3e5e3ccf1 A couple explanatory comments. 2014-05-20 15:41:11 -07:00
Andrzej Kapolka
dd5d3c5591 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-20 15:23:41 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
barnold1953
2329188939 Stopped windows crash when no audio device is detected 2014-05-20 15:15:45 -07:00
Mika Impola
061f182fab Initialise lisencing manager after we have enabled Visage. 2014-05-21 00:02:59 +03:00
ZappoMan
1278470a91 properly handle FSTs that have translations and rotations 2014-05-20 13:31:08 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Andrzej Kapolka
5da656e3f5 Working on animation dialog. 2014-05-19 16:55:33 -07:00