Skip to content

Commit

Permalink
Changed to version 0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffyStuff committed Dec 5, 2016
1 parent 060a940 commit da380d7
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 126 deletions.
55 changes: 1 addition & 54 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -618,57 +618,4 @@ an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".

You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
END OF TERMS AND CONDITIONS
54 changes: 8 additions & 46 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OTHER = -X -w -X -DGLEW_NO_GLU
O = -o bin/$(NAME)
DEBUG = -v --save-temps --enable-checking -g -X -ggdb -X -O0 -D DEBUG

all: debug
all: release

debug:
$(VALAC) $(O) $(DIRS) $(PKGS) $(VAPI) $(OTHER) $(DEBUG) -D LINUX
Expand All @@ -65,53 +65,15 @@ release:
macDebug:
$(VALAC) $(O) $(DIRS) $(PKGS) $(MAC) $(VAPI) $(OTHER) $(DEBUG) -D MAC

macRelease:
mac:
$(VALAC) $(O) $(DIRS) $(PKGS) $(MAC) $(VAPI) $(OTHER) -D MAC
-mkdir rsc/archive/$(NAME).app
-cp bin/$(NAME) rsc/archive/$(NAME).app/
-cp -r bin/Data rsc/archive/$(NAME).app/
-cp Icon.icns rsc/archive/$(NAME).app/
-cp rsc/other/Info.plist rsc/archive/$(NAME).app/
-zip -r rsc/archive/$(NAME).mac.zip rsc/archive/$(NAME).app

clean:
rm bin/$(NAME)
find . -type f -name '*.c' -exec rm {} +

WindowsDebug:
$(VALAC) $(O) $(DIRS) $(PKGS) $(WINDOWS) $(VAPI) $(OTHER) $(DEBUG)
winowsDebug:
$(VALAC) $(O) $(DIRS) $(PKGS) $(WINDOWS) $(VAPI) $(OTHER) $(DEBUG) -D WINDOWS

WindowsRelease:
windows:
$(VALAC) $(O) $(DIRS) $(PKGS) $(WINDOWS) $(VAPI) $(OTHER) -D WINDOWS -X -mwindows
-RCEDIT /I bin\$(NAME).exe Icon.ico

-robocopy bin rsc/archive/$(NAME) *.* /MIR
-robocopy rsc/dlls/main rsc/archive/$(NAME) *.*
-rm rsc/archive $(NAME).rar
-C:\Program Files\WinRAR\rar a -r0 rsc\archive\$(NAME).rar rsc\archive\$(NAME) -ep1

cleanWindowsDebug: cleanWindows

cleanWindowsRelease: cleanWindows

cleanWindows:
rm bin $(NAME).exe
rm ../Engine/Audio *.c
rm ../Engine/Files *.c
rm ../Engine/Helper *.c
rm ../Engine/Properties *.c
rm ../Engine/Rendering *.c
rm ../Engine/Rendering/OpenGLRenderer *.c
rm ../Engine/Window *.c
rm ../Engine/Window/Controls *.c
rm source *.c
rm source/Game *.c
rm source/Game/Logic *.c
rm source/Game/Rendering *.c
rm source/Game/Rendering/Menu *.c
rm source/GameServer *.c
rm source/GameServer/Bots *.c
rm source/GameServer/GameState *.c
rm source/GameServer/Server *.c
rm source/MainMenu *.c
rm source/MainMenu/Lobby *.c
clean:
rm bin/$(NAME)*
find . -type f -name '*.c' -exec rm {} +
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ gcc \
libgee-0.8-dev \
libglew-dev \
libpango1.0-dev \
libsoil-dev \
libsdl2-image-dev \
libsdl2-dev \
libcsfml-dev \
Expand All @@ -103,4 +102,4 @@ Build by running `cd OpenRiichi && make release`
## License

OpenRiichi is licensed under [GPLv3](https://www.gnu.org/licenses/quick-guide-gplv3.en.html).
Feel free to make any changes and submit a pull request.
Feel free to make any changes and submit a pull request.
Binary file added bin/Data/Textures/Menu/OpenRiichi.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 removed bin/Data/Textures/Menu/RiichiMahjong.png
Binary file not shown.
Binary file removed rsc/Icon.icns
Binary file not shown.
Binary file removed rsc/Icon.ico
Binary file not shown.
22 changes: 0 additions & 22 deletions rsc/Info.plist

This file was deleted.

2 changes: 1 addition & 1 deletion source/Environment.vala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public class Environment
{
private const int VERSION_MAJOR = 0;
private const int VERSION_MINOR = 1;
private const int VERSION_PATCH = 2;
private const int VERSION_PATCH = 3;
private const int VERSION_REVIS = 0;

public const int MIN_NAME_LENGTH = 2;
Expand Down
2 changes: 1 addition & 1 deletion source/MainMenu/MainMenuBackgroundView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MainMenuBackgroundView : View2D
tile_view.inner_anchor = Vec2(0, 0.5f);
tile_view.outer_anchor = Vec2(0, 0.5f);

text = new ImageControl("Menu/RiichiMahjong");
text = new ImageControl("Menu/OpenRiichi");
add_child(text);
text.inner_anchor = Vec2(0.5f, 1);
text.outer_anchor = Vec2(0.5f, 1);
Expand Down

0 comments on commit da380d7

Please sign in to comment.