Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 11:14:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32980 commits 25 branches 0 tags 1.1 GiB
Commit graph

32980 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
accdd8c86a add animation properties to edit properties 2015-10-02 19:15:24 -07:00
Brad Davis
c8aea67505 Working on texture compatibility with Shadertoy 2015-10-02 19:09:43 -07:00
David Rowe
88937318d8 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/ParticleEffectEntityItem.h
 2015-10-02 18:39:50 -07:00
samcake
edaa8f998a Migrating to the new mesh for rendering and having problems with multi part mesh 2015-10-02 18:12:16 -07:00
Seth Alves
a42bb5f533 Merge pull request #5981 from ericrius1/sprayCanFix 
No longer removing non-existent entities from spray paint can; color …
 2015-10-02 17:56:51 -07:00
Seth Alves
26310d8ce4 kill gravity in near-held objects 2015-10-02 17:54:09 -07:00
David Rowe
67a497cda3 Sanitize particle properties and their use 
Excluding animationSetings because it's unused and will be removed.
 2015-10-02 17:37:59 -07:00
Seth Alves
6a770a870b set correct type in kinematic hold 2015-10-02 17:31:45 -07:00
Brad Hefta-Gaub
abdd9a6da4 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 17:28:06 -07:00
Brad Hefta-Gaub
eb9078bda5 cleanup 2015-10-02 17:27:45 -07:00
James Pollack
2600fe577e Merge remote-tracking branch 'upstream/master' 2015-10-03 01:24:41 +01:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
Brad Hefta-Gaub
68dc303603 remove debug 2015-10-02 17:12:03 -07:00
Brad Hefta-Gaub
f618a2adfa gak - get streaming working again 2015-10-02 17:06:32 -07:00
ericrius1
38a66bc915 syntax fixes 2015-10-02 16:53:13 -07:00
Howard Stearns
fdba55e56e Merge pull request #5973 from ctrlaltdavid/20698 
Fix Reload Content menu item not reloading FST files
 2015-10-02 16:43:11 -07:00
Anthony J. Thibault
b6b57de1c6 animation lib warning fixes 2015-10-02 16:42:50 -07:00
Howard Stearns
a5a7c16466 Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment 
edit.js adjustment
 2015-10-02 16:28:54 -07:00
ericrius1
1ac1fcaf69 Light switches work properly now; no extra lights 2015-10-02 16:17:54 -07:00
Howard Stearns
8153ad7f44 Merge pull request #5967 from AndrewMeadows/collision-group-hack 
allow physical objects to be set collisionless
 2015-10-02 16:08:52 -07:00
ericrius1
e6e60e5e7a Lights should now only be created once at start of running reset master script, no matter how many people there are in the room 2015-10-02 15:58:32 -07:00
James Pollack
01044e3c05 adjust gun dimensions in toybox master script 2015-10-02 15:57:46 -07:00
James Pollack
1ff5f11e29 merge 2015-10-02 15:56:39 -07:00
James Pollack
9427ba1a5a ping pong gun 2015-10-02 15:56:26 -07:00
Brad Davis
224ef4a7c4 Merge pull request #5982 from ZappoMan/master 
add GLEW_STATIC to fix link warnings
 2015-10-02 15:42:09 -07:00