rarkenin
|
b01feae74d
|
Merge branch 'hud'
Conflicts:
src/net/mosstest/servercore/RenderProcessor.java
src/net/mosstest/servercore/serialization/IByteArrayWritable.java
src/net/mosstest/servercore/serialization/LevelDBBackedMap.java
|
2014-07-15 20:20:21 -04:00 |
|
rarkenin
|
367bb0b0de
|
Some serialization fixes
|
2014-07-13 13:39:37 -04:00 |
|
rarkenin
|
8e1c989b25
|
My stupidity warrants a merge
Merge branch 'master' of ssh://github.com/mosstest/mosstest
Conflicts:
src/net/mosstest/scripting/Position.java
src/net/mosstest/servercore/MapDatabase.java
|
2014-06-18 16:46:52 -04:00 |
|
rarkenin
|
fd83ba422e
|
Another painful merge
Merge branch 'netclient' into 021214renderer
Conflicts:
data
dependency-reduced-pom.xml
mosstest.iml
pom.xml
src/net/mosstest/scripting/MossScriptEnv.java
src/net/mosstest/servercore/AbstractMossScript.java
|
2014-06-16 17:51:50 -04:00 |
Aaron Chan
|
57c2fe19d7
|
Merge remote-tracking branch 'origin' into 021214renderer
Conflicts:
src/net/mosstest/servercore/RenderProcessor.java
|
2014-05-11 15:22:11 -04:00 |
|
rarkenin
|
a9e4e95687
|
lots of client rework
|
2014-05-03 20:47:30 -04:00 |
|
rarkenin
|
5987dd3473
|
Merge branch 'master' into netclient
Conflicts:
src/net/mosstest/servercore/AbstractMossScript.java
src/net/mosstest/servercore/LocalFile.java
src/net/mosstest/servercore/LocalFileManager.java
|
2014-04-26 20:27:12 -04:00 |
|
rarkenin
|
4cf56430e7
|
begin actual network client work (file management)
|
2014-04-26 18:32:32 -04:00 |
|
rarkenin
|
539e401398
|
use messageformat, preparing to i18ize properly
|
2014-04-22 20:58:12 -04:00 |
|
rarkenin
|
0941297e42
|
rework generic mess to use java8 features
|
2014-04-19 17:10:12 -04:00 |
|
rarkenin
|
71844faf5b
|
Merge branch 'java8'
Conflicts:
mosstest.iml
pom.xml
|
2014-04-19 15:53:08 -04:00 |
|
Aaron Chan
|
459dba5022
|
Merge remote-tracking branch 'origin' into 021214renderer
Conflicts:
.travis.yml
data
src/net/mosstest/scripting/MapChunk.java
src/net/mosstest/scripting/MossScriptEnv.java
src/net/mosstest/scripting/Position.java
tests/net/mosstest/tests/MapChunkTest.java
|
2014-04-05 19:59:57 -04:00 |
|
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
|
2828b6c41b
|
move to java 8 for IDEA (maven working perfectly)
|
2014-03-31 16:55:26 -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
|
1a2c4dbf24
|
Rework ABM system again, todo non-chunk-oriented system
|
2014-03-18 20:28:04 -04:00 |
|
rarkenin
|
a71fbde15b
|
Fix MossTool for updates to MossItem
|
2014-03-01 21:38:46 -05:00 |