Skip to content

Tweaking to fit GUI #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
Nohbody wants to merge 72 commits into
base: master
Choose a base branch
from
Open

Tweaking to fit GUI #3

Nohbody wants to merge 72 commits into from

Conversation

@Nohbody
Copy link
Owner

@Nohbody Nohbody commented Nov 18, 2014

No description provided.

@newScanTron
Merge pull request #6 from Nohbody/master
749f4cb 
TestPanel Demo
@newScanTron
created a readme
87c2931 
only because Git suggested that i add this
@newScanTron
got a bit of a working game next step is going to be to add collectab…
960c5a1 
…les.
@newScanTron
whoa some files to commit
1d4be9f 
working collector, now need coins and then more functonality
@newScanTron
a bit of clean up deleted a file or two i dont need
9548f94
@newScanTron
run collectPanel to run the current version of the collector game
f7900ef
@newScanTron
Coins are now randomly generated and can be collected in that they di…
8a3f696 
…sappear at this point. now need to tie that to the character class and increment their score
@newScanTron
Merge branch 'master' of https://github.com/Nohbody/serverTime into N…
cc23801 
…ohbody-master

Conflicts:
	src/DBOps.java
@newScanTron
Merge branch 'master' of https://github.com/Nohbody/serverTime into N…
591721e 
…ohbody-master

Conflicts:
	src/DBOps.java
@newScanTron
Merge pull request #15 from newScanTron/Nohbody-master
72563c4 
Nohbody master
@newScanTron
Merge pull request #18 from Nohbody/master
b22d9b5 
Snake game hell yeah
@newScanTron
got a working connection on a new tile map based platformer. needs qu…
01c1634 
…ite a bit of enhancement.
@newScanTron
got a working connection on a new tile map based platformer. needs qu…
1ec7ca5 
…ite a bit of enhancement.
@newScanTron
trying to start to get a file read in to make the levels
7c4b8bb
@newScanTron
version control can be a pain
7e1b549
@newScanTron
version control can be a pain
1a2925a
@newScanTron
coin creation and score addition
6778d60
@newScanTron
github sucks
eb249ed
@newScanTron
almost got this github this
0d04745 
pull reequestes are making more sense
@newScanTron
proximity detection working pretty well with one weird bug
5e0459a
@newScanTron
Game panel can be added. Need to fix the gameLoop() bug
a928fcd
@newScanTron
Game panel can be added. Need to fix the gameLoop() bug
28df114
@newScanTron
merge
5fb68b5 
merge it
@newScanTron
hate
9b8a4c7
@newScanTron
only one file
13eb9b4
@newScanTron
Merge branch 'master' of https://github.com/Nohbody/serverTime into N…
78e9354 
…ohbody-master

Conflicts:
	src/Snake/GameApplet.java
	src/Snake/src/GameApplet.java
	src/collector/src/tileMapStuff/Entity.java
	src/collector/src/tileMapStuff/Game.java
	src/collector/src/tileMapStuff/Map.java
	src/gui/GUI.java
	src/gui/LoginPanel.java
	src/gui/MenuPanel.java
	src/main/DBOps.java
	src/main/Driver.java
	src/main/Listener.java
	src/main/TestPanel.java
	src/snake/GameApplet.java
@newScanTron
got something that moves only right for some reason but it shows that…
e75bd1c 
… the proximity works and can collect score.
@newScanTron
whole thing works exactaly as it did before, including the weird rand…
3ab7531 
…om coin generation.
@newScanTron
deleted unessisary directorys from the collector
cf49bde
@newScanTron
proximity detection works like a charm.
cd0266f
newScanTron and others added 30 commits November 28, 2014 14:43
@newScanTron
Merge remote-tracking branch 'origin/master'
5b4b6e7 
Conflicts:
	src/collector/src/tileMapStuff/Game.java
@newScanTron
got some multi thread action, the database connection still needs to …
39e91b8 
…be moved
@Nohbody
Team Deathmatch
cbc27db
@newScanTron
have mulit thead, that we now don't need. I like the new physics so j…
4b801ea 
…ust going to keep it.
@newScanTron
Merge remote-tracking branch 'origin/master'
2e181e1 
Conflicts:
	src/collector/src/tileMapStuff/Game.java
@newScanTron
new physics
019c088 
newer physics and mulit-thread that we dont need.
@newScanTron
got all the necessary dataBase connections running, still need to add…
1d3f909 
… exception handling to one of my threads.
@newScanTron
sync all the commits
a09a6cc
@Nohbody
It works now
873a76f
@newScanTron
hopfully this will update the collector so it works
7e65e59
@newScanTron
Merge remote-tracking branch 'origin/master'
60a97dd
@newScanTron
this is now more properly multi-threaded
3ce99af
@Nohbody
Force stop Collector when it's done
1f6f850
@Nohbody
Statistics
5092ce3
@Nohbody
I stopped the freaking lag
ddb26bc 
Hallelujah
@Nohbody
Fixed chat while countdown bug
fa40c60
@Nohbody
Fixed quotations bug
921d984
@newScanTron
this is now more properly multi-threaded
758a7ab
@newScanTron
collectorPApplet to the best of my knowledge should be working the sa…
725c1a7 
…me way as the GameApplet
@Nohbody
This is literally the latest version I have where things look like a …
b71a931 
…complete product
@newScanTron
im kinda struggling, cant quite seem to figure out why it doing what …
b9c33c9 
…it doing
@newScanTron
I was getting some strange stuff going on, probably because this game…
8504755 
…s code is kind of a mess. this looks way better than before and counts the score correctly.
@Nohbody
A few bug fixes
e44aeac
@Nohbody
A fix for that registration fix
2fa3a24
@newScanTron
better level that makes collector more fun to play.
3f58998
@newScanTron
better level that makes collector more fun to play.
5361baf
@newScanTron
Merge remote-tracking branch 'origin/master'
03d4f0b
@Nohbody
I'm an idiot.
116c41d 
Okay, this should get messages to send how I want
@Nohbody
Removed one square
01dd5df 
To make it more fair.
@Nohbody
Timestamp down to the millisecond
6e1a7a3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Nohbody @newScanTron