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

11489 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
b8232b5dfd AvatarData now stores sessionUUID 2014-04-09 08:11:15 -07:00
Andrew Meadows
79670563d4 AvatarData stores its sessionID 2014-04-07 14:42:49 -07:00
Andrew Meadows
23c6873d99 Add Uuid object to ScriptEngine 2014-04-07 14:12:29 -07:00
Andrew Meadows
84d7e39d72 merge upstream/master into avatar-interaction 2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Andrzej Kapolka
72d09a5cbe Merge pull request #2605 from AndrewMeadows/say-no-to-warnings 
removing a warning about hidden virtual override
 2014-04-04 16:00:57 -07:00
Andrzej Kapolka
10288bce35 Merge pull request #2604 from AndrewMeadows/oculus-with-thrust 
fix #2567 thrust + oculus doesn't change body rotation
 2014-04-04 15:19:44 -07:00
Andrzej Kapolka
1f3a5d09d9 Merge pull request #2593 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-04 15:18:18 -07:00
Andrew Meadows
403ad5e984 removing a warning about hidden virtual override 2014-04-04 15:18:12 -07:00
Andrew Meadows
01c42c741c fix #2567 thrust + oculus doesn't change body rot 2014-04-04 14:46:54 -07:00
Andrzej Kapolka
468a4b79fd Merge pull request #2603 from ey6es/master 
Increase the rate at which we increase detail and put a limit on the LOD
 2014-04-04 14:41:17 -07:00
Andrzej Kapolka
3a125db1f8 Increase the rate at which we increase detail and put a limit on the LOD 
multiplier so that it never takes more than about five seconds to return to
default detail.  Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
 2014-04-04 14:31:30 -07:00
Andrew Meadows
5e2b8bb2c3 connect SIGNAL to SIGNAL to avoid forwarding slot 2014-04-04 10:43:06 -07:00
Andrew Meadows
f6c98a1cc2 fix bug in gun.js: unplayed target delete sound 2014-04-04 10:40:55 -07:00
Clément Brisset
a57002038b Merge pull request #2601 from Atlante45/error_or_success_model_upload_msg 
Error or success model upload msg
 2014-04-04 10:16:42 -07:00
Atlante45
eb8cf15942 Merge branch 'error_or_success_model_upload_msg' of https://github.com/Atlante45/hifi into error_or_success_model_upload_msg 2014-04-03 16:19:41 -07:00
Atlante45
ba4ccc22ef Changed FstReader name to ModelUploader 2014-04-03 16:19:33 -07:00
Atlante45
9166dea02e Changed FstReader name to ModelUploader 2014-04-03 16:16:58 -07:00
Atlante45
3bb6d9b3b3 Added call back to model upload. 2014-04-03 16:07:25 -07:00
Leonardo Murillo
f25a8c5948 Merge pull request #2600 from Atlante45/master 
Changed FstReader categories to place models in the right dirs
 2014-04-03 14:06:59 -06:00
AndrewMeadows
4a98f9f159 Merge pull request #2485 from kordero/19498 
Code Review for Job #19498
 2014-04-03 12:58:47 -07:00
Atlante45
d15e12da77 Changed FstReader categories to place models in the right dirs 2014-04-03 12:25:50 -07:00
Lucas Crisman
793179dc72 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-03 16:24:32 -03:00
Andrzej Kapolka
6e53ecf6a0 Merge pull request #2598 from ey6es/master 
Remove translations for now, but use correct translation keys for the on...
 2014-04-03 11:55:36 -07:00
Andrzej Kapolka
840847cf54 Don't refer to the QM file. 2014-04-03 11:42:43 -07:00
Andrzej Kapolka
df4fd9df5f Remove translations for now, but use correct translation keys for the only 
translations we had (days/weeks/etc.)
 2014-04-03 11:30:06 -07:00
Atlante45
df718c430a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-03 11:20:24 -07:00
Stephen Birarda
cc199364e2 Merge pull request #2596 from ddobrev/master 
Informed users who want to chat they have to log in first
 2014-04-03 10:27:37 -07:00
Dimitar Dobrev
716858e6f6 Informed users who want to chat they have to log in first. 2014-04-03 20:09:54 +03:00
Brad Hefta-Gaub
829455c53f Merge pull request #2595 from AndrewMeadows/avatar-interaction 
Fix crash: don't simulate until geometry exists
 2014-04-03 09:21:45 -07:00
Andrew Meadows
7a602aedd1 Fix crash: don't simulate until geometry exists 2014-04-03 09:06:49 -07:00
Atlante45
4a1687c023 Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
 2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Andrew Meadows
db40a955c9 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:50:08 -07:00
Andrew Meadows
aad945c180 merge upstream/master into "improved URL scheme" 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:45:01 -07:00
Andrzej Kapolka
90a491849a Merge pull request #2588 from AndrewMeadows/avatar-interaction 
Avatar body-body collisions
 2014-04-02 17:31:18 -07:00
Andrew Meadows
715f2c53d5 merge upstream/master into avatar-interaction 
Conflicts:
	interface/interface_en.ts
 2014-04-02 17:28:22 -07:00
Atlante45
c2f0545d96 Setup for actual metadata 2014-04-02 17:12:11 -07:00
Atlante45
cf20c448a3 Few tweaks before PR 2014-04-02 16:46:03 -07:00
Andrew Meadows
933cade6b0 Re-add fullUpdate hint to Model::simulate() 2014-04-02 16:34:33 -07:00
Atlante45
0c5b3b60b2 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 16:26:13 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Lucas Crisman
76921d9b52 Merge branch 'master' of git://github.com/worklist/hifi into 19498 2014-04-02 17:18:27 -03:00
Andrzej Kapolka
cbf53f1997 Merge pull request #2586 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-02 12:13:24 -07:00
Andrew Meadows
97ba5250a5 Only simulate() Avatar Models when necessary 
Also: rebuild collision shapes when Model scale changes
 2014-04-02 12:01:18 -07:00
Atlante45
85271c1ddb Merge branch 'display_models_metadata' of https://github.com/Atlante45/hifi into display_models_metadata 2014-04-02 11:40:55 -07:00
Atlante45
b73598ae8a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:40:41 -07:00
Atlante45
73d6ca846a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:37:35 -07:00
Atlante45
e60e1929f3 Review comments 2014-04-02 11:36:52 -07:00
Brad Hefta-Gaub
c2bf3cd7d0 Merge pull request #2589 from PhilipRosedale/master 
Tweaks to VU meter, tone injector, and fix to noise gate
 2014-04-02 03:14:52 -07:00