Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 20:07:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23015 commits 25 branches 0 tags 1.1 GiB
Commit graph

23015 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
23a6326aa1 testing the shader features in Model and refining the shader making workflow 2015-03-08 10:53:29 -07:00
Seth Alves
b2cfed8bca removed unused blob of code 2015-03-08 09:04:00 -07:00
Jason
0fd9540bc3 Sync to upstream 
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
 2015-03-07 21:40:06 -08:00
Seth Alves
e4baaa38b4 collision model url 2015-03-07 20:33:00 -08:00
Seth Alves
1a1863679d bump entity-data message version number 2015-03-07 20:32:41 -08:00
Seth Alves
d713d5596f bump entity-data message version number 2015-03-07 20:32:28 -08:00
Seth Alves
b8cdf1a318 quiet warning 2015-03-07 20:31:53 -08:00
Seth Alves
804d4a0963 coding standard 2015-03-07 20:31:37 -08:00
Seth Alves
96d94e1b09 collision model url 2015-03-07 20:31:04 -08:00
Seth Alves
58bd8a5c65 collision model url 2015-03-07 20:30:29 -08:00
Seth Alves
bcfd1d8a89 collisionModelURL property 2015-03-07 20:27:20 -08:00
Seth Alves
630b5dd03b collisionModelURL property 2015-03-07 20:27:02 -08:00
Seth Alves
9ec72e4902 quiet warning on linux 2015-03-07 20:25:46 -08:00
Seth Alves
cdeda67942 Collision Model url 2015-03-07 20:25:18 -08:00
Seth Alves
1bf8054cec Collision Model 2015-03-07 20:24:50 -08:00
Seth Alves
f6948193f1 add fields for collision model url 2015-03-07 20:24:11 -08:00
Seth Alves
72ebae72c0 allow adding entities with model urls that end in .obj 2015-03-07 20:22:32 -08:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Andrew Meadows
5b854857c1 fix JS scripts to use radians per second 
in entity properties
 2015-03-07 18:02:41 -08:00
Seth Alves
05e0fe3536 object display correctly now? 2015-03-07 11:28:30 -08:00
Seth Alves
3642e93b3f keep triangles facing outward 2015-03-07 11:28:09 -08:00
Seth Alves
bb0f6b4d28 uninitialized variable 2015-03-07 11:27:52 -08:00
Seth Alves
b96e455b72 uninitialized variable 2015-03-07 11:27:27 -08:00
Seth Alves
f807384dfe build a joint and caclulate extents. obj models now show up, though not correctly. 2015-03-07 07:55:04 -08:00
Seth Alves
d642b52de3 swap y and z coords because normal obj format has 3rd value as up 2015-03-07 07:54:19 -08:00
Seth Alves
adfacf1e98 adjust debugging prints 2015-03-07 07:53:45 -08:00
Seth Alves
4a7dd2b3e6 allow downloading of obj files 2015-03-07 07:53:25 -08:00
Seth Alves
d7c8f22246 stray control-Ms 2015-03-07 07:53:04 -08:00
Seth Alves
6772847d0b make it so I don't have to count 2015-03-07 07:52:39 -08:00
Seth Alves
8a4339e57f stray control-Ms 2015-03-07 07:52:20 -08:00
Seth Alves
591edc0527 _mesh instance variable doesn't appear to be in use. 2015-03-07 07:51:47 -08:00
Virendra Singh
5465853ef7 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-07 17:50:21 +05:30
Seth Alves
6e79fc8b68 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-06 18:46:13 -08:00
ZappoMan
7088c0287a different mixamo detection 2015-03-06 18:29:22 -08:00
David Rowe
d112c455e2 Add hmdDefaults.js script 2015-03-06 17:49:31 -08:00
samcake
174e359c50 Merge pull request #4387 from ZappoMan/fbxFixes 
tweaks to hacks for detecting mixamo files
 2015-03-06 17:25:19 -08:00
Brad Hefta-Gaub
c9dd96c98d Merge pull request #4389 from birarda/master 
render application overlay only if enabled
 2015-03-06 17:06:05 -08:00
Andrew Meadows
f5352333f0 entities use radians per second for angular velocity 2015-03-06 16:42:06 -08:00
Brad Hefta-Gaub
fd6f8c7792 Merge pull request #4382 from huffman/import-export 
Improvements to Import/Export entities
 2015-03-06 16:31:57 -08:00
Jason
cfcc4679e1 Interview project updates (2). 
Oops, I forgot to convert tabs-to-spaces on EntityTreeRenderer.
Committing it now.
 2015-03-06 15:57:38 -08:00
Jason
7a5669f14e Interview project updates. 
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project.  Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
 2015-03-06 15:52:21 -08:00
Andrew Meadows
021510ae68 merge upstream/master into andrew/isentropic 2015-03-06 15:38:10 -08:00
Andrew Meadows
95c7bcb5f8 whoops -- remove last *InTreeUnits() calls 2015-03-06 15:34:35 -08:00
Andrew Meadows
c4dafc74ad whoops, remove last bestFitBoundsInMeters() call 2015-03-06 15:33:15 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Andrew Meadows
6936d65db9 remove unused *= operator for AABox 2015-03-06 15:31:52 -08:00
Andrew Meadows
6fa1b1c600 remove unused cruft and fix float casts 2015-03-06 15:31:27 -08:00
Stephen Birarda
a4963f1895 render application overlay only if enabled 2015-03-06 15:22:25 -08:00
Stephen Birarda
8eb93c2e01 Merge pull request #4388 from highfidelity/problem-patch-1 
Update to .com instead of .io in Welcome dialog
 2015-03-06 15:19:15 -08:00
Grayson Stebbins
7c78e598b8 Update to .com instead of .io in Welcome dialog 2015-03-06 15:15:48 -08:00