0.16 "Nitrogen"

Merge pull request #108 from OpMonTeam/develop

Author: milkyroute

.gitignore

@@ -60,3 +60,9 @@ install_manifest.txt
 .#*
 config.hpp
 src/opmon/model/objects/AttackEffectsOld.txt
+.cproject
+.project
+OpMon.cbp
+CMakeLists.txt.user
+*.ninja
+.ninja_*

.travis.yml

@@ -1,4 +1,4 @@
-language: c++
+language: cpp
 sudo: false
 addons:
   apt:
@@ -12,21 +12,21 @@ addons:
     - libflac-dev
     - libvorbis-dev
     - libgtk-3-dev
+    - freeglut3-dev
     sources:
     - ubuntu-toolchain-r-test
-    - llvm-toolchain-trusty-5.0
 before_script:
 - git clone https://github.com/sfml/sfml && cd sfml
 - git checkout tags/2.5.0
-- mkdir build && cd build && cmake .. -G"$GENERATOR" $CMAKE_FLAGS
-- sudo cmake --build . --target install
+- mkdir build && cd build && cmake .. -G"$GENERATOR" $CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX=../install
+- cmake --build . --target install
 - cd ../..
 
 script:
 - mkdir build && cd build
-- cmake .. -DCMAKE_BUILD_TYPE=Release -G"$GENERATOR" $CMAKE_FLAGS
-- sudo cmake --build . --target install --config Release
-- sudo cmake --build . --target package --config Release
+- cmake .. -DCMAKE_BUILD_TYPE=Release -G"$GENERATOR" $CMAKE_FLAGS -DSFML_ROOT=../sfml/install -DCMAKE_INSTALL_PREFIX=../install
+- cmake --build . --target install --config Release
+- cmake --build . --target package --config Release
 
 matrix:
   fast_finish: true
@@ -47,7 +47,11 @@ matrix:
     osx_image: xcode9
     env:
     - GENERATOR="Xcode"
-    - CMAKE_FLAGS="-DSFML_BUILD_FRAMEWORKS=TRUE"
+    - CMAKE_FLAGS="-DSFML_BUILD_FRAMEWORKS=TRUE -DSFML_MISC_INSTALL_PREFIX=../install -DSFML_DEPENDENCIES_INSTALL_PREFIX=../install"
+  - os: windows
+    env:
+    - GENERATOR="Visual Studio 15 2017 Win64"
+    - CMAKE_FLAGS=""
 
 before_install:
     - eval "${MATRIX_EVAL}"

CMakeLists.txt

@@ -8,7 +8,7 @@ set(OPMON_VERSION_MAJOR 0)
 set(OPMON_VERSION_MINOR 15)
 set(OPMON_VERSION_PATCH 1)
 
-set(OPMON_CONTACT "Cyrion <jlppcprog@ntymail.com>")
+set(OPMON_CONTACT "Cyrielle <jlppcprog@ntymail.com>")
 set(OPMON_DESCRIPTION_SUMMARY "An open source RPG monster fighting game")
 set(OPMON_HOMEPAGE "http://opmon-game.ga/")
 
@@ -86,16 +86,22 @@ endif()
 
 # Note: the executable must be declared before adding libraries
 if (APPLE)
+    # Need Cocoa framework for Obj-C code
+    find_library(COCOA_LIBRARY Cocoa)
+
     # On Apple, Create an app bundle, which includes all the game resources and dependencies
-    set_source_files_properties( ${CMAKE_SOURCE_DIR}/Resources/Other/opmon_icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
+    set_source_files_properties( ${CMAKE_SOURCE_DIR}/icons/opmon_icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
     set_source_files_properties( ${CMAKE_SOURCE_DIR}/data PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
 
     # Need some extra code to get the correct Resource folder in an app bundle
     list(APPEND SOURCE_FILES src/utils/ResourcePath.hpp src/utils/ResourcePath.mm)
     add_executable(${EXECUTABLE_NAME} MACOSX_BUNDLE ${SOURCE_FILES}
-    ${CMAKE_SOURCE_DIR}/Resources/Other/opmon_icon.icns
+    ${CMAKE_SOURCE_DIR}/icons/opmon_icon.icns
     ${CMAKE_SOURCE_DIR}/data)
 
+    # Add Cocoa framework to executable bundle
+    target_link_libraries(${EXECUTABLE_NAME} ${COCOA_LIBRARY})
+
     # Set the icon
     set_target_properties( ${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE opmon_icon.icns )
 

Credits.md

@@ -1,11 +1,12 @@
 # Project credits
-## Programmer, project creator : Cyrion
+## Programmer, project creator : Cyriel
 ## Game and graphics designer, project co-creator : Navet56
-## Collaborators since the very beginning : Aerzia
+## Collaborators since the very beginning : 
 
 ## OpFriends (People who helped the project a lot. Big thanks to them!) : 
 <li><h3>BAKFR</h3></li>
 <li><h3>gberthou (aka BarkomVarjeFura on Discord)</h3></li>
+<li><h3>Aerzia (old big contributor who left the project)</h3></li>
 </ul>
 
 ## Contributors : 
@@ -29,6 +30,10 @@
 <li><h3>torq</h3></li>
 <li><h3>JonnyPtn</h3></li>
 <li><h3>Bobor</h3></li>
+<li><h3>Qwam</h3></li>
+ <li><h3>Reuun</h3></li>
+ <li><h3>sergioag</h3></li>
+ <li><h3>CxxSpren</h3></li>
 </ul>
 
 ## Inspirations :
@@ -41,8 +46,7 @@
 <ul>
 <li><h3>GlueBie</h3></li>
 <li><h3>Lebordelic</h3></li>
-<li><h3>Sythos</h3></li>
-<li><h3><a href="http://osaris.net/">Osaris</a></h3></li>
+<li><h3><a href="http://osaris.net/">Osaris</a> (one of the people who launched Cyriel into programmation)</h3></li>
 <li><h3>Our families, friends, and everyone who taught us what we know today!</h3></li>
 <li><h4>And many others...</h4></li>
 </ul>
@@ -54,6 +58,7 @@
 * Navet56
 * Aerzia
 * Silvermoon
+* Qwam
 
 ### Others
-Look [here](https://github.com/jlppc/OpMon/blob/master/Resources/README.md).
+Look [here](https://github.com/OpMonTeam/OpMon-Data/blob/master/Resources/README.md).

LICENSE.md

@@ -1,6 +1,6 @@
 <h2>OPMon Lazuli is free software, you can read, modify, redistribute or fork this project if you add this license at your fork.</h2>
 
-The original graphic creations of OPMon are not under this license, but visible here: <a href="https://raw.githubusercontent.com/jlppc/OpMon/master/Resources/LICENSE">Art's License</a>
+The original graphic creations of OPMon are not under this license, but visible here: <a href="https://raw.githubusercontent.com/OpMonTeam/OpMon-Data/master/Resources/LICENSE">Art's License</a>
 <br><br>
 The license is <h3>GNU GPL V3</h3>
 

README.md

@@ -1,4 +1,4 @@
-![Regimys LOGO](https://raw.githubusercontent.com/cyrioncentori/OpMon/master/Resources/Other/opmon_title.png)<br>
+![Regimys LOGO](https://raw.githubusercontent.com/OpMonTeam/OpMon-Data/master/Resources/Other/opmon_title.png)<br>
 
 [Voir En Français](#enfrancais)
 
@@ -8,15 +8,16 @@ OPMon is a Pokémon-inspired game project imagined in 2012 and started in septem
 
 ### Links
 * [Opmon Lazuli's website](http://opmon-game.ga)
-* [Development news](https://translate.google.com/translate?act=url&depth=1&hl=fr&ie=UTF8&prev=_t&rurl=translate.google.fr&sl=fr&sp=nmt4&tl=en&u=https://github.com/cyrioncentori/OpMon/wiki/Journal-du-d%25C3%25A9veloppement)
-* [Monthly Reports](https://github.com/cyrioncentori/OpMon/wiki/Monthly-reports)
-* [Credits](https://github.com/cyrioncentori/OpMon/blob/master/Credits.md)
-* [Github repo for the game website, opmon-game.ga](https://github.com/cyrioncentori/Site-OpMon)
+* [Development news](https://translate.google.com/translate?act=url&depth=1&hl=fr&ie=UTF8&prev=_t&rurl=translate.google.fr&sl=fr&sp=nmt4&tl=en&u=https://github.com/OpMonTeam/OpMon/wiki/Journal-du-d%25C3%25A9veloppement)
+* [Monthly Reports](https://github.com/OpMonTeam/OpMon/wiki/Monthly-reports)
+* [Credits](https://github.com/OpMonTeam/OpMon/blob/master/Credits.md)
+* [Github repo for the game website, opmon-game.ga](https://github.com/OpMonTeam/OpMon-Website)
 * [Documentation](http://opmon-game.ga/pages/doc)
 
 ### Build
 
-![Build](https://api.travis-ci.org/OpMonTeam/OpMon.svg?branch=master)
+Master (Last stable build) : ![Build](https://api.travis-ci.org/OpMonTeam/OpMon.svg?branch=master)  
+Develop (Development branch) : ![Build](https://api.travis-ci.org/OpMonTeam/OpMon.svg?branch=develop)
 
 The build system use *cmake*.
 Command for GNU/Linux systems :
@@ -27,14 +28,14 @@ make
 sudo make install   # install the game into your system
 make package        # generate both .deb package and .tar.gz package
 ```
-You can see the dependancies for GNU/Linux systems [here](https://github.com/cyrioncentori/OpMon/wiki/Dependencies).
+You can see the dependancies for GNU/Linux systems [here](https://github.com/OpMonTeam/OpMon/wiki/Dependencies).
 If you want to play to the game quickly, use build-and-run.sh. The game will be built in bin/Release, and the data will be pasted in this repertory. The game will launch after building.<br/>
 If you don't use build-and-run.sh, don't forget to copy the data folder in the game's folder or use `sudo make install` if you are on linux.
-If you want to compile OPMon from A to Z for Windows, Mac OS or other, it's [here](https://github.com/cyrioncentori/OpMon/wiki/Compilation)
+If you want to compile OPMon from A to Z for Windows, Mac OS or other, it's [here](https://github.com/OpMonTeam/OpMon/wiki/Compilation)
 ### Contact Us
 * jlppcprog@ntymail.com for bugs, lags or about the code
 * evandib@gmail.com for sprites, the graphics, design or graphics bugs
-* [Discord server](https://discord.gg/XwyKFzh)
+* [Discord server](https://discord.gg/mvS67qu)
 * IRC channel on Freenode : #OpMon
 <br>
 English is not our native language, but we do our best! If you see some errors, don't hesitate to tell us, so we won't make them again!
@@ -45,8 +46,8 @@ __The current game version is Alpha 0.15.1__ Download link: <a
 href="http://opmon-game.ga/downloads"><img src="https://img.shields.io/badge/download-v0.15.1-red.svg" alt="Download Link"></a>
 
 __The next game version will be Alpha 0.16__: Fight system update and OpMons improvements
-* [Look the ROADMAP](https://github.com/cyrioncentori/OpMon/wiki/ROADMAP)
-* [Look the Releases changelog](https://github.com/cyrioncentori/OpMon/wiki/Releases)
+* [Look the ROADMAP](https://github.com/OpMonTeam/OpMon/wiki/ROADMAP)
+* [Look the Releases changelog](https://github.com/OpMonTeam/OpMon/wiki/Releases)
 
 ### Controls
 
@@ -59,18 +60,18 @@ See the controls of the game OpMon [here](http://opmon-game.ga/controls.html)
 
 <br/>
 
-* [Journal de développement](https://github.com/cyrioncentori/OpMon/wiki/Journal-du-développement)
-* [Bilans mensuels, récapitulatifs des nouveautés (en anglais)](https://github.com/cyrioncentori/OpMon/wiki/Monthly-reports)
+* [Journal de développement](https://github.com/OpMonTeam/OpMon/wiki/Journal-du-développement)
+* [Bilans mensuels, récapitulatifs des nouveautés (en anglais)](https://github.com/OpMonTeam/OpMon/wiki/Monthly-reports)
 * [Site web du jeu](http://opmon-game.ga)
-* [Dépot du site web](https://github.com/cyrioncentori/Site-OpMon)
-* [Crédits](https://github.com/cyrioncentori/OpMon/blob/master/Credits.md)
+* [Dépot du site web](https://github.com/OpMonTeam/OpMon-Website)
+* [Crédits](https://github.com/OpMonTeam/OpMon/blob/master/Credits.md)
 
 <br/>Version du jeu : Alpha 0.15.1 | Téléchargement : <a 
 href="http://opmon-game.ga"><img src="https://img.shields.io/badge/download-v0.15.1-red.svg" alt="Logo Téléchargement"></a><br/><br/>
 
 ### Prochaines versions :
-* Alpha 0.16 : Amelioration du système de combat et ameliorations des OpMOns et de leurs stats
-* [Voir la RoadMap](https://github.com/cyrioncentori/OpMon/wiki/ROADMAP)
+* Alpha 0.16 : Amelioration du système de combat et ameliorations des OpMons et de leurs stats
+* [Voir la RoadMap](https://github.com/OpMonTeam/OpMon/wiki/ROADMAP)
 
 <br/>
 
@@ -81,7 +82,7 @@ Ce jeu est totalement open-source, ce qui permet aux gens de venir réaliser leu
 Vous pouvez ajouter des OpMons, des attaques, des items, et autres! 
 Vous n'avez qu'à nous proposer vos modifications et nous les ajouterons peut-être au jeu. 
 Si vous nous proposez beaucoup de bonnes modifications, et qu'elles sont acceptées, vous deviendrez peut-être collaborateur!<br/>
-Nous sommes plusieurs sur le projet : Cyrion, le programmeur et créateur de l'histoire et des personnages ; Navet56, le graphiste et correcteur ; et d'autres contributeurs, comme Imperator Dei, qui a corrigé les fautes d'orthographe sur la version française,  merci à eux !<br/>
+Nous sommes plusieurs sur le projet : Cyriel, le programmeur et créateur de l'histoire et des personnages ; Navet56, le graphiste et correcteur ; et d'autres contributeurs, comme Imperator Dei, qui a corrigé les fautes d'orthographe sur la version française,  merci à eux !<br/>
 Contacts : jlppcprog@ntymail.com pour la programmation | evandib@gmail.com pour les graphismes<br/>
 Si vous avez des questions à poser, n'hésitez pas à les demander dans la section F.A.Q. du wiki ou à nous contacter par mail!<br/>
 
@@ -102,13 +103,13 @@ make package        # génère deux paquets: un fichier générique .tar.gz et u
 
 Vous pouvez aussi utiliser le build-and-run.sh pour compiler et jouer au jeu rapidement. Le jeu se trouvera alors dans le dossier bin/Release, avec le dossier data copié dedans. Il se lancera dès la fin de la compilation.<br/>
 Si vous n'utilisez pas le `build-and-run.sh`, n'oubliez pas de copier le dossier data dans le dossier du jeu, ou de faire `sudo make install` si vous êtes sous linux !
-Si vous voulez compiler de A à Z OpMon pour Windows, Mac OS ou autres, c'est [ici](https://github.com/cyrioncentori/OpMon/wiki/Compilation)(en anglais)
+Si vous voulez compiler de A à Z OpMon pour Windows, Mac OS ou autres, c'est [ici](https://github.com/OpMonTeam/OpMon/wiki/Compilation)(en anglais)
 ## Changelog des versions
-[Voir le changelog de toutes les versions du jeu](http://github.com/cyrioncentori/OpMon/wiki/Releases)
+[Voir le changelog de toutes les versions du jeu](http://github.com/OpMonTeam/OpMon/wiki/Releases)
 <br/>
 
 ## Screenshot : 
 
-![Screenshot](https://raw.githubusercontent.com/cyrioncentori/OpMon/master/Resources/Other/screenshot_2.png)
+![Screenshot](https://raw.githubusercontent.com/OpMonTeam/OpMon-Data/master/Resources/Other/screenshot_2.png)