wfolsom/cs8803p4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72 Commits 1 Branch 0 Tags
e0f42531e758263c5bcdc46ccc6bd0b550948115
Commit Graph

72 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Woody Folsom
e0f42531e7 Replaced having 1 MouseListener per Tile JLabel which a single listener which asks the event's associated component for its row, column. 
This isn't ideal, but is preferable to putting this information in each of rows x columns different mouse listeners.
Also added a title to the MainFrame.
 2012-04-04 17:31:50 -04:00
Woody Folsom
b8df412740 Removed use of Refreshable and replaced with several methods which update the GUI using SwingUtilities.invokeLater(). 
While not as clean as using ChangeListener, it completely decouples the Model and View aspects,
and also avoids the need to manually paint() a hierarchy of components (a task best handled by Swing/AWT).
 2012-04-04 17:15:21 -04:00
Woody Folsom
0f616a3cc6 Continuing gradual process of collecting state from various GUI components and handlers and aggregating it in PlayerController. 
Removed references to Refree from some handlers, replacing them with direct use of PlayerController (Law of Demeter).
 2012-04-04 15:31:27 -04:00
Woody Folsom
0522f416e4 Correcting minor classpath issue which prevented running in Eclipse - was res/img, should have been res. 2012-04-04 13:44:32 -04:00
Woody Folsom
cffbc2c592 Build artifact dirs (docs, dist, bin) are now excluded from source control. 2012-04-02 13:57:50 -04:00
Woody Folsom
c8cdc1fcf8 Intermediate commit to remove Eclipse build artifacts (class files) from source control. 2012-04-02 13:57:26 -04:00
Woody Folsom
02c4986c30 App can now be built using Ant and run from the JAR file. 
Note: this requires adding the res/lib folder to the classpath in order to run in Eclipse (included in this commit).
Another commit will follow to remove build artifacts from git.
 2012-04-02 13:54:55 -04:00
Marshall
521fac6e08 -The rest of the game engine. I screwed up the commit last time. 2012-03-31 14:18:08 -04:00
Marshall
2954041e89 Initial game engine. 2012-03-31 14:15:50 -04:00
unknown
ccf8038f05 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-31 14:05:59 -04:00
Woody Folsom
6c4cce7a3a Test. 2012-03-29 11:59:41 -04:00
Woody Folsom
a2a6df8aa6 Final edits. 2012-03-18 23:09:23 -04:00
Marshall
b57a8da512 Last stuff. 2012-03-18 21:15:43 -04:00
Woody Folsom
cc15541e89 Mario has 3 lives again. 2012-03-18 21:05:45 -04:00
Marshall
54bf5937f0 - Fixed the bump bug. Kind of. I circumvented it. 2012-03-18 20:40:03 -04:00
Marshall
6ae266ee89 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 20:32:06 -04:00
Marshall
3c0673febf Some new stuff. 2012-03-18 20:31:54 -04:00
Woody Folsom
f1a7c2b4ce Updated remark on initial level per Marshall's new idea. 2012-03-18 20:23:04 -04:00
Marshall
f03577a822 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 19:57:52 -04:00
Marshall
aa5d9099f1 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 
Conflicts:
	src/dk/itu/mario/level/matcher/ProfileMatcher.java
 2012-03-18 19:57:41 -04:00
Woody Folsom
fdedf70546 Revisions. 2012-03-18 19:46:45 -04:00
Marshall
952ccdc23b - Update the ProfileMatcher mapping. 2012-03-18 19:01:08 -04:00
Woody Folsom
d5b8e0b85e Very rough draft of write-up (not proof-read). 2012-03-18 18:46:30 -04:00
Woody Folsom
18643d17e4 Fixed NPE when the default player.txt does not exist. Fixed bug when requesting PowerUp component of invalid length. Change default lives to 1. 2012-03-18 18:14:11 -04:00
Woody Folsom
0619f95f33 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 16:41:37 -04:00
Woody Folsom
992f2eef46 Example rules to enable/disable challenges (feeds fitness evaluator). 2012-03-18 16:41:23 -04:00
Marshall
a6f467d724 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 16:22:38 -04:00
Marshall
ac7b0c5b19 -Fixed some problems with the pipe jumping challenge. 2012-03-18 16:22:25 -04:00
Woody Folsom
862ba2aa31 CHALLENGE rule randomly generates challenges. 2012-03-18 16:17:04 -04:00
Woody Folsom
c2465821f3 Work in progress. 2012-03-18 15:01:16 -04:00
Marshall
1f1f23a6c3 - Greatly improved the challenge/reward probability function and usage. Removed some unnecessary fields and resorted the members of PCGLevel to make it easier to read. 2012-03-18 14:51:27 -04:00
Marshall
5ae5edd961 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 13:43:23 -04:00
Marshall
bc45062ad8 - Implemented the reward weighting. 
- Fixed a balance issue with the blocks and coins on straight stretches of even length.
 2012-03-18 13:42:59 -04:00
Woody Folsom
d5b1bda7e1 Grammar, now with pipes! 2012-03-18 13:23:51 -04:00
Woody Folsom
4ce414408e Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-18 13:03:31 -04:00
Woody Folsom
0bb61eece8 Added PlayerProfile.getProbability(LevelComponent.TYPE). 2012-03-18 13:03:16 -04:00
Marshall
dc6fe7e493 - Added the notion of "challenge type" difficulty weighting. It doesn't do anything yet, but the scaffolding is there. Create a set of enums to aid that. 
- Added more precise platform number randomizing in the platform jump challenge.
- Removed the hard-coded difficulty in the testing generation branch.
 2012-03-18 13:01:51 -04:00
Woody Folsom
554e9af319 Fixed manifest and build file so that mario can be built and run on the command-line. 2012-03-18 12:27:29 -04:00
Woody Folsom
7b6baaa538 Basic FitnessEvaluator tries 10x to generate a level containing between 8 and 16 level components. 2012-03-18 11:33:18 -04:00
Woody Folsom
d6516388ad Now with file-based level grammar. 2012-03-18 10:56:25 -04:00
Woody Folsom
b431d5efeb Functional context-free grammar! Worked first time! Well... almost. 2012-03-18 08:09:53 -04:00
Marshall
9ce8685b74 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 
Conflicts:
	src/dk/itu/mario/level/PCGLevel.java
 2012-03-18 05:33:57 -04:00
Marshall
f0b7487476 This patch has a TON of changes. I updated almost every challenge and added some new ones. I think it represents a good suite of possibilities. Check it out. 2012-03-18 05:25:33 -04:00
Woody Folsom
763fa16cde Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-17 22:23:45 -04:00
Woody Folsom
7d747765ef Implemented stochastic grammar. Work in progress. 2012-03-17 22:23:38 -04:00
Marshall
ac968b5b7f - Fixed another platform jumping impossibility bug. 
- Added monsters to platform jumping.
- Difficulty is now hard-coded to six.
 2012-03-17 21:55:00 -04:00
Marshall
f179f2daa5 - Adjusted difficulty formula for bowling challenge. 
- Added difficulty-weighted maze monsters.
- Note: this build has a hard-coded difficulty of 10.
 2012-03-17 21:15:44 -04:00
Marshall
63b89b053f - Fixed an off-by-one error in the bowling challenge. 2012-03-17 20:49:55 -04:00
Marshall
ce8cb49029 Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3 2012-03-17 20:44:41 -04:00
Marshall
a84bc72b13 - Changed platforms/mazes to rocks. 
- Fixed impossible platform jump bug.
- Implemented difficulty adjustment for bowling.
- Implemented short-form freebies.
 2012-03-17 20:44:21 -04:00