Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12220 commits 71 branches 56 tags 1.2 GiB
Commit graph

12220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
58b063ee12 Make sure we call allReferencesCleared on the right thread. 2014-04-17 11:13:22 -07:00
Andrzej Kapolka
197ce036c4 Remove debugging line. 2014-04-17 11:06:28 -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
Clément Brisset
66d61bedf4 Merge pull request #2679 from AndrewMeadows/inertia 
fix particle-vs-voxel collision callbacks in gun.js
 2014-04-17 10:41:55 -07:00
Andrzej Kapolka
03c3952e52 Better joint mappings, switch to working (more or less) model. 2014-04-17 10:41:46 -07:00
Stephen Birarda
a137dd0362 grab URL for script from payload if it exists 2014-04-17 10:18:42 -07:00
Stephen Birarda
142932bed0 allow passing of scripted assignments to DS via parameters 2014-04-17 10:14:11 -07:00
Andrew Meadows
e139a6dc95 remove warnings about signed-unsigned comparison 2014-04-17 08:46:41 -07:00
Andrew Meadows
db717b980b merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-04-17 08:40:25 -07:00
Thijs Wenker
b2e969d1c5 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-17 13:03:44 +02: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
AndrewMeadows
f73da07aad Merge pull request #2681 from ZappoMan/moonshot 
Audio Spatialization, Early Reflections, and Reverb
 2014-04-16 18:04:09 -07:00
Atlante45
dcccd66c51 Changed sound files to raw 2014-04-16 17:49:35 -07:00
Atlante45
97490eba0e Merge branch 'master' of https://github.com/highfidelity/hifi into random_sounds 2014-04-16 17:41:27 -07:00
Atlante45
1c89d8f3ed editVoxels reformat 2014-04-16 17:33:15 -07:00
ZappoMan
9fc650dd6e CR feedback 2014-04-16 17:10:26 -07:00
ZappoMan
b269a26441 CR feedback 2014-04-16 17:08:06 -07:00
ZappoMan
4c6471caa4 fix typo 2014-04-16 16:43:01 -07:00
Stephen Birarda
67cc186964 optional sending of assignment pool from ds assignment page 2014-04-16 16:29:22 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
3cb109ec89 clean up 2014-04-16 15:21:04 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
Konstantin
fca4e2abba Update Application.h 2014-04-17 00:09:58 +02:00
Konstantin
b3ce36f130 Changed goTo's to statics 2014-04-17 00:04:27 +02:00
Konstantin
d55fb60862 Added urlGoTo 2014-04-17 00:03:33 +02:00
Konstantin
8120700787 Added urlGoTo 2014-04-17 00:03:11 +02:00
Andrew Meadows
83dc8717aa bumpSettings on load/stop script 2014-04-16 14:46:49 -07:00
Thijs Wenker
154176402e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 23:41:58 +02:00
Atlante45
956fe71d34 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 2014-04-16 14:28:58 -07:00
Andrew Meadows
fe1123ea97 gun.js correctly deletes voxel again on collision 2014-04-16 14:22:47 -07:00
Thijs Wenker
0b644b5738 ctrl+shift+s to open the script editor 2014-04-16 22:58:44 +02:00
ZappoMan
b00a67cb57 added support for local audio spatialization independent of inbound audio 2014-04-16 13:55:39 -07:00
Atlante45
2386ade1a9 Merge branch 'random_sounds' of https://github.com/Atlante45/hifi into placement_tool 2014-04-16 13:50:23 -07:00
Andrew Meadows
ddb8ac9ad4 merge upstream/master into andrew/inertia 2014-04-16 13:40:10 -07:00
Stephen Birarda
bd37a75245 Merge pull request #2678 from birarda/authentication 
push packet version for DS check-ins
 2014-04-16 13:38:11 -07:00
Stephen Birarda
49e7842d25 push packet version to force an update 2014-04-16 13:37:41 -07:00
Andrew Meadows
9ab1b76484 use new Qt connect syntax for compile-time checks 2014-04-16 13:28:54 -07:00
AndrewMeadows
8257e25969 Merge pull request #2676 from birarda/authentication 
re-instate DS connect behavior
 2014-04-16 13:13:33 -07:00
AndrewMeadows
7dc8f2ae3c Merge pull request #2657 from ey6es/master 
Added tools to adjust avatar LOD to LOD tools dialog.  Closes #2624.
 2014-04-16 12:59:47 -07:00
Atlante45
9d372bfe3c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-16 12:44:27 -07:00
Andrew Meadows
6b23da40d6 use correct name for signal connect 2014-04-16 12:18:40 -07:00
Atlante45
dd8a0e3550 Removed gettimeofday in AudioMixer 2014-04-16 12:16:49 -07:00
Atlante45
8cfc8faa01 Removed gettimeofday in Audio 2014-04-16 12:08:17 -07:00
Stephen Birarda
505145f693 add a missing bracket to IP_DONTFRAG 2014-04-16 12:02:02 -07:00
Atlante45
d34e6ff864 Removed gettimeofday in AudioInjector 2014-04-16 12:01:41 -07:00
Stephen Birarda
afcb542bbe fix a debug line in LimitedNodeList 2014-04-16 11:28:34 -07:00
Stephen Birarda
06a976041b take pointer of optValue and not actual optValue 2014-04-16 11:27:30 -07:00