Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53604 commits 29 branches 0 tags 1.1 GiB
Commit graph

53604 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
d363bde0d4 Merge pull request #10155 from howard-stearns/make-connection-message-not-logged-in 
make connection messaging when not logged in
 2017-04-07 09:12:24 -07:00
David Kelly
cb092d67dd Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 09:01:59 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
Vladyslav Stelmakhovskyi
f88ba7bc57 Yahoo, Reddit etc now works correctly 2017-04-07 15:45:33 +02:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
700c319953 Merge pull request #10158 from highfidelity/revert-10157-brown 
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
 2017-04-07 02:03:51 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
samcake
ac9b181786 Merge pull request #10157 from samcake/brown 2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
Triplelexx
27a404d0ea remove extra lines 2017-04-07 07:09:18 +01:00
Triplelexx
279997d905 change display plugin to deactivate when window minimized 2017-04-07 06:49:28 +01:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
samcake
cb94e1009d Adding a job... 2017-04-06 18:10:28 -07:00
Al Bernstein
ead4793392 removed whitespace 2017-04-06 17:26:12 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56:03 -07:00
howard-stearns
b089fd03b8 make connection messaging when not logged in 2017-04-06 16:48:11 -07:00
samcake
0254c3372f Merge pull request #10143 from jherico/ktx_crash 
Don't crash if KTX file is invalid
 2017-04-06 16:28:19 -07:00
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
Chris Collins
4e9e3cccea Merge pull request #10116 from birarda/bug/rel-ext-textures 
fix relative/absolute path handling for external FBX textures
 2017-04-06 15:58:02 -07:00
Seth Alves
ec2ebc00c0 Merge pull request #10145 from hyperlogic/feature/openvr-1.0.6 
OpenVR: upgrade to version 1.0.6, for better generic tracker support
 2017-04-06 15:53:49 -07:00
Trent Polack
56d86fa1c6 Merge pull request #1 from sethalves/test-10136 
fix warning
 2017-04-06 18:44:53 -04:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column 
fix sorting by pal connections-tab friends column
 2017-04-06 15:43:21 -07:00
Seth Alves
584905a618 fix warning 2017-04-06 15:41:35 -07:00
Dante Ruiz
22521526ec removed stray space 2017-04-06 23:41:30 +01:00
Seth Alves
b1a015affd Merge pull request #10117 from huffman/fix/unlock-propagation 
Fix entity "unlock" edits not being propagated to clients
 2017-04-06 15:28:05 -07:00
David Kelly
179a445f59 updated connection instructions 2017-04-06 15:21:10 -07:00
samcake
6fc965072c Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer 2017-04-06 15:19:55 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936 
pal selection changes
 2017-04-06 14:58:46 -07:00
Clément Brisset
da27cd1c8b Merge pull request #10149 from mittens/patch-1 
Link to coding standards.
 2017-04-06 14:46:45 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
Chris Collins
494c8d868e Merge pull request #10126 from samcake/brown 
Fixing the rendering of Image3D overlay when drawn in the scene
 2017-04-06 13:40:09 -07:00
Anthony J. Thibault
4e49774d0e Moved device class check into handleTrackedObject 2017-04-06 13:20:00 -07:00
Trent Polack
d163b34368 Link to coding standards. 2017-04-06 15:57:32 -04:00
David Kelly
46a7d28e16 Merge pull request #10144 from howard-stearns/notice-login-change-in-pal 
notice login/logout change in pal
 2017-04-06 12:57:22 -07:00
David Kelly
e0a1422345 pal selection changes 2017-04-06 12:07:51 -07:00
trent
21f810e040 Fixed formatting concerns as well as a benign order-of-constructor warning. 2017-04-06 14:50:16 -04:00
samcake
158084369a Merge branch 'ambient' of https://github.com/samcake/hifi into ambient-bis 2017-04-06 11:34:35 -07:00
samcake
19d080c4cc Merging 2017-04-06 11:33:41 -07:00
Al Bernstein
e6e5224647 clean ups - coding standard 2017-04-06 11:27:58 -07:00
samcake
91f315f9ce Adding the concept of selection to the scene 2017-04-06 11:27:48 -07:00