5 years agoMerge remote-tracking branch 'origin/master' master
Michael Marques []
Merge remote-tracking branch 'origin/master'

5 years agoFixed problem with animation when leaving Fog Of War
Michael Marques []
Fixed problem with animation when leaving Fog Of War

5 years agoBugFix: TextMenus now perform correctly. When the user holds the button
jc []
BugFix: TextMenus now perform correctly. When the user holds the button
down on the last set of text, it will not close until the button has
been released once.

5 years agoMerge feature-leashing branch into master
jc []
Merge feature-leashing branch into master

5 years agoWandering NPCs now leash to bounded areas correctly.
jc []
Wandering NPCs now leash to bounded areas correctly.

Updated bounds information for 3 wandering NPCs in Actors.json
Refactored WanderingPerson.java

5 years agoRemoved extra row in Level 5
Michael Marques []
Removed extra row in Level 5

5 years agoFixed bug where Level Change position wasn't sent to server
Michael Marques []
Fixed bug where Level Change position wasn't sent to server
Fixed issue in String.json

5 years agoCorrected Spanish string.
jc []
Corrected Spanish string.

5 years agoFixed typo and added 1 spanih locale string
Michael Marques []
Fixed typo and added 1 spanih locale string

5 years agoMerge remote-tracking branch 'origin/master'
Michael Marques []
Merge remote-tracking branch 'origin/master'

5 years agoRemoved level change from Tile and put it in LevelChangeTile
Michael Marques []
Removed level change from Tile and put it in LevelChangeTile
Fix for step off logic in grid for upward steps
Changed grit changeLevel to reutrn levelChange from tiles instead of
creating manualy
Adjusted MovementAnimator so teleport between mats with no stepping at
end of Viridian Forest
Renamed TeleportTile to LevelChangeTile
Removed level change vars from Tile Class and relavent JSON
Added stepAfterLeave variable to LevelChange to manage stepping after
level change for stepOff level changes (Viridian fix)

5 years agoBugfix: Wandering NPCs no longer ghost through the player.
jc []
Bugfix: Wandering NPCs no longer ghost through the player.

5 years agoFixed position update bug
Michael Marques []
Fixed position update bug

5 years agoFixed bugs in Level Changes
Michael Marques []
Fixed bugs in Level Changes
Stairs in Player House work again
Building exits work properly again
Moved nextTile funciton from movmentAnimator to Pose
Adjusted all mat tiles to have
exit point 1 less in y axis
Fixed any Tranistion Tile bugs besides Cave
Adjusted Grid function to return proper LevelChange for Mat Tiles
Movment animator keyboard control no longer depends on player position,
but uses fed position instead
Added function to check if a level transition is stepOnLeave and fixed
bug in rightDirection to compenaste for Direction.NONE in LevelChange

5 years agoMerge branch 'master' of ssh://git.dryerzinia.com:22/opt/git/Pokemon
DrYerzinia []
Merge branch 'master' of ssh://git.dryerzinia.com:22/opt/git/Pokemon

5 years agoChanged Potion giver to stand still while Potion recived message is up.
DrYerzinia []
Changed Potion giver to stand still while Potion recived message is up.

5 years agoDefault database properties file is now written if there is no dbname or
jc []
Default database properties file is now written if there is no dbname or
dbms specified. Added another Spanish translation.

5 years agoFinished Bug #11
Michael Marques []
Finished Bug #11
Converted all Actors to use Pose object instead of xy dir level

5 years agoFixed Bug #17Was passing wrong variable as deltaT to update function in
Michael Marques []
Fixed Bug #17Was passing wrong variable as deltaT to update function in
continue animation

5 years agoFixed Bug #20
Michael Marques []
Fixed Bug #20
Adjusted how tiles where rendered in the grid draw function so instead
of using pixel offset they got the float adjusted by players position.
Now there is no character pixel bouncing.

5 years agoModified persons to use MovmentAnimator class
Michael Marques []
Modified persons to use MovmentAnimator class

5 years agoFixed bug where NPC's dont move until you talk to them.
Michael Marques []
Fixed bug where NPC's dont move until you talk to them.

5 years agoMerge remote-tracking branch 'origin/master'
Michael Marques []
Merge remote-tracking branch 'origin/master'

5 years agoLocale stored in settings file, Settings file loading moved to Client
Michael Marques []
Locale stored in settings file, Settings file loading moved to Client
state, String replacing for {Player}

5 years agoFixed bug where one character would spawn in out of bounds when loading
jc []
Fixed bug where one character would spawn in out of bounds when loading
the test data from the sqlite database.

5 years agoTranslated some strings into Spanish.
jc []
Translated some strings into Spanish.

5 years agoUser settings loaded/written using properties file.
jc []
User settings loaded/written using properties file.

5 years agoMerge remote-tracking branch 'origin/master' and Move db.properties to
Michael Marques []
Merge remote-tracking branch 'origin/master' and Move db.properties to
home folder settings storage

Conflicts:
src/com/dryerzinia/pokemon/util/MysqlConnect.java

5 years agoCreated Conditionals and Conditional events, fixed text menu bugs,
Michael Marques []
Created Conditionals and Conditional events, fixed text menu bugs,
converted all the json over to the event system for menus.

5 years agoImplemented support for running the server with a SQLite backend. Added
jc []
Implemented support for running the server with a SQLite backend. Added
libraries for jUnit and SQLite. Changed the sql files that generate and
populate the tables to be compatible with both SQLite and MySQL, and
moved MySQL-specific code into a separate file (mysqlhack.sql). Added
the SQLite database (pokemon.db).

Refactored MySqlConnect (now called Database), and moved connection
parameters into an external properties file.

Renaming MySqlConnect affected 5 other classes that refer to it.

5 years agoFixed clicking code to be contined in player class and make
Michael Marques []
Fixed clicking code to be contined in player class and make
KeyboardInputContoller keys remappable

5 years agoEvents load from JSON now
Michael Marques []
Events load from JSON now

5 years agoAdded String.json to load Strings from file
Michael Marques []
Added String.json to load Strings from file

5 years agoIntegrated Juans new Event system and Text menu system and string Store
Michael Marques []
Integrated Juans new Event system and Text menu system and string Store

5 years agoFixed Bug #19
DrYerzinia []
Fixed Bug #19
All tiles have correct initial colors
On login colors get fixed

5 years agoUpdate bug #15 missed Pokemon and Move classes
Michael Marques []
Update bug #15 missed Pokemon and Move classes
Missed changing JSON methods on Pokemon and Move
Tested working bug #15 fixed for sure

5 years agoFixes for bug #19
DrYerzinia []
Fixes for bug #19
Fixed sprites with wrong inital color
Fixed some of the level colorProfiles in save.json

5 years agoProgress on bug #19
DrYerzinia []
Progress on bug #19
Color changes working on level transition
Need login color change
Need new image load color change
Need to set color profiles for existing levels

5 years agoFixed Bug #18
DrYerzinia []
Fixed Bug #18
Sanitized player per level lists on dissconnect
used .equals for comparison when player first loads so we dont send a
Ghost copy of self

5 years agoFix for bug #15
DrYerzinia []
Fix for bug #15
Created per class JSON to Object methods to avoid reflection setAccess

5 years agoAdded Ledge Jump to animations
DrYerzinia []
Added Ledge Jump to animations
Bug #12 only need spinning slide animation to be resolved

5 years agoWorking on Bug #12 make Jump work
Michael Marques []
Working on Bug #12 make Jump work
This commit has hilarius bug I am calling Rabbit Jump Bug

5 years agoFixed Bug: #13
DrYerzinia []
Fixed Bug: #13
Both server and client use nearest level player lists when they are
checking if any players are close enough to need an update

5 years agoFixed fog of war for Actor characters
DrYerzinia []
Fixed fog of war for Actor characters

5 years agoAdded Movement sprites
DrYerzinia []
Added Movement sprites
Boy1
Oak
Girl2(Up, Down)
Rival
Pikachu
OldMan(Up, Down)

5 years agoImproved naming, standardized to camelCase
DrYerzinia []
Improved naming, standardized to camelCase

5 years agoFix for Bug #10
DrYerzinia []
Fix for Bug #10

5 years agoAll step animations working across borders
DrYerzinia []
All step animations working across borders
Need to merge player person animations
Need to do per level Player lists for scalability
Need to do Jump and Slide Animations

5 years agoFixed bugs related to Bug 8
DrYerzinia []
Fixed bugs related to Bug 8
All level transition animations fixed

5 years agoGeneral bug fixes and commenting related to Bug 8
DrYerzinia []
General bug fixes and commenting related to Bug 8
Players now render across levels
Players glitch when seen crossing levels by other players

5 years agoFixed Bug 8
DrYerzinia []
Fixed Bug 8
All player animations working.
Players are always aware of each others movements within a Manhattan
distance of 12
Need to merge player and person animations, will require conversion of
person location to a Position object and map file regiggering.
Need to clean up code and comment

5 years agoPartial Progress on Bug 8
DrYerzinia []
Partial Progress on Bug 8
We can see other characters but there movment animations are non
functional

5 years agoBug 7 Fix
DrYerzinia []
Bug 7 Fix
Actors and players have collsion Detectino
Created list for people in Level
added canStepOn method for collision detection to Level

5 years agoResolved Bug 4
DrYerzinia []
Resolved Bug 4
Actors are recived from server.
Server gets actors from actors.json

5 years agoNow sending player movement updates to server
DrYerzinia []
Now sending player movement updates to server

5 years agoLady2 and Man1 Sprites added for walking and actor animation added
DrYerzinia []
Lady2 and Man1 Sprites added for walking and actor animation added

5 years agoChanged direction to Direction Enum in all references that where
DrYerzinia []
Changed direction to Direction Enum in all references that where
connected with the Person direction

5 years agoStream Based JSON reading working
Michael Marques []
Stream Based JSON reading working

5 years agoFixed Applet UI and changed UI
Michael Marques []
Fixed Applet UI and changed UI
to be Canvas based

5 years agoUsed reflection for JSON write
Michael Marques []
Used reflection for JSON write
Change JSON strings to " instead of '

5 years agoStarting working on Actor Animation
DrYerzinia []
Starting working on Actor Animation

5 years agoStarting replacing x, y, level with position objects
Michael Marques []
Starting replacing x, y, level with position objects
can now change levels, still a little broken

5 years agoUpdated main character animations
Michael Marques []
Updated main character animations
Added flower tile and water tile animations
fixed not drawing of the first row and column and restored proper
adjacent level drawing
UI draws black background to buffer before the map

5 years agoStated work on fixing level change
DrYerzinia []
Stated work on fixing level change

5 years agoRefactored to working state
DrYerzinia []
Refactored to working state
No game menus
Login works
Character walk and wall bump animations work
Ledge Jump broken
Level change broken

5 years agoMake good headway restructuring pokemon
DrYerzinia []
Make good headway restructuring pokemon
Added Input listening events related to pokemon game controls
Added variables to Player class related to animation
Removed menu systems from initalization for rewrite later

5 years agoMajor refactoring part way through
DrYerzinia []
Major refactoring part way through

5 years agoFixed Typo in save.json pixle to pixel
DrYerzinia []
Fixed Typo in save.json pixle to pixel
Cleaned up and commented PokemonGame
Created empty classes to move code to and import code organization
throw IOException on generic server message write for
more accurate error messages
Improved Exeption handling for MySQL in particular Unable To Connect
error
Removed Load all classes loop from pokemon game However this breaks
editor, but it was already broken by restructuring so we need to rewrite
this somehow.

5 years agoFixed Linebreaking on location entry on Login view
DrYerzinia []
Fixed Linebreaking on location entry on Login view
Cleaned up code

5 years agoStoped classloader from sending HTTP GET requests for Image Resources
DrYerzinia []
Stoped classloader from sending HTTP GET requests for Image Resources
that where not in the jar

5 years agoRemoved various unused debug messages
DrYerzinia []
Removed various unused debug messages

5 years agoFinished removeing JX Pad
DrYerzinia []
Finished removeing JX Pad
Fixed Login Message line breaking

5 years agoRemoved JXPad from project
DrYerzinia []
Removed JXPad from project

5 years agoCreated keystore for signing the Pokemon Applet JAR
Michael Marques []
Created keystore for signing the Pokemon Applet JAR

5 years agoFixed spelling error of Sprite Scientist
DrYerzinia []
Fixed spelling error of Sprite Scientist

5 years agoCleaned up and Commented Server Code
DrYerzinia []
Cleaned up and Commented Server Code

5 years agoRemoved unused statics message ID's from PokemonServer
DrYerzinia []
Removed unused statics message ID's from PokemonServer
Clean Up Socket Bind Error handling
Removed Useless ArrayList Remove helper function
Fixed PlayerInstanceData fucnctions that did nothing

5 years agoCleaned up client Disconnect handling on server side
Michael Marques []
Cleaned up client Disconnect handling on server side

5 years agoAdded SQL querys for database setup
Michael Marques []
Added SQL querys for database setup

5 years agoPokemon Base Stats load from JSON file
DrYerzinia []
Pokemon Base Stats load from JSON file
Cleaned up Login Message

5 years agoDefault Settings file now JSON
DrYerzinia []
Default Settings file now JSON

5 years agoRemove .classpath and .project from tracking
DrYerzinia []
Remove .classpath and .project from tracking

5 years agoAdded MySQL Driver to Code
Michael Marques []
Added MySQL Driver to Code

5 years agoRemoved ot and name from Pokemon class as they where redundant copies of
DrYerzinia []
Removed ot and name from Pokemon class as they where redundant copies of
nickName and Species

5 years agoNew MySQL loading working
DrYerzinia []
New MySQL loading working

5 years agoMerge remote-tracking branch 'origin/dev'
DrYerzinia []
Merge remote-tracking branch 'origin/dev'

Conflicts:
.classpath
src/MysqlConnect.java
src/PokemonServer.java

5 years agoSQLExceptions fixed to not break SMLogin dev
jc []
SQLExceptions fixed to not break SMLogin

5 years agoSQLExceptions caught to not break SMLogin.
jc []
SQLExceptions caught to not break SMLogin.

5 years agoMySqlConnect converted to fully use JDBC instead of PHP silliness
jc []
MySqlConnect converted to fully use JDBC instead of PHP silliness

5 years agosql
jc []
sql

5 years agoMinor Bug Fixes
DrYerzinia []
Minor Bug Fixes

Fixed Apostropys in character dialog
Fixed javaExcaping of Apostrophys in JSON conversion
Pokemon JSON reference Init added
Fixed base move and pokemon stat reference initilization on server side
during MySQL Load

5 years agoFixed save.json, had nulls in bad places
DrYerzinia []
Fixed save.json, had nulls in bad places
Removed Tile Hierarchy empty fromJSON's so image referencs would init
Made JSON load field search recurisve so superclass data would be
recreated

5 years agoMerge remote-tracking branch 'origin/package'
DrYerzinia []
Merge remote-tracking branch 'origin/package'

Conflicts:
src/AttackSelectionMenu.java
src/GMenu.java
src/Grid.java
src/ItemCountMenu.java
src/ItemMenu.java
src/Level.java
src/MoneyMenu.java
src/Move.java
src/MysqlConnect.java
src/Person.java
src/Pokemon.java
src/PokemonBoxMenu.java
src/PokemonGame.java
src/RandomFight.java
src/ScrollMenu.java
src/SelectionMenu.java
src/StatDispMenu.java
src/Tile.java
src/TrainerPerson.java
src/WanderingPerson.java

5 years agoGame Loads from JSON save file
DrYerzinia []
Game Loads from JSON save file

5 years agoChanged most of MysqlConnect to use JDBC instead of PHP
jc []
Changed most of MysqlConnect to use JDBC instead of PHP

5 years agoMove all files into packages package
DrYerzinia []
Move all files into packages

5 years agoImage and save resources added
DrYerzinia []
Image and save resources added

5 years agoproject files
DrYerzinia []
project files

5 years agoCreated Pokemon Repository
DrYerzinia []
Created Pokemon Repository