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

358 commits

Author SHA1 Message Date
ZappoMan
4aa96e1fbe added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock 2014-04-29 15:10:28 -07:00
Andrew Meadows
2c7fcada3b make gravity transitions faster 2014-04-29 10:00:12 -07:00
Andrew Meadows
4937a0af2e add status button for local gravity 2014-04-28 17:29:44 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Andrew Meadows
ea2e96ac6f toggle collision and gravity with timers 2014-04-28 13:02:54 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Andrew Meadows
39252a8339 swissArmyJetpack.js now toggles "obey gravity" 2014-04-25 14:17:39 -07:00
Andrew Meadows
afb12bcd70 add swissArmyJetpack.js 2014-04-24 19:12:23 -07:00
Atlante45
9bdcfe6d04 Undo now fully support local subtrees 2014-04-24 11:01:12 -07:00
Thijs Wenker
ebc6f4e78e Removed UTF-8 new line characters, QT script errors on those lines in Windows. 2014-04-23 14:40:06 +02:00
ZappoMan
ae443a3136 fix headers 2014-04-22 11:27:50 -07:00
ZappoMan
a473fe3aee fix header 2014-04-21 15:14:14 -07:00
ZappoMan
ffc73e04eb added new load testing example script 2014-04-21 11:48:42 -07:00
Atlante45
178f845ad0 Rescale import when using keys +/- 2014-04-18 16:40:13 -07:00
Atlante45
7782e53363 Restored scale copy 2014-04-18 16:26:10 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
c4102e3af0 Improved scale selector, changed first swatch behaviours, improved placement tool 2014-04-18 16:04:20 -07:00
AndrewMeadows
aaac7ac82c Merge pull request #2688 from ey6es/master 
Added head translation for Faceplus.
 2014-04-18 13:45:00 -07:00
Stephen Birarda
e4d30c5f1f Update dancing_bot.js 
put gangnam style animation back - it's royalty free
 2014-04-18 10:57:50 -07: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
Atlante45
01fe3f45c5 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 2014-04-18 10:23:01 -07:00
Stephen Birarda
9713edbba9 Update dancing_bot.js 
conceal URL from dancing_bot script (even though it will stay in history)
 2014-04-18 09:00:43 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Andrzej Kapolka
828bedc3e8 Slight fix for dancing bot script. 2014-04-17 17:07:02 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Brad Hefta-Gaub
ad3bd75308 Merge pull request #2671 from Atlante45/random_sounds 
Random sounds
 2014-04-17 11:36:15 -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
Andrzej Kapolka
a6136b42ff Switch to a working (and more amusing) animation. 2014-04-17 10:55:11 -07:00
Atlante45
55a1cd27c5 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 2014-04-17 10:51:04 -07:00
Andrzej Kapolka
03c3952e52 Better joint mappings, switch to working (more or less) model. 2014-04-17 10:41:46 -07:00
Andrew Meadows
db717b980b merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-04-17 08:40:25 -07:00
Andrzej Kapolka
00829e0289 The actual animation business. 2014-04-16 21:10:59 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Atlante45
dcccd66c51 Changed sound files to raw 2014-04-16 17:49:35 -07:00
Atlante45
1c89d8f3ed editVoxels reformat 2014-04-16 17:33:15 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
Andrew Meadows
fe1123ea97 gun.js correctly deletes voxel again on collision 2014-04-16 14:22:47 -07:00
ZappoMan
67de87d114 added slider for local audio attenuation 2014-04-15 21:31:35 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
ZappoMan
f3f9325a42 fixed comment 2014-04-15 12:45:28 -07:00
Atlante45
c323249039 Remove bad change 2014-04-15 10:38:28 -07:00
Atlante45
08b24343e5 Added sounds provided by grayson and randomized their use. 2014-04-15 10:34:18 -07:00
ZappoMan
8a16986294 add sliders for reflection, diffusion, absorption 2014-04-15 09:58:35 -07:00
ZappoMan
839df97687 make audio sliders initialize to defaul starting points 2014-04-14 16:46:25 -07:00
ZappoMan
5e42daaa51 fix predelay in the diffusion case 2014-04-14 12:32:23 -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
Andrew Meadows
f27f8e39c8 example JS for handling avatar collisions 2014-04-09 17:22:17 -07:00
Stephen Birarda
619e9d7cd3 more header repairs caught via find 2014-04-09 09:52:00 -07:00