Andrzej Kapolka
|
a24f215f09
|
Moved menu, chat entry field to ui subdirectory.
|
2013-04-30 09:59:05 -07:00 |
|
Andrzej Kapolka
|
d4fbe9091f
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-29 19:13:10 -07:00 |
|
Andrzej Kapolka
|
068d3d216e
|
Need to commit these, too, for the font rendering change.
|
2013-04-29 19:12:34 -07:00 |
|
Andrzej Kapolka
|
a8c28a6d2a
|
First stab at text rendering by rendering glyphs (using Qt's font rendering)
into textures, storing the associated metrics, and drawing strings as
sequences of textured quads.
|
2013-04-29 18:54:12 -07:00 |
|
birarda
|
24c5fe4810
|
Merge pull request #168 from birarda/master
add eve's audio file to repo for deploy
|
2013-04-29 15:46:47 -07:00 |
|
Stephen Birarda
|
5380c68390
|
add eve's audio file
|
2013-04-29 15:46:01 -07:00 |
|
birarda
|
29f957e32b
|
Merge pull request #167 from birarda/master
don't add agents to avatar mixer agent list from domain server packet
|
2013-04-29 15:07:21 -07:00 |
|
Stephen Birarda
|
6ca21d96d1
|
don't add agents in DS packet to avatar mixer agent list
|
2013-04-29 15:06:46 -07:00 |
|
birarda
|
b7a746648a
|
Merge pull request #166 from birarda/master
fix agent type for agents added to avatar mixer
|
2013-04-29 15:00:02 -07:00 |
|
Stephen Birarda
|
d1a7a20e4c
|
agents added to avatar-mixer are of type avatar
|
2013-04-29 14:59:24 -07:00 |
|
ZappoMan
|
ea219cdd16
|
Merge pull request #163 from birarda/no-avatars
remove half-baked ping reply setup from avatar mixer
|
2013-04-29 14:53:24 -07:00 |
|
Philip Rosedale
|
30414fb433
|
Merge pull request #164 from ey6es/master
To fix chat crash, lock agent list when updating from network, simulating, or rendering.
|
2013-04-29 13:56:42 -07:00 |
|
Andrzej Kapolka
|
c9c32630e8
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-29 13:22:25 -07:00 |
|
Andrzej Kapolka
|
0fe4d57ad7
|
I think this is the least intrusive fix for the chat crashes: lock the agent
list when we're updating from the network, simulating, or rendering. I think
there are likely to be other synchronization issues, but this is a start.
|
2013-04-29 13:17:39 -07:00 |
|
Stephen Birarda
|
c3c9616afb
|
avatar mixer still needs to check in with DS
|
2013-04-29 12:53:05 -07:00 |
|
Stephen Birarda
|
be0bf37109
|
remove the unused avatarIndex variable
|
2013-04-29 12:48:19 -07:00 |
|
Stephen Birarda
|
7b8d377eb4
|
simplify the avatar mixer communication while publicly accessible
|
2013-04-29 12:47:03 -07:00 |
|
Stephen Birarda
|
1ceda66ab8
|
remove added debugging in avatar-mixer, light refactoring
|
2013-04-29 12:38:46 -07:00 |
|
Philip Rosedale
|
da4d541ecb
|
Merge pull request #162 from Ventrella/master
improved hand holding algorithm
|
2013-04-29 12:06:19 -07:00 |
|
Stephen Birarda
|
b7189ef263
|
add debug to avatar mixer to figure out invisible avatars
|
2013-04-29 12:04:53 -07:00 |
|
Jeffrey Ventrella
|
9924be9188
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-29 10:41:58 -07:00 |
|
Jeffrey Ventrella
|
4e4521325d
|
added 'isCollidable' to avatar bone so that some bones do not collide (for handshaking)
|
2013-04-29 10:38:29 -07:00 |
|
Philip Rosedale
|
84a8af4808
|
Merge pull request #154 from PhilipRosedale/master
Code cleanup, better gyro look, removed cloud/field
|
2013-04-28 14:51:00 -07:00 |
|
Philip Rosedale
|
3787c93142
|
Fixes per review
|
2013-04-28 14:49:08 -07:00 |
|
Jeffrey Ventrella
|
caac600030
|
improved hand holding algorithm
|
2013-04-27 22:00:02 -07:00 |
|
Philip Rosedale
|
b9234b0a02
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-27 17:19:55 -07:00 |
|
Philip Rosedale
|
bb4500886b
|
Merge pull request #160 from Ventrella/master
made camera first-person prototype and improved avatar collisions
|
2013-04-27 17:18:22 -07:00 |
|
Jeffrey Ventrella
|
37e304fd14
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-27 16:45:58 -07:00 |
|
Philip Rosedale
|
5e737ce5d4
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-27 16:39:19 -07:00 |
|
Philip Rosedale
|
f6ef117788
|
Merge pull request #157 from tschw/19165
19165
|
2013-04-27 16:37:46 -07:00 |
|
Jeffrey Ventrella
|
57cbd9c6d9
|
cleaned up collision code some
|
2013-04-27 09:47:46 -07:00 |
|
Jeffrey Ventrella
|
5c3bd5fe87
|
improved collisions between avatars
|
2013-04-27 09:33:58 -07:00 |
|
Jeffrey Ventrella
|
308b9dcf82
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-26 17:44:42 -07:00 |
|
Jeffrey Ventrella
|
adccd62f87
|
made a different prototype for camera shifting into first-person
|
2013-04-26 17:43:47 -07:00 |
|
Philip Rosedale
|
16ea53f921
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-26 17:40:27 -07:00 |
|
Philip Rosedale
|
ebc5d665c0
|
Merge pull request #158 from ey6es/master
Reverted threading change by default, since we're seeing lower frame rates.
|
2013-04-26 17:19:11 -07:00 |
|
birarda
|
7ddf33b9c3
|
Merge pull request #159 from birarda/audio
tune distance ratio, remove debugging in audio mixer
|
2013-04-26 17:14:36 -07:00 |
|
Stephen Birarda
|
14012ee44b
|
remove the debugging to confirm that distance attenuation is working
|
2013-04-26 17:11:51 -07:00 |
|
Andrzej Kapolka
|
c26becf6cb
|
Added toggle for nonblocking networking; default to threaded for now, since
we're seeing lower frame rates.
|
2013-04-26 17:10:52 -07:00 |
|
Philip Rosedale
|
99957f31f3
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-26 17:09:05 -07:00 |
|
Stephen Birarda
|
5442362b3a
|
change DISTANCE_RATIO const in audio-mixer main
|
2013-04-26 17:01:54 -07:00 |
|
Philip Rosedale
|
69cf6e303d
|
Merge pull request #155 from Ventrella/master
merge
|
2013-04-26 16:54:28 -07:00 |
|
Philip Rosedale
|
996a8794d0
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-26 16:37:58 -07:00 |
|
Philip Rosedale
|
1804357eab
|
Merge pull request #156 from ey6es/master
Style fixes to chat code, and moved packet reading to main thread to fix synchronization issues.
|
2013-04-26 16:34:41 -07:00 |
|
tosh
|
dbfef9d802
|
Merge branch 'master' of git://github.com/worklist/hifi into 19165
Conflicts:
interface/src/Audio.cpp
|
2013-04-27 00:53:29 +02:00 |
|
Jeffrey Ventrella
|
2486b6e15c
|
moved inline functions from Camera.h to Camera.cpp as per Stephen's request
|
2013-04-26 13:33:36 -07:00 |
|
Jeffrey Ventrella
|
59ef9e5d7e
|
removed incomplete code snippet in Avatar.h
|
2013-04-26 13:21:49 -07:00 |
|
Andrzej Kapolka
|
21f1669388
|
How'd those tabs get in there?
|
2013-04-26 13:10:44 -07:00 |
|
Andrzej Kapolka
|
c4776fcd27
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-26 13:03:09 -07:00 |
|
Jeffrey Ventrella
|
e9592f9360
|
moved handController
|
2013-04-26 12:55:13 -07:00 |
|