forked from OpenDungeons/OpenDungeons
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MEDIA: Merged addition of working media files.
The media/ files are overall only 28.5Mb which is not a sufficient reason IMHO to not track these here. - Changed the .gitignore file to now keep track of media files changes. - Added the media files within the dev repository. - Adding Beetle Golem, Ruin Entrance and Wooden Watch Tower models (OGA conversions) - Imported latest changes from opendungeons-media. - CEGUI XML updated to 0.8 format - Updated XML files for CEGUI 0.8.x - GLSL scripts : texture(1D\2D\3D\Cube) -> texture - UnifiedMinArea -> MinArea fixed - Fixed old set: image: nomenclature in the looknfeel - Changed type of SGXLib_FetchNormal - Added New Skorpio Tileset files needed for a full gaming experience. - Fixed the OpenDungeons GUI imageset offsets for CEGUI 0.8. - I also added the CEED project files. - Changed the OpenDungeons to the one of the website. - Added licenses and credits files - Added missing licensing info the main menu Gui graphics. - Added the app windows icon file. There os no code change are icon on windows should be handled through resource file. Unfortunately, resources files are disabled under MSVC 2012 express. So I only added the icon for a possible future installer and to have a icon reference anyway. - Update of the Orc mesh & skeleton by Skorpio. - Forgot to remove the (a|b) in certain post-fixes models. - Fixed most of the material files, keeping the link to the general.material file. - Fixed the Adventurer texture format to be homogenous. - Fixed the Orc material names with Skorpio's help. - Fixed the Kobold material name based on Ogre debug log. - Upgraded the Editor toolbox CEGUI layout to version 4. - Actually fixed the editor toolbox this time. - (Re) add the new main menu CEGui files now that conflicts are resolved. - Reapplied the correct level file now that conflicts are resolved. - Added latest models from Skorpio. - Fixed Adventurer model from Skorpio. - Polished the in-game gui a bit. - Added missing OgreCore.zip file needed for windows. - Level and new creatures updates. - Added new editor mode layout file. The code needs to be adapted though. - Editor menu upgrade. - Added new claimed tile button in editor gui. - Updated the level file to changes in next commit. - Test level + new creature def file adapted for next commit. - Level change du to next commit. - Test Level file with absolute coordinates. - Added new test level. - Adapted the level files to latest changes. - Adapted creatures.def to new format in next commit. - Adapted the creatures.def file to support absolute max HP/Mana. - Adapted the level to new Keeper AI - Added a third Keeper AI to the test level. - Update the creatures.def file for the new node scale. - Changed the culprit mesh file not shown in game for one fitting. - Added new in-game music. - Forgot to make the Wyvern and the Pit Demon flyable creatures. - Fixed the player starting position. - Added creatures level info in the level files.
- Loading branch information
Yohann Ferreira
committed
Jun 30, 2014
1 parent
6a4771e
commit cb29cc1
Showing
639 changed files
with
27,737 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
Training pole: CC-BY-SA p0ss http://opengameart.org/content/wooden-training-pole | ||
Training dummy: CC-BY-SA p0ss http://opengameart.org/content/leather-training-dummy | ||
|
||
-- | ||
|
||
Pal Zoltan Illes - OpenDungeons - MAIN THEME 01 - start.flac | ||
Pal Zoltan Illes - OpenDungeons - MAIN THEME 02 - loop.flac | ||
Pal Zoltan Illes - OpenDungeons - MAIN THEME 03 - end.flac | ||
Pal Zoltan Illes - OpenDungeons - maintheme.flac | ||
|
||
CC-BY-SA 3.0 unported- Pal Zoltan Illes - http://www.illespalzoltan.com | ||
|
||
music/yd_Searching_ingame.ogg | ||
CC0 yd - http://opengameart.org/content/searching | ||
|
||
-- | ||
|
||
Reiner Flassig - Obsidian photo source - CC-by-sa/de 2.0 - http://de.wikipedia.org/w/index.php?title=Datei:Obsi.jpg&filetimestamp=20070905143430 | ||
|
||
-- | ||
|
||
Clint Bellanger "pfunked" - Bed - CC0 - http://opengameart.org/content/bed-low-poly | ||
|
||
-- | ||
|
||
Surt - Knight, Kobold - CC0 - http://opengameart.org/forumtopic/cc0-scraps | ||
|
||
-- | ||
|
||
riidom - Ghoul, Forge | ||
Andrew Buck | ||
Svenskmand | ||
Danimal - Adventurer, concept art - CC-BY-SA 3.0 | ||
StefanP.MUC (GUI) | ||
Oln | ||
paul424 | ||
Skorpio | ||
|
||
http://www.burningwell.org/ - Titus Tscharntke - photo sources for textures - Public Domain | ||
|
||
matthew.pablo - Theme of Com-Mecha (currently renamed - replacementmusic.ogg) - CC-BY 3.0 - http://opengameart.org/content/theme-of-com-mecha | ||
|
||
MODELS: | ||
|
||
Adventurer Danimal CC-BY-SA 3.0 | ||
Axe Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Bed Clint Bellanger CC0 | ||
big_wood_barrel Nobiax/yughues CC0 | ||
Cannon Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Cannonball Andrew Buck CC-BY-SA 3.0 | ||
Chair Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Claimed Walls Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Con_worker Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Cre_vision_indicator Andrew Buck CC-BY-SA 3.0 | ||
DigSelector Andrew Buck CC-BY-SA 3.0 | ||
Dirt Walls Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Dojo p0ss CC-BY-SA 3.0 | ||
DojoRockObject p0ss CC-BY-SA 3.0 | ||
Dragon Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
DungeonTemple Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Dwarf1 Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Dwarf2 Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Fire Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Forge riidom | ||
Gnome Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Goblin Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Goldnugget Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Gold Walls Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Keeperhand Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Knight surt CC0 | ||
Kobold surt CC0 | ||
Kreatur Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Lava Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Lizardman Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Longsword Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
mini_wood_barrel Nobiax/yughues CC0 | ||
Orc Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Pit Demon Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Portal Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Quarters Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Rock Walls Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Round Shield Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Sabre Andrew Buck CC-BY-SA 3.0 | ||
Shield_small Danimal CC-BY-SA 3.0 | ||
Shortsword Danimal CC-BY-SA 3.0 | ||
Spider Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Staff Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Stool Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Table Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Tentacle1+2 Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Torch Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Training Dummy p0ss CC-BY-SA 3.0 | ||
Training Pole p0ss CC-BY-SA 3.0 | ||
Treasury Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Troll Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Water Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Wizard Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
Wyvern Andrew Buck, Skorpio CC-BY-SA 3.0, GPL 3.0 | ||
|
||
SOUNDS: | ||
|
||
Svenskmand CC-BY-SA 3.0 | ||
|
||
GUI: | ||
|
||
Main menu background Vagner CC by 3.0 http://opengameart.org/content/mammon-angel-of-darkness | ||
Main menu buttons StumpyStrust CC by 3.0 http://opengameart.org/content/fantasy-ui-box |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project CEGUIDefaultResolution="1024x768" CEGUIVersion="1.0" baseDirectory="." fontsPath="." imagesetsPath="." layoutsPath="." looknfeelsPath="." schemesPath="." version="CEED Project 1" xmlSchemasPath="schemas"> | ||
<Items /> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<Imageset autoScaled="false" imagefile="ODBackgrounds.png" name="ODBackgrounds" nativeHorzRes="800" nativeVertRes="600" version="2"> | ||
|
||
<Image height="120" name="Background1" width="1240" xPos="3" yPos="11" /> | ||
</Imageset> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<Imageset autoScaled="false" imagefile="ODLogo.png" name="ODLogo" nativeHorzRes="800" nativeVertRes="600" version="2"> | ||
<Image height="150" name="Logo" width="766" xPos="7" yPos="9" /> | ||
</Imageset> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<Imageset autoScaled="true" imagefile="ODMainMenuBackground.png" name="ODMainMenuBackground" nativeHorzRes="800" nativeVertRes="600" version="2"> | ||
<Image height="600" name="MainMenuBackground" width="800" xPos="0" yPos="0" /> | ||
</Imageset> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<Imageset autoScaled="" imagefile="ODMainMenuButtons.png" name="ODMainMenuButton" nativeHorzRes="800" nativeVertRes="600" version="2"> | ||
<Image height="48" name="ButtonCenterNormal" width="50" xPos="39" yPos="40" /> | ||
<Image height="40" name="ButtonNormalUpLeft" width="39" xPos="0" yPos="0" /> | ||
<Image height="40" name="ButtonNormalDownLeft" width="39" xPos="0" yPos="88" /> | ||
<Image height="40" name="ButtonNormalDownRight" width="39" xPos="89" yPos="88" /> | ||
<Image height="40" name="ButtonNormalUpRight" width="39" xPos="89" yPos="0" /> | ||
<Image height="40" name="ButtonNormalUp" width="50" xPos="39" yPos="0" /> | ||
<Image height="40" name="ButtonNormalDown" width="50" xPos="39" yPos="88" /> | ||
<Image height="48" name="ButtonNormalLeft" width="39" xPos="0" yPos="40" /> | ||
<Image height="48" name="ButtonNormalRight" width="39" xPos="89" yPos="40" /> | ||
<Image height="40" name="ButtonHoverUpLeft" width="39" xPos="0" yPos="128" /> | ||
<Image height="40" name="ButtonHoverUp" width="50" xPos="39" yPos="128" /> | ||
<Image height="40" name="ButtonHoverUpRight" width="39" xPos="89" yPos="128" /> | ||
<Image height="48" name="ButtonCenterHover" width="50" xPos="39" yPos="168" /> | ||
<Image height="48" name="ButtonHoverLeft" width="39" xPos="0" yPos="168" /> | ||
<Image height="48" name="ButtonHoverRight" width="39" xPos="89" yPos="168" /> | ||
<Image height="40" name="ButtonHoverDownLeft" width="39" xPos="0" yPos="216" /> | ||
<Image height="40" name="ButtonHoverDown" width="50" xPos="39" yPos="216" /> | ||
<Image height="40" name="ButtonHoverDownRight" width="39" xPos="89" yPos="216" /> | ||
<Image height="40" name="ButtonPushedUpLeft" width="39" xPos="0" yPos="256" /> | ||
<Image height="40" name="ButtonPushedUp" width="50" xPos="39" yPos="256" /> | ||
<Image height="40" name="ButtonPushedUpRight" width="39" xPos="89" yPos="256" /> | ||
<Image height="48" name="ButtonCenterPushed" width="50" xPos="39" yPos="296" /> | ||
<Image height="48" name="ButtonPushedLeft" width="39" xPos="0" yPos="296" /> | ||
<Image height="48" name="ButtonPushedRight" width="39" xPos="89" yPos="296" /> | ||
<Image height="40" name="ButtonPushedDownLeft" width="39" xPos="0" yPos="344" /> | ||
<Image height="40" name="ButtonPushedDown" width="50" xPos="39" yPos="344" /> | ||
<Image height="40" name="ButtonPushedDownRight" width="39" xPos="89" yPos="344" /> | ||
</Imageset> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.