ZappoMan
08b06cc59c
support for global collision callbacks in JS
2014-01-29 17:52:17 -08:00
ZappoMan
b36cc0bcf9
removed old cruft around mousePitch in Head and unified pitch
2014-01-29 02:09:49 -08:00
ZappoMan
9d87d58723
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting
...
Conflicts:
libraries/particles/src/ParticlesScriptingInterface.cpp
2014-01-28 20:36:35 -08:00
ZappoMan
305e69def6
really get controller key, mouse, etc scripting working
2014-01-28 19:47:45 -08:00
ZappoMan
5addc35cd8
hacking on controller events
2014-01-28 14:58:08 -08:00
Andrew Meadows
167acb8873
Adding avatars back into ParticleCollisionSystem.
...
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
2014-01-28 14:16:34 -08:00
ZappoMan
1681dbb57b
Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes
2014-01-28 09:26:54 -08:00
Andrew Meadows
c4f429dcd0
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
2014-01-27 18:05:39 -08:00
Andrew Meadows
2b5675b077
Fix issue #1684 : particles collide against avatars again.
...
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
2014-01-27 18:01:53 -08:00
stojce
4d1992485f
removed unused QSound reference
2014-01-27 21:17:17 +01:00
stojce
40ea552981
filename format changes
...
- new wav file
- changed filename format
2014-01-27 20:35:06 +01:00
stojce
74801da07f
#19491 - Implement in-app snapshots
2014-01-27 18:07:03 +01:00
ZappoMan
62b7e6e58d
implement local edits in ParticleScriptingInterface
2014-01-27 09:00:34 -08:00
ZappoMan
c17476c985
Merge pull request #1683 from kordero/19487
...
Code Review for Job #19487
2014-01-25 12:25:44 -08:00
Lucas Crisman
28d6171be5
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-25 11:24:51 -03:00
Lucas Crisman
f56e4b0820
build error fix
2014-01-25 11:24:33 -03:00
stojce
f4698065ce
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-25 07:39:17 +01:00
ZappoMan
f02bc95908
clear particles when switching domains
2014-01-24 11:07:27 -08:00
Lucas Crisman
759448bef7
resolving reverted change on last merge
2014-01-24 15:13:14 -03:00
Lucas Crisman
cece4add27
Merge branch 'master' of git://github.com/worklist/hifi into 19487
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-01-24 15:01:24 -03:00
Lucas Crisman
482c501f3b
stats reduction on mirror enabled
2014-01-24 10:35:03 -03:00
Lucas Crisman
ef107e0a54
timer positioning when toggling BandwithMeter
2014-01-24 08:14:26 -03:00
Lucas Crisman
43d1678d18
position/sizes tweaks / moving stats and osciloscope when mirror is ON
2014-01-24 07:56:01 -03:00
Lucas Crisman
c3aa8167d6
click on stats to expand/contract them
2014-01-24 07:18:45 -03:00
Lucas Crisman
a2f8a61a69
stats font & color changes, styling audio & bandwidth meters
2014-01-24 05:06:55 -03:00
stojce
0c2e55a53b
Merging with master
...
- resolve conflicts on GeometryCache
2014-01-24 07:31:22 +01:00
Stephen Birarda
10cfd628aa
resolve conflicts on merge with upstream master
2014-01-23 17:52:30 -08:00
Lucas Crisman
f818b07dc8
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 22:18:33 -03:00
AndrewMeadows
6120416cbb
Merge pull request #1627 from ey6es/metavoxels
...
Basic metavoxel editing interface (doesn't actually perform any edits yet).
2014-01-23 16:37:22 -08:00
Andrzej Kapolka
e80eb03ba9
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/src/Application.cpp
2014-01-23 16:13:42 -08:00
Stephen Birarda
4ebd5795fc
handle merge with nodelist-patches branch
2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5
replace packetSenderNotify with signal/slot combo
2014-01-23 15:55:36 -08:00
Stephen Birarda
ed9118fd67
more NodeList QSet changes, closes #1660
2014-01-23 15:28:46 -08:00
Stephen Birarda
c432a34cfb
fix rendering of Avatars
2014-01-23 14:51:29 -08:00
Stephen Birarda
9ab1fc4c2c
resolve conflicts on merge with upstream/master
2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c
complete migration of Avatar list to AvatarManager
2014-01-23 14:41:11 -08:00
Philip Rosedale
f0417d187f
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 12:40:56 -08:00
Stephen Birarda
a9f1984676
add an AvatarManager that will keep Avatars in Application thread
2014-01-23 11:59:24 -08:00
Andrzej Kapolka
61d97454d7
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-23 11:54:08 -08:00
Andrzej Kapolka
b32b0a495a
Remove eyes' hovering on mouse avatar, voxels. Closes #1643 .
2014-01-23 11:49:34 -08:00
Philip Rosedale
c882104046
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 11:43:08 -08:00
Philip Rosedale
5e77f5643d
Merge pull request #1630 from birarda/nodelist-set
...
change node types of interest to a QSet
2014-01-23 11:42:37 -08:00
Stephen Birarda
24bed09473
DatagramProcessor need not be a pointer in Application
2014-01-23 11:13:03 -08:00
Stephen Birarda
b5a72ef669
more nodelist repairs for concurrency issues
2014-01-23 11:11:22 -08:00
Lucas Crisman
95837b89c0
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 15:54:14 -03:00
Andrzej Kapolka
a5b0fe38ec
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-23 10:52:03 -08:00
Philip Rosedale
89414eb8f2
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-23 10:47:18 -08:00
Stephen Birarda
7efc9e2e78
move datagram processing back to separate thread
2014-01-23 10:32:23 -08:00
Philip Rosedale
bacfa15065
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-22 16:35:01 -08:00
Stephen Birarda
ec04d5450b
Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set
2014-01-22 16:16:47 -08:00
