Commit graph

68 commits

Author SHA1 Message Date
Atlante45
baf4a82269 Fix crash occuring when geometry not yet available 2014-06-27 09:56:03 -07:00
Atlante45
e41d3f407b Removed nested lock 2014-06-26 16:40:59 -07:00
Atlante45
a8c3501bdd Keep sitting points updated 2014-06-25 11:49:36 -07:00
Atlante45
1d7d970ff6 Added sitting points to modelItem 2014-06-25 11:48:48 -07:00
ZappoMan
fd3916e662 another hack attempt to fix unit tests on windows 2014-06-24 20:10:06 -07:00
ZappoMan
1eb5b3dda1 argggg ssize_t from stdlib.h 2014-06-24 19:58:59 -07:00
ZappoMan
d967c100c4 argggg ssize_t from types.h 2014-06-24 19:57:52 -07:00
ZappoMan
5486cd4019 argggg ssize_t 2014-06-24 19:29:26 -07:00
ZappoMan
71afc3f4d4 argggg ssize_t 2014-06-24 19:26:24 -07:00
ZappoMan
e5349024e6 argggg ssize_t 2014-06-24 19:15:48 -07:00
ZappoMan
7d759fc00c argggg 2014-06-24 19:11:32 -07:00
ZappoMan
3ad07f4b91 argggg 2014-06-24 19:08:16 -07:00
ZappoMan
40a842d251 windows build issue 2014-06-24 18:15:00 -07:00
ZappoMan
0ae7411bf0 fix some bugs in models 2014-06-10 13:37:53 -07:00
Atlante45
dece3ea095 Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch 2014-06-06 10:26:49 -07:00
Atlante45
4209c1102f Revert "Models.addModel now returns a more accurate modelID"
This reverts commit 150477eea4.
2014-06-06 10:26:08 -07:00
Atlante45
150477eea4 Models.addModel now returns a more accurate modelID 2014-06-05 15:47:25 -07:00
Atlante45
0bdd20abc9 Coding Standard 2014-06-05 15:46:07 -07:00
ZappoMan
152d99d810 removed some old debug code and updated a comment 2014-06-04 15:23:17 -07:00
ZappoMan
8d4a8f7e67 first cut at partial model elements 2014-06-04 10:22:49 -07:00
ZappoMan
b212f9edca fix ray picking at distances 2014-05-30 15:07:54 -07:00
ZappoMan
8a4955d75b temporarily disable the model aligned box picking 2014-05-30 11:13:37 -07:00
wangyix
c87c474877 removed debug info, cleaned code for pull req 2014-05-29 10:39:40 -07:00
wangyix
a0f9d2c106 Merge remote-tracking branch 'upstream/master' 2014-05-29 09:20:30 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested
removed/commented out debug prints
2014-05-28 17:41:38 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase
... this fixes unreasonable flight-time issue
2014-05-28 17:20:10 -07:00
ZappoMan
574bca38e6 clean up comments and variable names 2014-05-28 12:10:51 -07:00
ZappoMan
bebfd7a301 non-aabox picking working 2014-05-28 12:02:22 -07:00
ZappoMan
6fd22856f2 hacking on non-AABox models 2014-05-28 10:24:02 -07:00
ZappoMan
c63c0c0ce3 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe support ray picking against the AABB for the rotated model extents 2014-05-27 13:39:32 -07:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube
Add RayPick support for models
2014-05-24 17:03:59 -07:00
ZappoMan
efd0580cfb add ray picking to the model scripting interface 2014-05-23 17:09:37 -07:00
Atlante45
df68082705 Added local glow to models 2014-05-23 11:02:07 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
ZappoMan
f876a72b37 fix crash in model server when you attempt to create an unreasonably small model 2014-05-21 15:12:36 -07:00
ZappoMan
412e870f98 add support for backward compatibility in old versions of models.svo 2014-05-20 15:32:50 -07:00
ZappoMan
e7425a8128 support for models in root element 2014-05-20 15:20:27 -07:00
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
ZappoMan
bb204154a1 tweak 2014-05-16 16:59:58 -07:00
ZappoMan
0e446d0fc5 fix two bugs in models not rendering 2014-05-16 16:53:14 -07:00
ZappoMan
f5b4e1da37 fix potential floating point error when animations have no frames 2014-05-16 10:00:35 -07:00
ZappoMan
0db242bbaa cleanup debug 2014-05-15 00:46:09 -07:00
ZappoMan
ca2d2c751c fixing models not rendering sometimes 2014-05-15 00:34:09 -07:00
ZappoMan
f6c1d3e635 clean up animations 2014-05-14 14:00:31 -07:00
ZappoMan
0c34d9e065 cleanup remove some debug 2014-05-14 12:59:59 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Atlante45
5ef71d6a35 Full mouse handling 2014-05-14 10:40:50 -07:00
ZappoMan
a56567a369 add support for adjustable FPS 2014-05-13 09:27:31 -07:00