Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 08:39:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 70 branches 57 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
0f85c28098 Fix HMD 3rd person view 2015-09-21 21:08:13 -07:00
Howard Stearns
71b7f9ee38 Apostrophe key resets animation state. 2015-09-21 19:14:24 -07:00
BOB LONG
a23a90bf5f Code simplification 
Simplify the code a bit as suggested:

1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation

Correct the js sample file header.

testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
 2015-09-21 19:11:13 -07:00
samcake
91b9940fe9 Merging and a fix for the diffuse map floating around 2015-09-21 18:09:25 -07:00
Andrew Meadows
3869887610 splitting AnimNode implementation into two files 2015-09-21 17:53:59 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
James B. Pollack
bf22d5a942 dont delete wand at cleanup from createWand.js 2015-09-21 17:43:05 -07:00
James B. Pollack
f8d743aff0 Update to use new grab methods, only specifically request properties that we are actually using 2015-09-21 17:38:49 -07:00
James B. Pollack
92152b250a Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2 2015-09-21 17:37:23 -07:00
Andrew Meadows
e6776ef5eb split AnimIK::evaluate() into sub-functions 
also IK targets now in model-frame instead of root-frame
 2015-09-21 17:29:39 -07:00
Brad Davis
7b5cbbf758 Merge pull request #5868 from ctrlaltdavid/20687 
Fix HMD fullscreen mirror view
 2015-09-21 17:07:31 -07:00
James B. Pollack
e6de20b2df Merge remote-tracking branch 'highfidelity/master' 2015-09-21 17:01:58 -07:00
James B. Pollack
81358b7f14 wand changes 2015-09-21 17:01:31 -07:00
samcake
21f53f1bbd debugging the lighting issue on the craps table 2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
Brad Davis
483884196c Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles 
merge model part quads and triangles together to reduce the number of draw calls
 2015-09-21 16:48:29 -07:00
James B. Pollack
2cb875e40d Merge remote-tracking branch 'highfidelity/master' into bubblewand_hotfix_2 2015-09-21 16:45:37 -07:00
James B. Pollack
cd6ad306ac start transitioning to new grab methods 2015-09-21 16:45:23 -07:00
Brad Davis
8f3c2af55e Merge pull request #5863 from ZappoMan/fixParticleEffect 
fix a couple of properties
 2015-09-21 16:43:12 -07:00
ericrius1
a4e5f707cc Toggling lights 2015-09-21 16:35:30 -07:00
Bradley Austin Davis
0401672c82 Fixing lighting again 2015-09-21 16:24:55 -07:00
James B. Pollack
d79c1bec95 remove query string 2015-09-21 16:13:24 -07:00
samcake
dfe17e5708 Fix issues from review 2015-09-21 16:12:17 -07:00
James B. Pollack
fd67a2b86f Add on/off by pressure; add point bulb to end of flashlight 2015-09-21 16:10:08 -07:00
ericrius1
e4d630b1fc more light toggling additions 2015-09-21 15:57:03 -07:00
ericrius1
8678e07c21 Adding in light triggering logic 2015-09-21 15:45:54 -07:00
Bradley Austin Davis
b3aeaba5f4 CR feedback 2015-09-21 15:44:47 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
Howard Stearns
4dd95be8c4 Forgot to actually persist. 2015-09-21 15:06:11 -07:00
ericrius1
13d7834902 Merge remote-tracking branch 'upstream/master' into toybox 2015-09-21 14:51:33 -07:00
Bradley Austin Davis
84cea1ffd4 More CR comments 2015-09-21 14:33:32 -07:00
Philip Rosedale
26e5f1ca48 Merge pull request #5842 from SeijiEmery/platform-js 
Platform.js
 2015-09-21 14:28:34 -07:00
samcake
fa9b0930d2 Bring back the procedural skybox 2015-09-21 14:25:32 -07:00
David Rowe
46524632fe Fix eyeball directions in fullscreen HMD view 2015-09-21 14:18:33 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
Philip Rosedale
cd84848fd4 Merge pull request #5867 from sethalves/fix-grab 
keep object from rotating during local grab
 2015-09-21 14:11:59 -07:00
David Rowe
7ffde27224 Fix HMD fullscreen mirror view 2015-09-21 14:04:32 -07:00
Howard Stearns
7fe1779109 Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph 2015-09-21 13:52:11 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Seth Alves
cee296e70c keep object from rotating during local grab 2015-09-21 13:50:42 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
43d96afc89 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-21 13:23:54 -07:00
James B. Pollack
71e668470f Merge remote-tracking branch 'highfidelity/master' into flashlight_updates_1 2015-09-21 13:23:38 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
ericrius1
b727256377 animation of doll plays longer now to give user a chance to see it play 2015-09-21 13:05:37 -07:00
James B. Pollack
ce0055be2c Merge remote-tracking branch 'highfidelity/master' 2015-09-21 13:03:02 -07:00
Brad Hefta-Gaub
25f506f3dc Merge pull request #5860 from ctrlaltdavid/20686 
QA for 20686 - Clear entity list when you change domains
 2015-09-21 12:01:43 -07:00
Stephen Birarda
030404157e cleanup Assignment grab from iterator 2015-09-21 11:54:41 -07:00
Stephen Birarda
e21c1cb67c make sure server/mixers are first in FIFO 2015-09-21 11:51:53 -07:00