Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 02:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13336 commits 25 branches 0 tags 1.1 GiB
Commit graph

6786 commits

Author SHA1 Message Date
Kai Ludwig
587f60631f missed a tab 2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783 added missing locking against crashing in Overlays::~Overlays() 2014-05-24 21:22:34 +02:00
ZappoMan
9d9600aad5 fix max dimension 2014-05-23 22:08:31 -07:00
Clément Brisset
3e671c1968 Merge pull request #2922 from birarda/master 
fix credit amount in window title
 2014-05-23 17:43:04 -07:00
Stephen Birarda
fe05beb88d remove an unneeded debug 2014-05-23 17:41:58 -07:00
Stephen Birarda
9df0f2c1e5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887 fix credit amount in window title 2014-05-23 17:37:36 -07:00
Andrzej Kapolka
632f87dc88 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:15:03 -07:00
Andrzej Kapolka
e48f02f2c5 Remove unused variable. 2014-05-23 17:13:27 -07:00
Clément Brisset
965d5778d6 Merge pull request #2917 from stojce/19705 
Code Review for Job #19705
 2014-05-23 17:07:17 -07:00
Andrzej Kapolka
ac2137c3b6 Fixed a couple copy and paste errors. 2014-05-23 16:56:10 -07:00
Andrzej Kapolka
84b78429f2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 16:37:25 -07:00
Philip Rosedale
7c8ece6a5b Merge pull request #2919 from AndrewMeadows/inertia 
turn on gravity when there is a voxel floor to stand on
 2014-05-23 16:36:57 -07:00
Andrzej Kapolka
0baf757c0d Basic support for shadows on models. 2014-05-23 16:35:51 -07:00
Stephen Birarda
1e9589c19e fix an implicit cast to float 2014-05-23 16:18:21 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Andrew Meadows
8d660c76cc merge upstream/master into andrew/inertia 2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Brad Hefta-Gaub
50e812a82b Merge pull request #2913 from talentraspel/19680 
locking against crash
 2014-05-23 15:08:20 -07:00
Brad Hefta-Gaub
43bdc8c156 Merge pull request #2912 from Atlante45/point_and_glow 
Point and glow
 2014-05-23 12:31:41 -07:00
Atlante45
28536eaef2 CR 2014-05-23 11:53:34 -07:00
Stojce Slavkovski
b3b8e2d775 Merge branch 'master' of https://github.com/worklist/hifi into 19705 2014-05-23 20:50:10 +02:00
Stojce Slavkovski
be9aac08ee add disabled state to Share button on click 2014-05-23 20:49:48 +02:00
ZappoMan
7036233a47 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:47:47 -07:00
Atlante45
f0f62ced6b Don't create a glower if no glow 2014-05-23 11:41:42 -07:00
Brad Hefta-Gaub
10b0471641 Merge pull request #2906 from Barnold1953/master 
Write thread safety for Overlays QMaps
 2014-05-23 11:34:02 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
Kai Ludwig
7fb9e3a7e6 spaces instead of tabs. 2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532 _voxelFades needs locking. 2014-05-23 20:21:00 +02:00
ZappoMan
ee523ff373 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:17:59 -07:00
barnold1953
6817c9682e Added a new lock specific to deleting, and improved safety 2014-05-23 11:17:55 -07:00
Atlante45
df68082705 Added local glow to models 2014-05-23 11:02:07 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
barnold1953
9553271fa1 Added some missing locks to make Overlays thread safe for reading as well. 2014-05-23 10:44:40 -07:00
Philip Rosedale
22548b9956 Merge pull request #2909 from PhilipRosedale/master 
add visual indicator of thrust direction
 2014-05-23 09:58:55 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00
Andrew Meadows
b875144e2d Don't repeat check for non-zero collision groups 2014-05-23 09:55:45 -07:00
AndrewMeadows
3a638cc447 Merge pull request #2905 from ey6es/animenu 
Added animation controls for start/stop frames, loop/hold flags, "start automatically," roles (with script commands to start/stop by role).
 2014-05-23 09:52:54 -07:00
AndrewMeadows
18046c9e9a Merge pull request #2907 from PhilipRosedale/master 
Velocity damped hand positions
 2014-05-23 09:50:39 -07:00
Andrzej Kapolka
4d6e8a2c9e Or rather, replaceMatchingPriorities. 2014-05-23 09:42:36 -07:00
Andrzej Kapolka
09ba25bde5 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-23 09:40:35 -07:00
Leonardo Murillo
f7f4c48b9b Revert "Initialise lisencing manager after we have enabled Visage." 
This reverts commit 061f182fab.
 2014-05-23 08:40:41 -06:00
Philip Rosedale
2681312b54 Velocity damped hand positions 2014-05-23 00:09:15 -07:00
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
Andrew Meadows
08b525ef91 prevent walking avatar from bouncing on floor 2014-05-22 17:54:32 -07:00
Andrzej Kapolka
a32dfdb7bb We should let people "start" even if the animation is already playing (to 
start again from the beginning).  Fixed an issue with competing priorities.
 2014-05-22 17:05:28 -07:00
Andrzej Kapolka
2a50b5451f Script commands to start/stop animations by role. 2014-05-22 16:41:51 -07:00
Andrzej Kapolka
8458477b9f Fixed a compile warning, provide means to start/stop animations. 2014-05-22 16:15:34 -07:00
Stephen Birarda
164d3c5fb3 make sure balance is cleared on logout and re-launch 2014-05-22 15:06:16 -07:00
Andrzej Kapolka
083543419d More priority bits. 2014-05-22 15:00:36 -07:00
Stephen Birarda
79f09605d5 show credit balance in window title 2014-05-22 14:55:43 -07:00
Andrzej Kapolka
8717977437 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-22 14:42:23 -07:00
Andrzej Kapolka
d4af39a9f5 Working on handling animation priorities to prevent Hydra move/restore from 
interfering with scripted animations.
 2014-05-22 14:41:46 -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
Andrzej Kapolka
03abad4f20 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-22 11:59:49 -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
Mohammed Nafees
c4b17963e2 Remove unnecessory header file inclusion in Menu.cpp 2014-05-22 16:55:24 +05:30
Mohammed Nafees
ad49b5c2e1 Show OS notification when user is not logged in 2014-05-22 16:53:07 +05:30
Andrzej Kapolka
e81e6f3cb2 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 18:00:57 -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
Andrzej Kapolka
2eee9a32ac Removed debugging line. 2014-05-21 15:39:12 -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
Andrzej Kapolka
de7c05cb2d More animation controls. 2014-05-21 15:30:50 -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