Stephen Birarda
d3776afc93
fix for DLL section in BUILD guide
2014-04-14 12:36:13 -07:00
Stephen Birarda
1aacba3b46
changes to Windows instructions for GnuTLS
2014-04-14 12:31:53 -07:00
Stephen Birarda
0f9a00aacf
Merge pull request #2664 from birarda/authentication
...
update cmake required version
2014-04-14 10:57:50 -07:00
Stephen Birarda
c5c8327359
update required version of cmake to 2.8.12.2
2014-04-14 10:57:34 -07:00
Stephen Birarda
8f23b12081
Merge pull request #2662 from birarda/authentication
...
update build guide with extra info for GnuTLS
2014-04-14 10:52:09 -07:00
Stephen Birarda
70191111c7
remove GnuTLS DLL tip since DLL section is right below
2014-04-14 10:51:36 -07:00
Stephen Birarda
95abc74d83
add GnuTLS to example windows folder structure
2014-04-14 10:50:57 -07:00
Stephen Birarda
1c7f8c87bc
don't codify directories in OS X section
2014-04-14 10:50:03 -07:00
Stephen Birarda
6cb5497242
codify some library names and fix some other spelling
2014-04-14 10:49:11 -07:00
Stephen Birarda
007a477400
fix a typo in build guide
2014-04-14 10:46:42 -07:00
Stephen Birarda
6b4a7d365f
update build guide with extra info for GnuTLS
2014-04-14 10:43:42 -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
Andrzej Kapolka
25d25b1472
Merge pull request #2658 from AndrewMeadows/inertia
...
don't render avatar boundary shapes in first person
2014-04-14 10:23:43 -07:00
Philip Rosedale
e3eddadd10
Merge pull request #2651 from AndrewMeadows/avatar-interaction
...
protection against bad avatar-avatar collisions
2014-04-11 21:23:57 -07:00
Leonardo Murillo
13b12f48c2
Merge pull request #2659 from murillodigital/master
...
switching to https
2014-04-11 19:59:22 -06:00
Leonardo Murillo
f84249ac6c
switching to https
2014-04-11 19:58:49 -06:00
Andrew Meadows
0ad841edfb
don't render avatar boundary shapes in first person
2014-04-11 17:44:51 -07:00
Andrew Meadows
fd3b317c09
merge
2014-04-11 16:36:42 -07:00
Andrzej Kapolka
2fdb8d935b
Merge pull request #2654 from Atlante45/remove_qrc_from_sources
...
Remove qrc from sources
2014-04-11 16:35:48 -07:00
Andrzej Kapolka
91c21ced5d
Merge pull request #2652 from AndrewMeadows/inertia
...
save settings whenever menu items are changed
2014-04-11 16:35:01 -07:00
Andrew Meadows
b5e7c30178
merge
2014-04-11 16:00:34 -07:00
Andrew Meadows
017d410c48
merge upstream/master -> andrew/avatar-interaction
2014-04-11 15:59:48 -07:00
Andrew Meadows
508d4f216d
fix #2656 avatar jumps very far away
...
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule. The
penetration against such a shape could be arbitrarily large.
2014-04-11 15:55:18 -07:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
Philip Rosedale
d3b43a9a89
Merge pull request #2653 from ey6es/master
...
In addition to pushing the camera back to avoid intersecting, also narrow the field of view.
2014-04-11 12:11:36 -07:00
Atlante45
c39434f4e3
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources
...
Conflicts:
interface/resources/resources.qrc
2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4
Modify UIs that were using the qrc
2014-04-11 11:59:23 -07:00
Atlante45
18b364d9d9
Removed QResources from Interface
2014-04-11 11:57:25 -07:00
Stephen Birarda
1cd5fec71c
push packet version for assignments
2014-04-11 11:42:33 -07:00
Andrzej Kapolka
d6534d6026
Tweak to zoom on pushback.
2014-04-11 11:10:22 -07:00
Stephen Birarda
6431d35f86
add a missing newline to DomainHandler
2014-04-11 10:19:31 -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
Stephen Birarda
9fcb656027
add a newline to FindGnuTLS and fix filename in header
2014-04-11 09:26:45 -07:00
Andrew Meadows
f7862eb600
check for bad deltaTime during avatar-avatar collisions
2014-04-11 08:58:26 -07:00
AndrewMeadows
e850faee79
Merge pull request #2649 from ey6es/master
...
Experimental "pushback" to avoid other avatars' intersecting the near clip plane.
2014-04-11 07:50:52 -07:00
Philip Rosedale
8ccc0a2081
Merge pull request #2650 from thoys/chatwindow-docking-feature
...
Fixed docking of ChatWindow
2014-04-11 07:21:53 -07:00
Andrzej Kapolka
806bcc8e6f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-10 18:49:52 -07:00
Andrzej Kapolka
d712588b36
Better rolloff.
2014-04-10 17:35:47 -07:00
Andrew Meadows
af158a3a94
save settings when any checkable menu item changes
2014-04-10 17:34:12 -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
Andrew Meadows
66b6328687
protection against bad avatar-avatar collisions
...
Also with logging if we encounter incorrectly large penetration depths
2014-04-10 16:58:52 -07:00
Clément Brisset
5f6dee6c64
Merge pull request #2635 from thoys/windows-script-path-fix
...
Fixed loading local stored scripts on Windows machines
2014-04-10 16:40:47 -07:00
Clément Brisset
d7c2b44ad4
Merge pull request #2633 from stojce/19508
...
#19508 Implement a new UI for Preferences
2014-04-10 16:33:38 -07:00
Stojce Slavkovski
3af3b29588
removed dependency on QT resource
2014-04-11 00:54:54 +02:00
Thijs Wenker
f0463a5679
Fixed docking of ChatWindow
...
Temporary Pin Icon, replace with a nice looking one please
2014-04-11 00:45:38 +02: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
Stojce Slavkovski
112c8946d6
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 23:46:22 +02:00
