mosstest
/
mosstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
452 Commits
1 Branch
0 Tags
6.6 MiB
Commit Graph

326 Commits (master)

Author SHA1 Message Date
rarkenin f23e45e4bf Reworked registering of nodes. This breaks the default game, that is a non-issue this early 2014-04-04 06:20:14 -04:00
rarkenin b602edaa49 Move to JDK8 2014-03-31 16:39:56 -04:00
rarkenin a2b4980fba More flailing with the managers 2014-03-24 19:17:20 -04:00
rarkenin 987d2aadd3 Finalize implementation of the levelDB backed map for now 2014-03-23 20:45:42 -04:00
rarkenin 12b0fb3745 Finalize the get and put methods of DB-backed map, and create test. 2014-03-22 20:12:58 -04:00
rarkenin c870c3cb56 Rework storage of anything backed by a database (to be completed, intermediate results still work fine) 2014-03-22 09:02:02 -04:00
rarkenin 690fe9c885 Fix a build failure (adding a local pre-commit hook to prevent this in the future) 2014-03-19 16:53:36 -04:00
rarkenin 532e99f0a3 Lots of implementation restructuring, including better cache classes, finishing ABM initial implementation, and the creation of a map chunk interface 2014-03-19 16:46:22 -04:00
rarkenin 43730bba21 Remove compile exclusions for IDE, re-push with fixed code 2014-03-18 20:35:21 -04:00
rarkenin 1a2c4dbf24 Rework ABM system again, todo non-chunk-oriented system 2014-03-18 20:28:04 -04:00
Aaron Chan d601cccfe6 Isolating z-fighting issues to fix 2014-03-10 16:11:22 -04:00
Aaron Chan 6c439b41cf Merge remote-tracking branch 'origin/master' into 021214renderer 2014-03-05 19:34:15 -05:00
rarkenin 09ed381d9b Fix build failures 2014-03-03 17:43:52 -05:00
rarkenin d44d023fb5 PArtial fixups 2014-03-02 20:53:30 -05:00
Aaron Chan fc0976000a Merge remote-tracking branch 'origin/master' into 021214renderer 
Conflicts:
	pom.xml
	src/net/mosstest/launcher/GUIClientsideLauncher.java
	src/net/mosstest/scripting/MapChunk.java
	src/net/mosstest/scripting/NodePosition.java
	src/net/mosstest/scripting/SimplexMapGenerator.java
	src/net/mosstest/servercore/IFileManager.java
	src/net/mosstest/servercore/IMossFile.java
	src/net/mosstest/servercore/LocalAssetLocator.java
	src/net/mosstest/servercore/LocalFile.java
	src/net/mosstest/servercore/LocalFileManager.java
	src/net/mosstest/servercore/MossWorld.java
	src/net/mosstest/servercore/MosstestSecurityManager.java
	src/net/mosstest/servercore/RenderProcessor.java
	tests/net/mosstest/tests/NodePositionTest.java
 2014-03-02 16:20:20 -05:00
rarkenin a71fbde15b Fix MossTool for updates to MossItem 2014-03-01 21:38:46 -05:00
rarkenin a56bb39fd6 Update item manager (still needs rework). 2014-03-01 21:10:33 -05:00
rarkenin 3d342cea55 Update item manager (still needs rework). 2014-03-01 11:22:49 -05:00
rarkenin 1ee62f4dbe Create builder for MossItem, and use said builder. Remove useless exception opting for null instead. 2014-03-01 11:01:00 -05:00
rarkenin a66d58e1cb Massive pile of pedantic fixes 2014-02-28 20:49:29 -05:00
rarkenin 62adc5a933 Update LocalFileManager.java to also locate a full set of files when no index file is present. In addition IMossFile.java now has a getName() method to be used in network communication. 2014-02-28 19:52:22 -05:00
rarkenin 82b310c5e1 Begin using IntelliJ IDEA, update file manager to bypass loading files for a missing index file (while it should instead recursively search the directory for this) 2014-02-28 18:56:45 -05:00
rarkenin 303bc1f834 Update a forgotten file. I promise, once we have a release, we'll begin checking more stringently before commits. 2014-02-26 21:03:24 -05:00
rarkenin d88dc58e9e Update node params to be more consistent. We now simply use a null params for air, where a special case is used (for consistent acceleration until liquid or solid is hit) 2014-02-26 20:58:14 -05:00
rarkenin 468db4e610 Add file index support to file manager, move mock node manager to another location where it can be referenced via maven for profiler applets 2014-02-25 20:33:35 -05:00
rarkenin 3aca240709 remove useless scope prefix 2014-02-23 20:47:23 -05:00
Aaron Chan f5cbebc567 Merge branch 'master' of https://github.com/mosstest/mosstest into 
021214renderer

Conflicts:
	tests/net/mosstest/tests/NodePositionTest.java
 2014-02-23 15:10:22 -05:00
rarkenin 9b6fc99b32 update asset locator to use root path 2014-02-22 21:24:39 -05:00
Aaron Chan 67422428d5 Merge remote-tracking branch 'origin/master' into 021214renderer 2014-02-22 18:20:25 -05:00
rarkenin d70a3f5263 Finally retire that broken sandbox that went through two contractors since 
I was going to throw it away anyway
 2014-02-21 22:16:41 -05:00
rarkenin 68fa36b5dd Finally fixed that fastidious secruity manager by allowing opening of 
files within the directory corresponding to package net.mosstest's classfiles AS A STOPGAP MEASURE.
A better fix is desired
 2014-02-21 21:53:49 -05:00
rarkenin 2b1ccebc35 Actually make scripts run. MASSIVE FIXME: DOES NOT RUN IN ECLIPSE 2014-02-20 22:35:15 -05:00
rarkenin f65083ff23 Create unit test for map chunks 2014-02-19 21:30:43 -05:00
rarkenin 87292a5f44 Fix inadvertent bug in improperly reusing code in NodePosition and using new Position(int, int, int) instead of using proper composition and calling into new Position(byte[]). 2014-02-17 21:33:05 -05:00
rarkenin 8639ea3506 Update positions to use non-linear ordering to improve database 
performance, update unit test to match removal of 'throws IOException'
clause.

This update passes all pertinent unit tests.
 2014-02-17 21:24:12 -05:00
rarkenin 16400da116 Merge branch '021214renderer' 2014-02-16 16:52:19 -05:00
Aaron Chan 66da2b3ce9 Merge remote-tracking branch 'origin/master' into 021214renderer 
Conflicts:
	src/net/mosstest/scripting/MapChunk.java
	src/net/mosstest/servercore/RenderMapChunk.java
	src/net/mosstest/servercore/RenderNode.java
	src/net/mosstest/servercore/RenderProcessor.java

Merge this into master immediately! (4:30pm 2/16/2014)
 2014-02-16 16:31:07 -05:00
rarkenin 3cfcc150fd Rework event processor, start javadoc rechecking 2014-02-15 14:51:50 -05:00
Aaron Chan 9380eed063 Bringing auxiliary classes up to speed 2014-02-14 13:22:48 -05:00
Aaron Chan 44a5d757a5 Small optimizations 2014-02-14 12:51:38 -05:00
rarkenin 311a3d0d81 Begin rework of event processor to use different classes for different 
event types to avoid parameter and null pollution.

Fix javadocs to be more compliant (but not more complete with respect to
coverage/information)
 2014-02-13 21:00:29 -05:00
Aaron Chan 1fc28a31c7 Merge remote-tracking branch 'origin/master' into 021214renderer 2014-02-12 20:26:48 -05:00
Aaron Chan 16e97966d8 Beginning hollowing algorithm to improve performance 2014-02-12 20:26:26 -05:00
rarkenin 1d12f70762 fix lock issue, begin finalizing drawtypes (MapNode still needs a bit of 
reworking)
 2014-02-12 20:25:55 -05:00
rarkenin ba52e24ab9 Create profile entry point for MG 2014-02-12 20:11:41 -05:00
Aaron Chan fc6b5e2094 Added basic locking methods that interface with MosstestSecurityManager 2014-02-06 17:04:42 -05:00
rarkenin 7191ae0cda preiodic push 2014-02-03 06:39:53 -05:00
rarkenin a74c6af04a Create security manager 2014-02-02 15:46:48 -05:00
Aaron Chan 6ad938e849 Reoriented world (I think) 2014-01-14 16:36:07 -05:00
Aaron Chan 1cbe3902b8 Merge remote-tracking branch 'origin/master' into fix1renderer 
Conflicts:
	src/net/mosstest/servercore/RenderProcessor.java
 2014-01-14 16:33:01 -05:00
Aaron Chan bf979e0fae Committing before latest merge. Can't remember the differences, 
probably not enormous.
 2014-01-14 16:32:13 -05:00
rarkenin 756392bac1 Begin move to builder pattern to replace nasty overloads 2014-01-12 20:44:00 -05:00
rarkenin acb6afbcb4 Fix mapgen, renderer modifications for testing. No normal maps needed yet 
it seems
 2014-01-09 17:58:33 -05:00
rarkenin 4034e8448d Merge branch 'fix1renderer' of ssh://github.com/mosstest/mosstest 2014-01-08 20:49:47 -05:00
Aaron Chan 4bc59ba633 Got Renderer to render chunks requested from preparator. 2013-11-27 16:33:27 -05:00
rarkenin 7ce26ebd9e More logging changes 2013-11-27 12:16:01 -05:00
rarkenin c0cc510520 Fix pattern, remove slow bits from pattern, ensure log occurs BEFORE modal 
dialog for accurate timestamps
 2013-11-27 12:12:32 -05:00
rarkenin 15df3e697a remove extraneous stuff 2013-11-27 12:02:13 -05:00
rarkenin a844a29173 Switch to logging 2013-11-27 11:58:27 -05:00
Aaron Chan 118ac39c4e Took out some unnecessary print statements. 2013-11-27 09:04:21 -05:00
Aaron Chan 7479b561b3 Fixed the player node position, updates with a 1x1x1 system instead of 
jme3 space coordinates.
 2013-11-27 09:03:39 -05:00
Aaron Chan a892d250b0 Merged with master 2013-11-27 08:55:08 -05:00
Aaron Chan 4dd4a2f768 Merge remote-tracking branch 'origin/master' into fix1renderer 2013-11-27 08:54:27 -05:00
Aaron Chan 243581c3e5 Added updating position for player object, through a lock. Added an 
empty waitFor method, not sure what it should do yet.
 2013-11-27 08:53:23 -05:00
rarkenin 1983fb8a40 Merge branch 'fix1renderer' of ssh://github.com/mosstest/mosstest 
Conflicts:
	src/net/mosstest/scripting/Player.java
 2013-11-27 08:27:57 -05:00
rarkenin 15899a201c Fix corrupt eclipse index, add priv handling to player, preparae to merge 
fix1renderer
 2013-11-27 08:26:16 -05:00
Aaron Chan 616670ba22 Switched to local chunk testing for now to configure player position 
updating, added setChunkPosition and setPositionOffsets to Player for
ease-of-use, and made the constructor in Player public
 2013-11-27 07:19:09 -05:00
Aaron Chan 03244e5ecd Merge remote-tracking branch 'origin/master' into fix1renderer 2013-11-27 06:43:19 -05:00
rarkenin 19dce8adbc add offset-chunk positioning to player 2013-11-26 21:15:20 -05:00
Aaron Chan 6234434661 Most recent changes 2013-11-26 20:49:25 -05:00
rarkenin dfffcfa963 Fix build failure from change from MossFile to String 2013-11-23 17:55:49 -05:00
rarkenin 4c4a085fca Work on item manager 2013-11-21 18:42:09 -05:00
Aaron Chan 3588c6b651 Attempting to request in a chunk through the preparator, currently 
doesn't succeed.
 2013-11-20 18:53:57 -05:00
Aaron Chan e44a64af96 Refactor again. Cleaning up. 2013-11-20 18:47:37 -05:00
rarkenin d1bee25aac Remove some todo entrues due to not being needed or being acknowledged in 
mylyn
 2013-11-18 06:19:39 -05:00
rarkenin b97ee46198 Merge branch 'fix1renderer' of ssh://github.com/mosstest/mosstest 2013-11-17 20:29:19 -05:00
Aaron Chan ef68b49a08 Refactored 2013-11-17 20:26:33 -05:00
Aaron Chan 999ffa18ba Renders local chunks, but preparator never sends a chunk back to render 2013-11-17 20:24:52 -05:00
Aaron Chan acb5421bff under development 2013-11-17 20:17:41 -05:00
rarkenin 11fdf4b135 Add new repo to pom, translations support 2013-11-16 19:15:26 -05:00
rarkenin ab1b72750d Add devscript for translations INTO gettext, run it for some pots 2013-11-16 15:21:44 -05:00
rarkenin 718250cbde add build cfg; externalize strings project-wide except for renderer 2013-11-16 13:57:16 -05:00
rarkenin eddf07e3fa Fix version to be 0.1.0-SNAPSHOT in accordance to semver 2013-11-16 12:34:42 -05:00
rarkenin 9c14a52372 Trivial bugfix and deprecation. thatnerd2: please fix 2013-11-15 22:22:29 -05:00
rarkenin 494f1003da another classfile with superfluous libraries 2013-11-15 22:21:07 -05:00
rarkenin cea76fe680 Remove useless extra libs that weren't going to be available at the 
builder
 2013-11-15 22:14:45 -05:00
rarkenin 0c811c2191 Add build info to maven, continue on exception handling of world launcher 2013-11-15 22:11:35 -05:00
Aaron Chan 6a5f9ac84f Serious code cleaning, much more elegant now. Added temporary surface 
normals that seem to work.
Still tests locally.
 2013-11-15 20:33:51 -05:00
Aaron Chan 9f2753a03a Refactor: replaced methods with chained put statements 2013-11-15 17:33:43 -05:00
Aaron Chan d55894a04c Working on Surface Normals, merged with master 2013-11-15 17:17:54 -05:00
Aaron Chan 247f8b2fe0 Merge remote-tracking branch 'origin/master' into fix1renderer 2013-11-15 17:06:12 -05:00
rarkenin d3dbfd5575 Work on integrating some of the launcher components together with at least testing code. This easily beats Windows Forms. 2013-11-12 20:28:14 -05:00
Aaron Chan 3bf0719804 Merged with master again (.pom fix) 2013-11-12 20:21:38 -05:00
Aaron Chan 5112e8d297 Merge remote-tracking branch 'origin/master' into fix1renderer 2013-11-12 20:21:17 -05:00
rarkenin 12c7aaa0f6 Remove windowbuilder crap 2013-11-12 19:49:17 -05:00
Aaron Chan 8371856357 Merged with master 2013-11-12 19:26:13 -05:00
Aaron Chan 362bd9c262 Merge remote-tracking branch 'origin/master' into fix1renderer 2013-11-12 19:25:08 -05:00
Aaron Chan e5230492c7 Fixed the Mesh for unshaded material. 2013-11-12 19:24:43 -05:00
rarkenin 4a3f6f2a7c Begin launcher in Swing. This, surprisingly, is the easy part, because I'm not trying to do it in C#. 2013-11-11 20:29:12 -05:00
Aaron Chan 566a33fdc4 Oops, quick fix. Main problem discussed in earlier commit still exists 
however.
 2013-11-09 19:02:59 -05:00