Archived
0
Commit Graph

238 Commits

Author SHA1 Message Date
Forwolk
428f8113b5 Merged in forwolk/merge/location-world (pull request #6)
Forwolk/merge/location world

Approved-by: DmitriyMX <dimon550@gmail.com>
Approved-by: Daniil Glazko <daniil@glazko.su>
2018-08-09 20:19:40 +00:00
Forwolk
436ed620ad fix: getChunk 2018-08-09 22:33:47 +03:00
Forwolk
aa12a519ad Merge & resolve conflicts 2018-08-09 21:26:37 +03:00
Forwolk
291fe438c6 Merged in forwolk/fix/region-fix (pull request #3)
Region managed moved to CubicWorld
2018-08-08 22:18:27 +00:00
942873c7da Merged in dmitriymx/fix/gradle (pull request #4)
fix: gradle run application

Approved-by: Daniil Glazko <daniil@glazko.su>
2018-08-08 18:03:26 +00:00
5db14851ee fix: gradle run application
Example: gradle runApp -PworkDir="D:\mc-core"
2018-08-08 01:38:54 +03:00
Forwolk
f51dba79a6 Region managed moved to CubicWorld 2018-08-08 00:17:07 +03:00
e8b02b8e28 Merge tag 'WG-1' into develop
World Generator Gen1
2018-08-07 21:45:20 +03:00
2c611a888d hotfix: Oops! 2018-08-07 21:33:05 +03:00
156984ea84 Merge branch 'proto_1.12.2' into develop
Tests: FAILED
2018-08-07 10:05:32 +03:00
Daniil
993d9a8293 WarpPosition structure rework 2018-08-06 00:07:57 +07:00
Forwolk
94c8baa613 fix: Simple chunk section 2018-08-05 19:36:59 +03:00
Forwolk
ff71892fcb Biomes refactoring 2018-08-05 17:51:24 +03:00
Forwolk
15b1ff7370 Noise generator in separate class 2018-08-05 17:15:55 +03:00
Forwolk
5d3487d5ec Debug optimization 2018-08-05 17:10:21 +03:00
Forwolk
a23f7b15b5 Chunk implementation 2018-08-04 21:56:04 +03:00
Forwolk
a1ee3a240e Location.getChunk(); 2018-08-04 21:05:16 +03:00
Forwolk
895f59189d Chunk 16x256x16 2018-08-04 21:03:05 +03:00
Forwolk
be98784668 renamed: Chunk --> ChunkSection 2018-08-04 20:43:07 +03:00
1b4f2f8eac fix: ChunkDataPacket
Many thanks Forwolk!
2018-08-04 19:03:45 +03:00
4206354760 fix: NetOutputStream.writeVarInt() 2018-08-04 18:58:25 +03:00
Forwolk
60a7ad1963 Merged in forwolk/dev/world_gen (pull request #2)
Forwolk/dev/world gen
2018-08-04 15:54:17 +00:00
Forwolk
761aff3310 Water biomes 2018-08-04 16:20:40 +03:00
Forwolk
aa001b5fe2 fix: return null if reference is null 2018-08-04 16:17:31 +03:00
Forwolk
72989c60b7 Checking reference is not initialized 2018-08-04 14:56:03 +03:00
Forwolk
eab9947aa9 Checking on unloading 2018-08-04 14:31:43 +03:00
Forwolk
610981b7b8 World <-- Region <-- Chunk Weak references 2018-08-04 13:19:08 +03:00
Forwolk
d84e6ca749 Location world reference 2018-08-04 11:46:28 +03:00
3750b1340d Merge remote-tracking branch 'origin/dmitriymx/devcode' into proto_1.12.2
Warning! Potentially incorrect packet data! Need fixed
2018-08-02 23:56:14 +03:00
3ffd621e02 stash 5 2018-08-02 21:13:54 +03:00
2bc4e5e1b5 stash 4 2018-08-02 16:27:02 +03:00
Forwolk
f5057d5a92 Selecting best spawn location if it wasn't defined 2018-08-02 16:23:12 +03:00
55ef6eec66 stash 3 2018-08-02 15:59:11 +03:00
Forwolk
718e814806 Merge branch 'develop' into merge_branch
# Conflicts:
#	core/src/main/java/mc/core/Location.java
2018-08-02 15:56:19 +03:00
0152377289 stash 2 2018-08-02 14:25:29 +03:00
Forwolk
1abe220864 WORLD --[RegionManager]--> REGION --[ChunkLoader]--> CHUNK 2018-08-02 14:07:05 +03:00
Forwolk
7ec05c4e24 RegionManager 2018-08-02 14:03:04 +03:00
Forwolk
94e32a6921 World info saving 2018-08-02 13:14:59 +03:00
3d88f03a45 Remove LocationSerializer 2018-08-02 12:54:27 +03:00
e682abf662 Merge branch 'proto_1.12.2' into dmitriymx/devcode 2018-08-02 12:38:19 +03:00
1f3d103816 Move ByteArrayOutputNetStream another module 2018-08-02 12:38:03 +03:00
Forwolk
a9e6378101 More compact serialization 2018-08-02 11:41:09 +03:00
Forwolk
476b3624fe - unused class 2018-08-02 11:06:56 +03:00
Forwolk
aa44d70897 Serialization/Deserialization of world 2018-08-02 11:05:45 +03:00
Forwolk
7115da905b World generator refactoring 2018-08-02 09:43:05 +03:00
Forwolk
ef383b6e13 Interfaces implementations 2018-08-02 09:25:47 +03:00
Forwolk
f55c9bfb33 Serializers refactoring 2018-08-02 09:22:38 +03:00
Forwolk
ad4a088949 Interfaces 2018-08-02 09:15:59 +03:00
Forwolk
827c13f9b8 More generation stages 2018-08-02 08:38:00 +03:00
Forwolk
93edc88114 ReadWriteLock 2018-08-02 08:37:04 +03:00