Skip to content

Commit

Permalink
Added new portal model.
Browse files Browse the repository at this point in the history
I also fixed Scream in the Dark for the portal positions.
The other maps weren't concerned AFAICT.

Part of OpenDungeons#323 for 0.4.9
  • Loading branch information
Yohann Ferreira committed Nov 25, 2014
1 parent 8f5f24a commit cc978e9
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 64 deletions.
12 changes: 5 additions & 7 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file is listing each files present in this repository, its author and its c
Each corresponding license is fully described in the licenses/ folder.
Other text files (.txt, .cpp, .h., ...), except licensing, are licensed using the GPL 3.0 license.

Latest update: 2014/11/20
Latest update: 2014/11/25

=============================
== Configuration: config/ ==
Expand Down Expand Up @@ -37,19 +37,15 @@ ODMainMenuBackground.png Vagner CC-BY-SA 3.0
ODMainMenuButtons.imageset Bertram GPL 3.0
ODMainMenuButtons.png StumpyStrust CC-BY-SA 3.0 http://opengameart.org/content/fantasy-ui-box
ogrefonts.fontdef OD Team GPL 3.0
OpenDungeonsGameModeMenu.layout OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
OpenDungeons.looknfeel OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
OpenDungeonsEditorMenu.layout OD Team GPL 3.0
OpenDungeonsIcons.imageset OD Team GPL 3.0
OpenDungeonsIcons.png OD Team CC-BY-SA 3.0
OpenDungeonsMainMenu.layout Bertram GPL 3.0
OpenDungeonsMenuMultiplayer.layout hwoarangmy GPL 3.0
OpenDungeonsMenuSkirmish.layout hwoarangmy GPL 3.0
OpenDungeonsOldSkin.imageset OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
OpenDungeonsOldSkin.png OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
OpenDungeonsSkin.imageset OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
OpenDungeonsSkin.png Bertram, StumpyStrust CC-BY-SA 3.0 Own made GUI based on: http://opengameart.org/content/fantasy-ui-box
OpenDungeonsSkin.scheme OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
*.layout OD Team MIT CEGUI files based on the TaharezLook gui sample - http://cegui.org.uk

schemas/
-> Animation.xsd OD Team MIT CEGUI file based on the TaharezLook gui sample - http://cegui.org.uk
Expand Down Expand Up @@ -113,6 +109,7 @@ textures/
-> LizardmanBed.png Nobiax, public domain CC0 http://forum.freegamedev.net/viewtopic.php?p=60197#p60197
-> Obsidian.png Reiner Flassig CC-BY-SA/DE 2.0 Obsidian photo source - http://de.wikipedia.org/w/index.php?title=Datei:Obsi.jpg&filetimestamp=20070905143430
-> OrcBed.png Bart, p0ss CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=60191#p60191
-> Portal.png Yughues CC0 http://opengameart.org/users/yughues
-> RangerBed.png PantherOne CC0 http://opengameart.org/content/tent-pack
-> slimeDiffuse.png Grefuntor CC-BY 3.0, CC-BY-SA 3.0, GPL 2.0+ - http://opengameart.org/content/slime-mold
-> SmallSpider.png Skorpio CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=60887#p60851
Expand Down Expand Up @@ -194,7 +191,8 @@ Orc.* Skorpio CC-BY-SA 3.0, GPL
OrcBed.mesh Eugeneloza CC0 http://forum.freegamedev.net/viewtopic.php?p=60191#p60191
Pit_demon.* Skorpio CC-BY-SA 3.0, GPL 3.0
Podium.mesh DM3d CC-BY-SA 3.0, GPL 3.0 http://opengameart.org/content/podium
Portal* Skorpio CC-BY-SA 3.0, GPL 3.0
PortalObject.* Danimal CC-BY-SA 3.0 http://forum.freegamedev.net/viewtopic.php?p=60904#p60904
Portal.* Skorpio CC-BY-SA 3.0
RangerBed.mesh PantherOne CC0 http://opengameart.org/content/tent-pack
Rock* Skorpio CC-BY-SA 3.0, GPL 3.0
RoundShield.mesh Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0
Expand Down
43 changes: 35 additions & 8 deletions levels/skirmish/Scream in the Dark.level
Original file line number Diff line number Diff line change
Expand Up @@ -4558,10 +4558,16 @@ ProtectDungeonTemple NULL
6 5
[/Room]
[Room]
4 1 3
4 1 9
4 18
5 18
6 18
4 19
5 19
6 19
4 20
5 20
6 20
[/Room]
[Room]
6 2 20
Expand Down Expand Up @@ -4643,10 +4649,16 @@ ProtectDungeonTemple NULL
91 22
[/Room]
[Room]
4 2 3
4 2 9
89 13
90 13
91 13
89 14
90 14
91 14
89 15
90 15
91 15
[/Room]
[Room]
3 2 16
Expand Down Expand Up @@ -4829,10 +4841,16 @@ ProtectDungeonTemple NULL
20 86
[/Room]
[Room]
4 3 3
4 3 9
11 93
12 93
13 93
11 94
12 94
13 94
11 95
12 95
13 95
[/Room]
[Room]
3 3 16
Expand Down Expand Up @@ -5001,7 +5019,10 @@ ProtectDungeonTemple NULL
95 93
[/Room]
[Room]
4 4 3
4 4 6
87 92
88 92
89 92
87 93
88 93
89 93
Expand Down Expand Up @@ -5138,15 +5159,15 @@ ProtectDungeonTemple NULL
[/Room]
[Room]
1 5 9
42 55
42 56
42 57
43 55
42 58
43 56
43 57
44 55
43 58
44 56
44 57
44 58
[/Room]
[Room]
8 5 28
Expand Down Expand Up @@ -5218,10 +5239,16 @@ ProtectDungeonTemple NULL
38 63
[/Room]
[Room]
4 5 3
4 5 9
42 53
43 53
44 53
42 54
43 54
44 54
42 55
43 55
44 55
[/Room]
[Room]
3 5 10
Expand Down
88 changes: 39 additions & 49 deletions materials/scripts/Portal.material
Original file line number Diff line number Diff line change
@@ -1,52 +1,42 @@
// Portal genrated by blender2ogre 0.6.0

material Portal
{
receive_shadows on
technique
{
pass
{
ambient 0.00000 0.00000 0.00000 1.000000
diffuse 0.7 0.7 0.7 1.000000
specular 0.000000 0.000000 0.000000 1.000000 12.500000
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
texture Obsidian.png
tex_address_mode wrap
filtering trilinear
colour_op alpha_blend
}
texture_unit
{
texture buvneurt_env5.png
colour_op_ex blend_manual src_texture src_current 0.3
env_map spherical
}
}
}
}
material Portalvortex/TWOSIDE
{
receive_shadows on
technique
{
pass
{
ambient 0.00000 0.00000 0.00000 1.000000
diffuse 0.640000 0.640000 0.640000 1.000000
specular 0.500000 0.500000 0.500000 1.000000 12.500000
emissive 1.0 1.0 1.0 1.000000
scene_blend alpha_blend
depth_write off
cull_hardware none
cull_software none
texture_unit
{
texture Portalvortex.png
tex_address_mode wrap
filtering trilinear
colour_op alpha_blend
}
}
}
receive_shadows on

technique
{
pass Portal
{
ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
diffuse 0.800000011920929 0.800000011920929 0.800000011920929 1.0
specular 0.08169934153556824 0.08169934153556824 0.08169934153556824 1.0 37.25
emissive 0.0 0.0 0.0 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
lighting on
normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
transparent_sorting on

texture_unit
{
texture Portal.png
tex_address_mode wrap
scale 1.0 1.0
colour_op modulate
}
}
}
}
27 changes: 27 additions & 0 deletions materials/scripts/Portalvortex.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Portalvortex genrated by blender2ogre 0.6.0

material Portalvortex
{
receive_shadows on
technique
{
pass
{
ambient 0.00000 0.00000 0.00000 1.000000
diffuse 0.640000 0.640000 0.640000 1.000000
specular 0.500000 0.500000 0.500000 1.000000 12.500000
emissive 1.0 1.0 1.0 1.000000
scene_blend alpha_blend
depth_write off
cull_hardware none
cull_software none
texture_unit
{
texture Portalvortex.png
tex_address_mode wrap
filtering trilinear
colour_op alpha_blend
}
}
}
}
Binary file added materials/textures/Portal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified models/PortalObject.mesh
Binary file not shown.
Binary file modified models/PortalObject.skeleton
Binary file not shown.

0 comments on commit cc978e9

Please sign in to comment.