Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 19:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33055 commits 71 branches 56 tags 1.2 GiB
Commit graph

33055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
d48f17e0e1 Merge pull request #5995 from Atlante45/log 
Make log more readable
 2015-10-05 16:04:47 -07:00
Stephen Birarda
5989cad054 add override qualifier to suppress warnings in entities-renderer 2015-10-05 15:55:05 -07:00
Stephen Birarda
7bd98354d8 add override to supress warnings in ui-test 2015-10-05 15:53:52 -07:00
Stephen Birarda
25a1f2dd11 add override to suppress warning for PluginContainerProxy 2015-10-05 15:53:37 -07:00
Stephen Birarda
a2c9d7a4b2 add overrides for Avatar classes in Interface 2015-10-05 15:52:47 -07:00
Brad Hefta-Gaub
f30a94064f make animation start/stop work 2015-10-05 15:50:55 -07:00
Stephen Birarda
3ddfcc10c2 override additions to input-plugins 2015-10-05 15:50:35 -07:00
Chris Collins
c0a881ec52 added the correct call 
added the correct call
 2015-10-05 15:37:04 -07:00
Chris Collins
1e01d6bd8f Add the ability to switch between mono and stereo in HMD 
Add the ability to switch between mono and stereo in HMD
 2015-10-05 15:30:53 -07:00
Stephen Birarda
e835b5ccf3 remove old gnutls code from domain-server 2015-10-05 15:30:26 -07:00
Anthony Thibault
2a406481d4 Merge pull request #5992 from howard-stearns/reset-on-calibration 
Reset (as though by apostrophe key) whenever we calibrate the hydra.
 2015-10-05 15:19:16 -07:00
Stephen Birarda
9bc95a0fc1 fix override warnings in assignment-client 2015-10-05 15:17:10 -07:00
Clément Brisset
70b9b1eb77 Merge pull request #5985 from hyperlogic/tony/anim-warning-fix 
animation lib warning fixes
 2015-10-05 15:03:47 -07:00
Atlante45
598aab884e Make log more readable 2015-10-05 14:59:28 -07:00
Seth Alves
99be44f92d smooth out vibrating appearance for kinematic hold 2015-10-05 14:58:42 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Seth Alves
7f8411d947 reference count grabs on an entity 2015-10-05 14:15:38 -07:00
James B. Pollack
daf97b0b9d header fixes 2015-10-05 14:12:18 -07:00
James B. Pollack
bec7bef8df Merge remote-tracking branch 'upstream/master' 2015-10-05 14:10:25 -07:00
James B. Pollack
8cd549c958 adjust chair and plant starting positions 2015-10-05 14:02:24 -07:00
James B. Pollack
839301bf05 remove cleanup to make blocks persistent 2015-10-05 13:41:20 -07:00
Seth Alves
635c83dad1 reset gravity and ignore-for-collisions after grabs have released 2015-10-05 13:39:01 -07:00
James B. Pollack
e528125af2 add test blocks for blockers game 2015-10-05 13:38:48 -07:00
Eric Levin
3f684307e9 Merge pull request #5990 from highfidelity/revert-5987-20699 
Revert "QA for 20699 - Sanitize particle property values when set"
 2015-10-05 13:36:21 -07:00
Eric Levin
c72c87b59c Revert "QA for 20699 - Sanitize particle property values when set" 2015-10-05 13:35:58 -07:00
James B. Pollack
43f69a0be9 initial knockover blocks 2015-10-05 13:23:19 -07:00
Eric Levin
d0f0aae885 Merge pull request #5987 from ctrlaltdavid/20699 
QA for 20699 - Sanitize particle property values when set
 2015-10-05 13:13:16 -07:00
James B. Pollack
1ba31a840a Merge branch 'master' into knockover_blocks 2015-10-05 13:09:15 -07:00
Seth Alves
7f84e882c5 attempt to keep ignoreForCollisions the same before and after grab 2015-10-05 13:06:39 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
Anthony J. Thibault
75849db867 Changed (float)fabs() to fabsf() 2015-10-05 12:00:02 -07:00
Seth Alves
993111d22f code review 2015-10-05 11:28:59 -07:00
James B. Pollack
65ae811c9c make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script 2015-10-05 11:16:55 -07:00
James B. Pollack
588a256304 Merge branch 'master' into ping_pong_gun 2015-10-05 10:54:21 -07:00
James B. Pollack
2e293718fc Merge remote-tracking branch 'upstream/master' 2015-10-05 10:06:41 -07:00
samcake
9e393ced46 MOving rednering code of Model into ModelRenderPayload.h/cpp 2015-10-05 09:17:16 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
samcake
fd232b7d32 ONe more file to deal with the Model rendering 2015-10-04 22:27:48 -07:00
samcake
1799322c67 Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp 2015-10-04 18:46:35 -07:00
samcake
55f5ab3732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-04 18:31:56 -07:00
samcake
48416262a1 Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced 2015-10-04 18:31:19 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
ZappoMan
6f86b0f550 particle fixes 2015-10-04 15:23:17 -07:00
Thijs Wenker
8befade007 expose position and orientation of HMD to Javascript. 
- HMD.orientation
- HMD.position
 2015-10-04 15:08:35 +02:00
David Rowe
53e85e8566 Tidying 2015-10-03 09:59:33 -07:00
David Rowe
510065fe5c Fix particle property maxParticles not being able to be set properly 2015-10-03 09:16:07 -07:00
Brad Hefta-Gaub
2720e6ddf4 debug running property 2015-10-03 08:00:33 -07:00
ZappoMan
b94976485d Merge branch 'master' of https://github.com/ZappoMan/hifi 2015-10-03 07:58:59 -07:00