Daniil
|
b73ed2c4f5
|
Revert "WarpPosition structure rework"
This reverts commit 993d9a8
|
2018-08-10 03:34:25 +07:00 |
|
Daniil
|
dc0b85c23b
|
Reverted location-fix
|
2018-08-10 03:34:11 +07:00 |
|
Daniil
|
57dc918888
|
Minor merging fixes
|
2018-08-10 03:27:57 +07:00 |
|
Daniil
|
0ea5465518
|
Merge remote-tracking branch 'origin/develop' into anarok/merge/loop-3
# Conflicts:
# build.gradle
# proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
# settings.gradle
|
2018-08-10 03:24:30 +07:00 |
|
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 |
|
Daniil
|
546a13d2a1
|
Event-loop module refactoring and commenting
|
2018-08-09 23:16:16 +07: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 |
|
Daniil
|
0269b0b0c1
|
Minor code-style changes
Timings dump format change
Pre-tests (not functional right now)
|
2018-08-08 22:36:08 +07:00 |
|
|
|
9b35c63333
|
optimize imports
|
2018-08-08 13:26:43 +03:00 |
|
|
|
a0f91730d0
|
apply upgraded Location & EntityLocation
|
2018-08-08 13:26:35 +03:00 |
|
|
|
83de8629e1
|
refactory Location & Look
|
2018-08-08 13:26:23 +03:00 |
|
|
|
fc4dd46610
|
Merge remote-tracking branch 'origin/forwolk/location-cloning' into dmitriymx/location-refactory
|
2018-08-08 12:20:45 +03: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 |
|
Daniil
|
6bd8b60832
|
Timings submodule refactoring
|
2018-08-07 16:27:44 +07:00 |
|
Daniil
|
22dbf8caa8
|
Timings are now written to the file
|
2018-08-07 16:11:27 +07:00 |
|
Daniil
|
b2d3792384
|
Timings IO foundation
|
2018-08-07 16:06:34 +07:00 |
|
|
|
156984ea84
|
Merge branch 'proto_1.12.2' into develop
Tests: FAILED
|
2018-08-07 10:05:32 +03:00 |
|
Daniil
|
000816f110
|
Timings foundation
|
2018-08-07 13:29:05 +07:00 |
|
Daniil
|
a41b0d2448
|
TODO commit
|
2018-08-06 23:39:54 +07:00 |
|
Daniil
|
b239cd5b30
|
Merge branch 'forwolk/dev/location-world' into anarok/loop-3
|
2018-08-06 21:55:06 +07:00 |
|
Daniil
|
0ca3e4db6f
|
Proper Look structure refactoring
|
2018-08-06 00:23:28 +07:00 |
|
Daniil
|
993d9a8293
|
WarpPosition structure rework
|
2018-08-06 00:07:57 +07:00 |
|
Daniil
|
f387a900c4
|
Merge branch 'forwolk/dev/location-world' into anarok/loop-3
|
2018-08-05 23:39:02 +07:00 |
|
Forwolk
|
94c8baa613
|
fix: Simple chunk section
|
2018-08-05 19:36:59 +03:00 |
|
Daniil
|
ad4361640a
|
Merge branch 'forwolk/dev/location-world' into anarok/loop-3-merge
# Conflicts:
# core/src/main/java/mc/core/Location.java
|
2018-08-05 23:10:44 +07:00 |
|
Daniil
|
e6dfc1861b
|
Implemented simple resource lock fetchers
|
2018-08-05 22:56:16 +07:00 |
|
Daniil
|
3b24c2fed4
|
Fixed task scheduling
|
2018-08-05 22:33:39 +07: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 |
|
Daniil
|
561dc3a1ce
|
Fixed plugin synchronization
|
2018-08-05 16:13:42 +07:00 |
|
Daniil
|
ba558ea7d1
|
Fixed plugin synchronization
|
2018-08-05 13:50:34 +07:00 |
|
Daniil
|
147b2ff28d
|
Migrated ResourceRunnable to use PoorMansLock
|
2018-08-05 13:46:00 +07:00 |
|
Daniil
|
6ab8658399
|
LockObserveList implementation, tests for Lock and List
|
2018-08-05 13:40:02 +07:00 |
|
Daniil
|
b5a7942b67
|
Fixed reentrant locking mechanism for PoorMansLock
|
2018-08-05 13:15:31 +07:00 |
|
Daniil
|
afe88e260c
|
PoorMansLock implementation
|
2018-08-05 13:09:54 +07: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 |
|
Daniil
|
32fa42bdc3
|
Merge tweak
|
2018-08-05 00:12:05 +07:00 |
|
Daniil
|
9eaa9d7af0
|
Merge branch 'develop' into anarok/loop-3-merge
# Conflicts:
# build.gradle
# settings.gradle
|
2018-08-05 00:11:17 +07:00 |
|
Daniil
|
581fad36c2
|
Log dispatch refactoring
|
2018-08-04 23:57:59 +07:00 |
|
Daniil
|
8a2b2eb1f5
|
First implementation for plugin synchronization
|
2018-08-04 23:54:50 +07:00 |
|
