Thijs Wenker
c016d6557e
- few Adjustments in Application class for Script editor
...
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
2014-04-21 05:25:28 +02:00
AndrewMeadows
a10aaa537e
Merge pull request #2692 from ZappoMan/moonshot
...
added wet/dry mix, and alternate distance attenuation features
2014-04-18 10:34:55 -07:00
ZappoMan
fa787adce2
added wet/dry mix, and alternate distance attenuation features
2014-04-18 08:55:32 -07:00
Andrzej Kapolka
21fa833f19
Merge branch 'master' of https://github.com/highfidelity/hifi into animate
...
Conflicts:
interface/src/Application.cpp
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
2014-04-17 10:58:34 -07:00
Andrew Meadows
db717b980b
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-04-17 08:40:25 -07:00
Andrew Meadows
83dc8717aa
bumpSettings on load/stop script
2014-04-16 14:46:49 -07:00
Andrew Meadows
9ab1b76484
use new Qt connect syntax for compile-time checks
2014-04-16 13:28:54 -07:00
Andrew Meadows
6b23da40d6
use correct name for signal connect
2014-04-16 12:18:40 -07:00
ZappoMan
bdf39186de
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-15 21:04:15 -07:00
Andrzej Kapolka
8cbad1bf54
More work on animation loading.
2014-04-15 19:37:28 -07:00
Stephen Birarda
5904d19603
Merge pull request #2637 from birarda/authentication
...
add optional DTLS option for domain-server to node communication
2014-04-14 10:24:17 -07:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
ZappoMan
ddd2b0843c
more work on new diffusion model
2014-04-13 20:43:40 -07:00
Leonardo Murillo
f84249ac6c
switching to https
2014-04-11 19:58:49 -06:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
Andrzej Kapolka
d6534d6026
Tweak to zoom on pushback.
2014-04-11 11:10:22 -07:00
Andrzej Kapolka
b7725f094d
Trying the narrowing effect with pushback for other avatars.
2014-04-11 10:19:16 -07:00
Andrzej Kapolka
00e2ff93e3
Playing around with zooming in while pulling back.
2014-04-11 10:08:44 -07:00
Andrzej Kapolka
d712588b36
Better rolloff.
2014-04-10 17:35:47 -07:00
Andrew Meadows
a436b59971
save settings for change in: identity, position
2014-04-10 17:14:51 -07:00
Andrzej Kapolka
197adce4de
Fall intersection off with angle to other avatar.
2014-04-10 17:14:49 -07:00
Andrzej Kapolka
475528f112
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 15:00:32 -07:00
Andrzej Kapolka
6cf971c849
More intersection-avoidance tweaks.
2014-04-10 14:51:43 -07:00
Andrzej Kapolka
873541dd7b
Trying out basic pushback for other avatars.
2014-04-10 11:56:17 -07:00
Atlante45
2cc2149647
Glow when you talk, flash when you clip
...
closes #2592
2014-04-10 11:55:30 -07:00
Andrzej Kapolka
f61c746b4a
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 09:45:23 -07:00
Philip Rosedale
e08dfeae2a
Merge pull request #2642 from Atlante45/persistant_script_location
...
Persistant script location
2014-04-09 22:16:20 -07:00
Philip Rosedale
de6b55644b
Merge pull request #2636 from ey6es/faceplus
...
Basic Faceplus integration, cleanup for handling the various face trackers.
2014-04-09 22:13:34 -07:00
Andrzej Kapolka
9f58264cb6
Working on plane collisions, pushing back camera from intersecting avatars.
2014-04-09 18:07:56 -07:00
Atlante45
fad71266a1
Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location
2014-04-09 17:35:12 -07:00
Atlante45
2b44b03a27
Added temp fix to ModelUploader dialog too
2014-04-09 17:34:17 -07:00
Stephen Birarda
cf47418d58
remove the audio scope
2014-04-09 17:16:29 -07:00
Atlante45
e33da2a741
Some QSettings cleanup + persistant script location
2014-04-09 17:08:50 -07:00
Stephen Birarda
1c861fbecb
resolve conflicts on merge with upstream master
2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:34:29 -07:00
Andrzej Kapolka
ef8eb00778
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:23:11 -07:00
Andrzej Kapolka
ead05c4d99
Tab fixes.
2014-04-09 15:22:53 -07:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Andrzej Kapolka
28d3eae12b
Move Faceplus reading to its own thread to avoid blocking the main one.
2014-04-09 14:52:27 -07:00
Stephen Birarda
d4f2c9e631
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-04-09 14:40:14 -07:00
Stephen Birarda
973fb95c9d
Merge pull request #2630 from AndrewMeadows/scripting
...
Expose MyAvatar.sessionUUID to JS
2014-04-09 13:07:37 -07:00
Andrzej Kapolka
79455d5850
More Faceplus work. Starting to get results.
2014-04-09 13:07:02 -07:00
Andrew Meadows
4b306401af
use slot to change AvatarData::_sessionUUID
2014-04-09 11:32:52 -07:00
stojce
7b26317eaf
Merge branch 'master' of https://github.com/worklist/hifi into 19548
2014-04-09 18:55:17 +02:00
stojce
ce85e67a42
Modify icons in Interface "mirror"
2014-04-09 18:54:59 +02:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427
prepare header files for regex run against cpp
2014-04-09 09:35:05 -07:00
Andrew Meadows
229d6cefa2
merge upstream/master into andrew/scripting
2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd
AvatarData now stores sessionUUID
2014-04-09 08:11:15 -07:00
Andrzej Kapolka
5b0e7f818d
More work on Faceplus integration/cleaning up support for multiple face
...
trackers.
2014-04-08 18:03:49 -07:00
