Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 04:50:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29638 commits 25 branches 0 tags 1.1 GiB
Commit graph

29638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
41e68b1c52 Disable back-face culling when rendering BillboardOverlay 2015-08-07 10:59:54 -07:00
Howard Stearns
5aa85a5b03 Don't let individual startAnimation get messed up by blend/fade. 2015-08-07 10:59:54 -07:00
bwent
d4e22ba78e clean up formatting, make connectionUUID const in NodeList 2015-08-07 10:59:53 -07:00
bwent
e2be6f7604 add check if user is local user 2015-08-07 10:59:53 -07:00
bwent
1f2bd62f54 clean-up formatting 2015-08-07 10:59:52 -07:00
samcake
6864c7bcb4 Ready for release 2015-08-07 10:59:51 -07:00
Sam Gateau
0e3e0d05f1 Introducing the Normal fitting algorithm for better normal in the deferred buffer 2015-08-07 10:59:51 -07:00
bwent
fb22ccf652 Remove ERR_get_error call 2015-08-07 10:59:50 -07:00
bwent
d9c98ca4cd Add connection token to sign with username when connecting to domain-server 2015-08-07 10:59:50 -07:00
bwent
6368fc2ae6 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-07 10:59:49 -07:00
bwent
cb57b6ccab fix username signature not const 2015-08-07 10:59:49 -07:00
bwent
ba225875cf debugging 2015-08-07 10:59:48 -07:00
bwent
cb8663de36 Debug null QUuid being stored in conenctionTokenHash 2015-08-07 10:59:47 -07:00
bwent
64cac1db5e To debug RSA padding error 2015-08-07 10:59:47 -07:00
bwent
f14fcdee60 Fix DomainServerConnectionTOken packet writing/resetting 2015-08-07 10:59:46 -07:00
bwent
ff558a8b56 Generate session token UUIDs to be signed with username 2015-08-07 10:59:46 -07:00
Brad Davis
8188d34037 Merge pull request #5518 from SamGondelman/sam/input-plugins 
Working on toybox script
 2015-08-06 16:09:22 -07:00
Sam Gondelman
4c7c2e9390 fixing more connexion problems 2015-08-06 15:06:05 -07:00
Sam Gondelman
54f64b62eb Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-08-06 14:45:26 -07:00
Bradley Austin Davis
985bdb2190 Fixing merge 2015-08-06 11:52:38 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Brad Davis
9215ea8894 Merge pull request #5516 from Atlante45/warnings 
Fix warning and remove unused headers
 2015-08-05 19:12:09 -07:00
Brad Davis
37dc2d00cd Merge pull request #5515 from sethalves/zlib-in-build-instructions 
update build instructions -- interface now depends on zlib
 2015-08-05 19:10:42 -07:00
Sam Gondelman
3256e30f02 toybox script 2015-08-05 18:54:08 -07:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00
Seth Alves
12286b7e9b Merge pull request #5514 from howard-stearns/only-update-motion-state-for-my-avatar 
Don't try to animate other people's avatars!
 2015-08-05 16:17:22 -07:00
Seth Alves
bee21b13b7 interface now depends on zlib. describe how to install on windows 2015-08-05 16:13:25 -07:00
Howard Stearns
ca6d798aa5 Don't try to animate other people's avatars! 2015-08-05 15:59:22 -07:00
samcake
a4f105f6c3 Merge pull request #5495 from highfidelity/core 
Update the rendering pipeline to use OpenGL 4.1 Core profile everywhere
 2015-08-05 15:10:46 -07:00
Stephen Birarda
998a8168a3 remove an extra unneeded message 2015-08-05 14:38:14 -07:00
Stephen Birarda
653e0d29c7 resolve conflicts on merge with upstream/core 2015-08-05 14:37:30 -07:00
Stephen Birarda
078e60076c don't set a default build type 2015-08-05 14:34:00 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Bradley Austin Davis
252677e1c2 Fix MD5 of glew dep 2015-08-05 14:02:14 -07:00
Bradley Austin Davis
89cc2ccfa5 More merge comments 2015-08-05 13:53:19 -07:00
Bradley Austin Davis
649b9d6ce9 Fixing signed/unsigned comparisons 2015-08-05 13:48:05 -07:00
Brad Davis
754bf5c6f7 Merge pull request #5509 from birarda/core 
get GLEW for all platforms as external project
 2015-08-05 13:41:48 -07:00
Brad Davis
5723d2689b Merge pull request #5510 from SamGondelman/core 
Core Profile: Merge from master
 2015-08-05 12:52:37 -07:00
Sam Gondelman
513c652ab3 merge from master and attempt to fix connexion conflicts 2015-08-05 12:42:39 -07:00
Stephen Birarda
34e188fe6e log more of the steps for glew external project 2015-08-05 12:35:37 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Sam Gondelman
113c4ea28b exposing palm velocity and angular velocity to js 2015-08-05 12:17:15 -07:00
Anthony Thibault
49be7c49b7 Merge pull request #5506 from howard-stearns/smooth-faded-animations 
Smooth fading of animations in and out.
 2015-08-05 12:02:44 -07:00
Stephen Birarda
4b673838ac Merge pull request #5508 from jherico/marge 
Removing integrated glew
 2015-08-05 11:31:17 -07:00
Bradley Austin Davis
04d579be7a Removing integrated glew 2015-08-05 11:21:59 -07:00
Andrew Meadows
59f6988e56 Merge pull request #5465 from SamGondelman/connexionFixes 
Trying to fix/clean up 3DConnexion stuff
 2015-08-05 11:16:34 -07:00
Howard Stearns
bb974edf7f Add assert on mix range. 2015-08-05 11:09:04 -07:00
Howard Stearns
f51b5be167 Simplify fade normalization, eliminating a loop. 2015-08-05 11:00:40 -07:00
Andrew Meadows
5be8583b7d Merge pull request #5494 from sethalves/gzip-json-entity-persist-files 
gzip json entity persist files
 2015-08-05 10:56:03 -07:00
Howard Stearns
653e46fdd3 const methods. 2015-08-05 10:51:26 -07:00