Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#166 #199

Merged
merged 20 commits into from
Mar 14, 2017
Merged

#166 #199

merged 20 commits into from
Mar 14, 2017

Conversation

taro-0
Copy link
Contributor

@taro-0 taro-0 commented Mar 14, 2017

No description provided.

hirako2000 and others added 19 commits March 8, 2017 19:40
@hirako2000
#166 - Adds point light example with 3 lights moving around box
1e8df00
@sasha240100
Merge pull request #170 from hirako2000/pointlight-example
ff91c88 
#166 - Adds point light example with 3 lights moving around box
@hirako2000
#166 - Adds normal map bitmap from alex, apply normalMap to the box
e852ccd
@sasha240100
Fix box textures
8530b72
@sasha240100
Make box look more realistic
5728f98
@sasha240100
Add ability to use wrap and mapping
43d0b05
@sasha240100
Add ability to "fix" texture
ef8268a
@sasha240100
Merge pull request #172 from WhitestormJS/#171
6685ed7 
#171 - Add ability to use other texture parameters inside TextureModule
@sasha240100
Make light spheres smoother
4d2011f
@sasha240100
Optimize lights/point example
c2404d0
@hirako2000
#166 - Adds SpotLight example
7c99a8f
@taro-0
Sets defaults to Ambient light
0c36165
@taro-0
Sets defaults to Area light
be07d36
@taro-0
Updates defaults for directional lights
131b3a3
@taro-0
Updates defaults for hemisphere light
edcd050
@taro-0
Updates defaults for spot light
7a13579
@taro-0
Updates defaults for point light
4ec4952
@taro-0
Removes defaults, light settings, from LightComponent
164542f
@taro-0
Merge branch '#166' of github.com:WhitestormJS/whitestorm.js into #166
3dc3da4
@sasha240100 sasha240100 self-requested a review March 14, 2017 06:39
sasha240100
sasha240100 requested changes Mar 14, 2017
View reviewed changes
Copy link
Member

@sasha240100 sasha240100 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@t4r0 It includes commits from #163 PR and tests fails on lights. Let's fix that

@sasha240100
Copy link
Member

@t4r0 Okay, the branch seems to exist before. Let me fix tests and i merge it

@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 50.204% when pulling 5b5223f on #166 into def95f4 on beta.

@sasha240100 sasha240100 merged commit 8e68d36 into beta Mar 14, 2017
@sasha240100 sasha240100 deleted the #166 branch March 14, 2017 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sasha240100 sasha240100 sasha240100 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@taro-0 @sasha240100 @coveralls @hirako2000