Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
6cc52e1
Identified tasks
sandybisaria Oct 1, 2014
4a36a27
Done
sandybisaria Oct 5, 2014
a1680ce
Forgot to add the new image
sandybisaria Oct 5, 2014
ed02356
Small Bugfix
rfblue2 Oct 6, 2014
98e844b
Git problems fixed
rfblue2 Oct 6, 2014
c50617d
Merge branch 'exponent' into develop
himat Oct 16, 2014
37dc900
Created Login Menu
rfblue2 Nov 21, 2014
e8ce746
Multiplayer Lobby
nikhilJain17 Nov 29, 2014
181d6db
Undo Commit
rfblue2 Nov 29, 2014
ce2753e
Lobby
nikhilJain17 Dec 5, 2014
c73d661
Multiplayer menu changes
nikhilJain17 Dec 11, 2014
57156be
Multimenu Layout Changes
rfblue2 Dec 21, 2014
312a55a
Login Menu
Dec 23, 2014
5a847a7
Volume Button on Main Menu
sandybisaria Dec 24, 2014
ed40377
Login Menu Integration
rfblue2 Dec 27, 2014
8306a18
Added catch block for the filenotfound exception
himat Dec 29, 2014
9ccf00d
Automatic online users refresh thread
himat Dec 29, 2014
b499d2b
Integrated Practice Button into Multimenu
rfblue2 Dec 30, 2014
a798b7f
Merge remote-tracking branch 'origin/gui' into develop
rfblue2 Dec 30, 2014
4fe69e1
Fixed Merge Conflicts
rfblue2 Dec 30, 2014
e866ecd
Removed MathGame parameter from init functions
rfblue2 Dec 30, 2014
7261f65
Fixed user appearing multiple times in users list
himat Dec 30, 2014
62ef51b
Standardizing fonts p1
rfblue2 Dec 30, 2014
48febb2
Merge branch 'develop' of https://github.com/himat/Math-Game into dev…
rfblue2 Dec 30, 2014
d597ca3
Font Standardization p2 and Login GUI changes
rfblue2 Dec 30, 2014
a7665fe
More Login GUI changes
rfblue2 Dec 30, 2014
5d961ca
Standard Button Class + Other minor changes
rfblue2 Dec 30, 2014
e9fbbf4
Ultra high secure registration and passwords
himat Dec 30, 2014
d67b0cd
Added Cancel Register Button
rfblue2 Dec 31, 2014
8a1f26c
Added Access Specifiers (private/public)
rfblue2 Dec 31, 2014
f18f0cc
Standardized Type/Difficulty into TypeManager
rfblue2 Dec 31, 2014
d24abcb
Put cards into array
rfblue2 Dec 31, 2014
2265f3c
Minor Enum change
rfblue2 Dec 31, 2014
ca10495
Code & Documentation Tidying
sandybisaria Dec 31, 2014
2ecd78a
Phased out OptionMenu
rfblue2 Jan 1, 2015
c4da06b
Changed font back to Eurostile
rfblue2 Jan 1, 2015
8733972
New Graphics!
Akshitha Jan 4, 2015
5c933a4
Fixed hosting bug
rfblue2 Jan 4, 2015
86a1a2b
Temporarily changed font to Agency FB
rfblue2 Jan 4, 2015
488537c
menu background graphic chanages
rfblue2 Jan 15, 2015
8ebeeda
Button Graphics Changes
rfblue2 Jan 15, 2015
78df171
Font Changes
rfblue2 Jan 15, 2015
6d160a3
Added GameDialogFactory
rfblue2 Jan 16, 2015
bad45fb
Merge remote-tracking branch 'origin/develop' into dialogBoxes
rfblue2 Jan 16, 2015
257a2d9
Custom Message Dialogs Added
rfblue2 Jan 16, 2015
50c1911
Minor Changes including centering game
rfblue2 Jan 17, 2015
d0d7946
Added yes/no dialog
rfblue2 Jan 17, 2015
f7a8d37
Minor Code Cleanup
rfblue2 Jan 17, 2015
022a1af
Fixed Multiplayer Bug
rfblue2 Jan 18, 2015
736508b
Minor multiplayer changes
rfblue2 Jan 19, 2015
f99f347
Slight typemanager cleanup
rfblue2 Jan 19, 2015
9cffa88
Precisions 10^-10
rfblue2 Jan 19, 2015
abf2a08
Small rounding bug fix
rfblue2 Jan 19, 2015
80529bc
Turned actual value of card to double as opposed to string
rfblue2 Jan 19, 2015
1568c24
Changed card value generation algorithm
rfblue2 Jan 19, 2015
f260b80
Logarithm operations (+ - * /)
vivekjain1397 Jan 20, 2015
21329dc
Preparing for adding Exponents and Logs
rfblue2 Jan 20, 2015
9c379f1
Logarithm bug fixes
rfblue2 Jan 20, 2015
ae0dc79
fixed logs table
himat Jan 20, 2015
8cf0bad
Readying for mixed
rfblue2 Jan 20, 2015
a184068
Preliminary mixed functionality
rfblue2 Jan 20, 2015
04d965f
Tiny bug fix checks
rfblue2 Jan 20, 2015
c0a193b
Multiple choice Mixed
rfblue2 Jan 21, 2015
c68dc8c
fixed fraction generating bug
himat Jan 21, 2015
c230f04
Merge branch 'lognexp' into develop
himat Jan 21, 2015
e7ec811
Rounding Bug Fix
rfblue2 Feb 9, 2015
dc5baa5
Smart database connection checking
himat Feb 18, 2015
03bddd3
exponents excel sheet
himat Mar 22, 2015
8aea562
Offline Mode
rfblue2 Mar 22, 2015
c4ed2e5
possible card disappearing bug fix??
himat Mar 26, 2015
18c6f3d
added screenshots
himat Mar 31, 2015
912b0f1
Test to see if I can commit. Comment in move.java
Apr 23, 2015
a885ce3
commit for david
himat Apr 23, 2015
d4ef08f
Music and single player db
Mar 14, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file added MathGames Website/Thumbs.db
Binary file not shown.
Binary file modified MathGames Website/images/Thumbs.db
Binary file not shown.
73 changes: 73 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="MathGame" default="default" basedir=".">
<description>Builds, tests, and runs the project MathGame.</description>
<import file="nbproject/build-impl.xml"/>
<!--

There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:

-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products

(Targets beginning with '-' are not intended to be called on their own.)

Example of inserting an obfuscator after compilation could look like this:

<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>

For list of available properties check the imported
nbproject/build-impl.xml file.


Another way to customize the build is by overriding existing main targets.
The targets of interest are:

-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation

An example of overriding the target for project execution could look like this:

<target name="run" depends="MathGame-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>

Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.

-->
</project>
4 changes: 4 additions & 0 deletions build/built-jar.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Thu, 10 Mar 2016 13:28:45 -0500


C\:\\Users\\Zarir\ Hamza\\Documents\\NetBeansProjects\\Math-Game-develop\ -\ Copy=
Empty file.
Empty file.
10 changes: 10 additions & 0 deletions build/classes/MathGames UML 1.ucls
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.5" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
associations="true" dependencies="false" nesting-relationships="true">
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</classifier-display>
<association-display labels="true" multiplicity="true"/>
</class-diagram>
Binary file added build/classes/audio/button.wav
Binary file not shown.
Binary file added build/classes/audio/incorrect.wav
Binary file not shown.
Binary file added build/classes/audio/lose.wav
Binary file not shown.
Binary file added build/classes/audio/merge.wav
Binary file not shown.
Binary file added build/classes/audio/success.wav
Binary file not shown.
Binary file added build/classes/audio/wait.wav
Binary file not shown.
Binary file added build/classes/audio/win.wav
Binary file not shown.
Binary file added build/classes/com/mathgame/cardmanager/Move.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/database/SQLProject.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/math/Calculate.class
Binary file not shown.
Binary file added build/classes/com/mathgame/math/CompMover.class
Binary file not shown.
Binary file added build/classes/com/mathgame/math/MathGame$1.class
Binary file not shown.
Binary file added build/classes/com/mathgame/math/MathGame$2.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/math/MathGame.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/math/Window$1.class
Binary file not shown.
Binary file added build/classes/com/mathgame/math/Window$2.class
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/math/Window.class
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/HelpMenu.class
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/HostMenu$1.class
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/HostMenu.class
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/LoginMenu.class
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/MainMenu.class
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/MultiMenu$1.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/menus/MultiMenu.class
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/network/Game.class
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/network/User.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/panels/CardPanel.class
Binary file not shown.
Binary file added build/classes/com/mathgame/panels/HoldPanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/mathgame/panels/SidePanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added build/classes/images/CardBar.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 added build/classes/images/CardBar1.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 added build/classes/images/DefaultButtonImage1.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 added build/classes/images/DefaultButtonImage2.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 added build/classes/images/DefaultButtonImage3.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 added build/classes/images/MathGames UML 1.pdf
Binary file not shown.
Binary file added build/classes/images/Operation bar.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 added build/classes/images/Operation bar1.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 added build/classes/images/Screenshots/class1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/classes/images/Screenshots/class2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/classes/images/Screenshots/gameplay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/classes/images/Screenshots/login.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/classes/images/Screenshots/menu.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/classes/images/Thumbs.db
Binary file not shown.
Binary file added build/classes/images/Workspace.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 added build/classes/images/Workspace1.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 added build/classes/images/add.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 added build/classes/images/backMulti.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 added build/classes/images/backa.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 added build/classes/images/backb.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 added build/classes/images/background.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 added build/classes/images/background2.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 added build/classes/images/card holder.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 added build/classes/images/card holder1.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 added build/classes/images/control bar.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 added build/classes/images/control bar1.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 added build/classes/images/divide.png
Binary file added build/classes/images/enter.png
Binary file added build/classes/images/epsilon.png
Binary file added build/classes/images/exponent.png
Binary file added build/classes/images/multiply.png
Binary file added build/classes/images/mute.png
Binary file added build/classes/images/sound.png
Binary file added build/classes/images/subtract.png
File renamed without changes.
Binary file added build/classes/spreadsheets/Exponents.xlsx
Binary file not shown.
File renamed without changes.
File renamed without changes.
Binary file added build/classes/spreadsheets/Logarithms.xlsx
Binary file not shown.
Binary file added dist/MathGame.jar
Binary file not shown.
32 changes: 32 additions & 0 deletions dist/README.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
========================
BUILD OUTPUT DESCRIPTION
========================

When you build an Java application project that has a main class, the IDE
automatically copies all of the JAR
files on the projects classpath to your projects dist/lib folder. The IDE
also adds each of the JAR files to the Class-Path element in the application
JAR files manifest file (MANIFEST.MF).

To run the project from the command line, go to the dist folder and
type the following:

java -jar "MathGame.jar"

To distribute this project, zip up the dist folder (including the lib folder)
and distribute the ZIP file.

Notes:

* If two JAR files on the project classpath have the same name, only the first
JAR file is copied to the lib folder.
* Only JAR files are copied to the lib folder.
If the classpath contains other types of files or folders, these files (folders)
are not copied.
* If a library on the projects classpath also has a Class-Path element
specified in the manifest,the content of the Class-Path element has to be on
the projects runtime path.
* To set a main class in a standard Java project, right-click the project node
in the Projects window and choose Properties. Then click Run and enter the
class name in the Main Class field. Alternatively, you can manually type the
class name in the manifest Main-Class element.
12 changes: 12 additions & 0 deletions dist/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Math Game
=========

A math game Java GUI program made with Java Swing.

This program is meant to encourage learning math by presenting math problems in a fun and intuitive way.

----------------------------------------------------
Created by students at the Middlesex County Academy for Science, Mathematics, and Engineering Technologies
located in Edison, NJ

Visit the game at http://www.mcalearning.com/
Binary file added dist/dom4j-2.0.0-ALPHA-2.jar
Binary file not shown.
Binary file added dist/lib/dom4j-2.0.0-ALPHA-2.jar
Binary file not shown.
Binary file added dist/lib/mysql-connector-java-5.1.38-bin.jar
Binary file not shown.
Binary file added dist/lib/poi-3.9-20121203.jar
Binary file not shown.
Binary file added dist/lib/poi-ooxml-3.9-20121203.jar
Binary file not shown.
Binary file added dist/lib/poi-ooxml-schemas-3.9-20121203.jar
Binary file not shown.
Binary file added dist/lib/xbean.jar
Binary file not shown.
Binary file added dist/mysql-connector-java-5.1.38-bin.jar
Binary file not shown.
Binary file added dist/poi-3.9-20121203.jar
Binary file not shown.
Binary file added dist/poi-ooxml-3.9-20121203.jar
Binary file not shown.
Binary file added dist/poi-ooxml-schemas-3.9-20121203.jar
Binary file not shown.
Binary file added dist/servlet-api.jar
Binary file not shown.
1 change: 1 addition & 0 deletions dist/test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test
Binary file added dist/xbean.jar
Binary file not shown.
Binary file removed mysql-connector-java-5.1.22-bin.jar
Binary file not shown.
Binary file removed mysql-connector-java-5.1.23-bin.jar
Binary file not shown.
Binary file removed mysql-connector-java-5.1.26-bin.jar
Binary file not shown.
Binary file added mysql-connector-java-5.1.38-bin.jar
Binary file not shown.
Loading