Commit Graph

652 Commits

Author SHA1 Message Date
Scott Stamp
c620d84c2e Moved common plugin configuration to parent pom.xml 2018-10-15 20:05:26 -02:30
Scott Stamp
3d6fa5bec3 Upgraded maven-assembly-plugin, removing deprecated ${artifactId} 2018-10-15 19:56:32 -02:30
Scott Stamp
a7b32cc82b Forgot to remove reference to ScenicView 2018-10-15 19:40:30 -02:30
Scott Stamp
230121dfdc Added toggle for view structure and fixed menu text color 2018-10-15 18:40:50 -02:30
Scott Stamp
eb1d298f4d Updated versions in Extensions pom.xml 2018-10-14 21:54:46 -02:30
Scott Stamp
8bb7799ae0 Broke all resource files out into the resources folder
Maven's happier this way
2018-10-14 21:31:28 -02:30
Scott Stamp
3aa50296aa Tidying up fxml files 2018-10-14 21:12:16 -02:30
Scott Stamp
9321c9c830 Fixed offset caching read/write 2018-10-14 21:08:10 -02:30
Scott Stamp
eae2f2bedc Fixed java process not exiting on Windows 2018-10-14 21:07:31 -02:30
Scott Stamp
ef52a1287d Added UiLogger window 2018-10-14 21:06:55 -02:30
Scott Stamp
c9a5a4b79b Merge branch 'windowsDev' into development 2018-10-14 18:15:43 -02:30
sirjonasxx
46dedb822f update info 2018-10-14 18:01:23 -02:30
sirjonasxx
e312549816
Merge pull request #9 from scottstamp/windowsDev
Switched the project over to Maven for simplicity.
2018-10-14 00:55:48 +02:00
Scott Stamp
8844d596d1 Add /bin to .gitignore
Ignore /bin, Maven will output G-Earth.jar here.
2018-10-13 19:49:20 -02:30
Scott Stamp
2cc0c69805 Fixed some stuff in BlockAndReplace extension
Forgot I renamed the package, oops!
2018-10-13 19:49:02 -02:30
Scott Stamp
bf63a8bc9c Removed usage of File.separator()
Don't use this for fetching files inside the JAR, it can cause issues on Windows
2018-10-13 19:48:39 -02:30
Scott Stamp
9749d8d3c8 Fixed some Maven stuff
G-Earth build output is placed in /bin now
2018-10-13 19:48:01 -02:30
sirjonasxx
764cb6472c update info 2018-10-13 23:43:13 +02:00
sirjonasxx
5d5442bd37 Merge branch 'master' of http://github.com/sirjonasxx/G-Earth 2018-10-13 23:01:39 +02:00
sirjonasxx
e9705b6e0e remove all windows stuff from Master 2018-10-13 23:01:15 +02:00
sirjonasxx
43d6d4c80c test 2018-10-13 22:54:52 +02:00
sirjonasxx
1e02a92414 temporary merge windev into master & resolve conflicts 2018-10-13 22:33:25 +02:00
Scott Stamp
9d8740c951 Added Maven and moved sample extensions to their own modules
mvn install, mvn package, done! Extensions have been moved to a new folder
2018-10-13 17:53:54 -02:30
Scott Stamp
dcd90b17b5 Ignore *.iml
Don't need these where we're going!
2018-10-13 17:52:16 -02:30
Scott Stamp
f18aed367b Removed json-simple-1.1.1.jar
This is replaced by org.json, included as a Maven dependency.
2018-10-13 17:51:57 -02:30
Scott Stamp
e02d07b063 Added *.iml to .gitignore
Moving to Maven so we don't need these, ever.
2018-10-13 17:50:36 -02:30
Eduardo Alonso
a3277dbcfa Fix cache format
* Now the JSON object is formatted correctly
2018-10-13 21:14:00 +02:00
sirjonasxx
f14cb7384a rename main to g_earth 2018-10-13 17:55:30 +02:00
sirjonasxx
e35edcb0e4 2 2018-10-13 17:17:20 +02:00
sirjonasxx
0733de713a remember cached locations & stuff 2018-10-13 17:17:03 +02:00
sirjonasxx
7724dbea14
Merge pull request #8 from XePeleato/windowsDev
Add cache support for Windows & general refactoring
2018-10-13 18:50:45 +02:00
Eduardo Alonso
ba1cf0b972 Add cache support for Windows & general refactoring 2018-10-13 18:34:55 +02:00
sirjonasxx
3818076d9e merge and provide production in windowshabboclient 2018-10-13 14:53:54 +02:00
sirjonasxx
2f6707a0f7 Merge remote-tracking branch 'origin/master' into windowsDev 2018-10-13 14:48:12 +02:00
sirjonasxx
b6f546ef4c structural updates rc4obtainee 2018-10-13 14:47:04 +02:00
sirjonasxx
75964eec81 Merge remote-tracking branch 'origin/master' into windowsDev 2018-10-12 18:06:32 +02:00
sirjonasxx
feadc99024 thing 2018-10-12 18:05:03 +02:00
sirjonasxx
2f0b97d537 support for hotels with no support for optional clientside encryption 2018-10-12 18:03:12 +02:00
sirjonasxx
472c20e5e9 critical bug in HPacket.structureEquals() 2018-10-12 17:59:12 +02:00
sirjonasxx
3433657eb4
Merge pull request #6 from scottstamp/patch-1
Removed use of deprecated Java EE component
2018-10-12 00:49:48 +02:00
Scott Stamp
18bc6c7615
Removed use of deprecated Java EE component
javax.xml.bind has been deprecated as of Java 8 and has been entirely removed in Java 11
2018-10-11 19:52:08 -02:30
sirjonasxx
e32cee6cfd mergeconflict 2018-10-11 20:27:54 +02:00
sirjonasxx
e6d3b6bf2f spelling is overrated 2018-10-11 20:21:45 +02:00
sirjonasxx
e75fa38f97 add contributer 2018-10-11 20:19:50 +02:00
sirjonasxx
3f01b316ab gitignore update & json.jar move 2018-10-11 20:15:30 +02:00
sirjonasxx
54b4b88372 hconnection clienthostandport fix 2018-10-11 20:06:23 +02:00
sirjonasxx
76f58aa752 another gitignore 2018-10-11 19:53:53 +02:00
sirjonasxx
3748105e36 cleanup and gitignore update 2018-10-11 19:49:24 +02:00
Eduardo Alonso
6680c105de Complete Windows support
* The memory controller is now 64 bit
* The flash process is calculated correctly
2018-10-11 22:41:20 +04:00
Eduardo Alonso
5ba1ddf8a8 Merge branch 'master' into windowsSupport
# Conflicts:
#	G-Earth.iml
2018-10-11 22:38:28 +04:00