madmaxoft
6449b5d11b
Revert "Add more move checks"
...
This reverts commit 989312c4e7
2014-05-26 16:38:39 +02:00
Mattes D
6ad411a8b8
Merge pull request #1003 from Howaner/GlobalFixes
...
Add more move checks
2014-05-26 10:14:05 +02:00
madmaxoft
24137e282b
Fixed prefab test initialization.
2014-05-26 10:05:51 +02:00
madmaxoft
1a742a2b52
Added support for Miners' Village.
...
The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors.
Fixes #1027 .
2014-05-25 23:50:16 +02:00
Alexander Harkness
a352ec3895
SEMICOLONS!
2014-05-25 19:46:16 +01:00
worktycho
6ce73ada6f
Update GroupManager.h
2014-05-25 19:17:01 +01:00
Alexander Harkness
50e29aba77
A fix that is better than #950 .
2014-05-25 18:32:42 +01:00
Tiger Wang
67308e4337
Fixed a food saturation issue
2014-05-25 13:46:50 +01:00
Tiger Wang
ee929793f0
Hopefully fixed piston duplication issues
...
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Tiger Wang
f55f5ec47f
Merge branch 'master' into achievementtranslate
...
Conflicts:
src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
Tycho
944d29c0ae
inject TestGlobals.h correctly
2014-05-24 14:09:51 +01:00
madmaxoft
96a22cd82c
Added Japanese village prefabs.
2014-05-24 15:03:39 +02:00
Tycho
7fac63cffb
Moved accessors to cpp file
2014-05-24 13:37:25 +01:00
Tycho
8f964886e0
Implemented style changes
2014-05-24 13:33:40 +01:00
Tycho
4ab8288116
Merge branch 'master' into chunksparsing/structs
2014-05-24 12:44:49 +01:00
Mattes D
97865bff7c
Fixed Mineshaft system size.
2014-05-23 13:01:50 +02:00
Mattes D
a4c964c888
Auto-enlargement for cGridStructGen cache.
2014-05-23 13:01:06 +02:00
Mattes D
941cb88ae4
Fixed datatype conversion warning.
2014-05-23 12:33:30 +02:00
Mattes D
64dbc45a00
Merge branch 'master' into VillageGen
...
* master:
Fixed profiling flags for MSVC.
Fixed cWither::KilledBy
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
Fixed MCADefrag compilation.
Derp
Should have fixed assumptions about entity width.
Fixed clanging errors.
Implemented cacti damage
2014-05-23 11:25:42 +02:00
madmaxoft
da843a1881
Updated plains village prefabs.
...
Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
2014-05-22 22:19:44 +02:00
madmaxoft
6aa7df367f
Villages have min and max density setting.
...
Also made roads use 3+9 scheme, instead of 3+5, for the house connectors.
Fixes #1020 .
2014-05-22 21:47:56 +02:00
madmaxoft
ebb1ef237a
Updated plains village prefabs.
...
The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
2014-05-22 08:57:57 +02:00
madmaxoft
85fc0dbd97
Changed desert village roads to gravel.
2014-05-21 23:17:09 +02:00
madmaxoft
efcae77828
Added second kind of desert village (FlatRoof).
2014-05-21 23:16:43 +02:00
Tycho
4b23472097
Fixed if spaces
2014-05-21 21:46:20 +01:00
Tycho
88c61a2e96
Fixed reversed comparisons to null
2014-05-21 21:18:14 +01:00
Tycho
93c0dcb1fe
Added space to ChunkData.cpp
2014-05-21 20:26:43 +01:00
Tycho
bd880603a5
Changed cChunkData::SetMeta to return a bool indicating whether the value changed
2014-05-21 20:18:09 +01:00
Tycho
5929ffbc40
Fixed stylistic issues
2014-05-21 20:08:34 +01:00
Tycho
024027db89
Renamed cChunkBuffer to cChunkData
2014-05-21 19:58:48 +01:00
Tycho
cdd3d11496
Fixed minor style issues
2014-05-21 18:33:54 +01:00
xdot
671c73c639
Merge pull request #1015 from mc-server/Stats
...
Statistics
2014-05-21 11:14:44 +03:00
andrew
7aeb8ce993
Fixed cWither::KilledBy
2014-05-21 10:59:14 +03:00
Tiger Wang
576e17ae08
Update CompositeChat.h
2014-05-20 22:49:21 +01:00
andrew
07baf9bdd3
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
2014-05-20 15:52:59 +03:00
Alexander Harkness
507df71845
Update Player.cpp
2014-05-20 13:35:39 +01:00
Tiger Wang
2bfe962e28
Fixed a cactus Y position issue
2014-05-19 22:15:39 +01:00
Tiger Wang
4008af6925
Simplified cacti conditions
2014-05-19 21:17:28 +01:00
Tiger Wang
3a9543178a
cCompositeChat message type is now formatted
2014-05-19 21:16:29 +01:00
Tiger Wang
42c36429d7
Added client translation to achievements
2014-05-19 20:40:56 +01:00
Julian Laubstein
7e2effb2d8
Changed the m_slotarea position
2014-05-19 15:46:36 +02:00
Alexander Harkness
1de4408a18
Merge pull request #1010 from mc-server/cactidamage
...
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Julian Laubstein
6687848a7e
Fixed warnings in IncrementalRedstoneSimulator
2014-05-19 14:49:18 +02:00
Julian Laubstein
fb7f2993bf
Fixed some warnings in Server.cpp, and in UI/
2014-05-19 14:34:34 +02:00
Alexander Harkness
6de0257bbe
Derp
2014-05-19 13:31:19 +01:00
Julian Laubstein
e9abf9a498
Rolled some changes back
2014-05-19 13:02:02 +02:00
Alexander Harkness
dc39d88d3f
Should have fixed assumptions about entity width.
...
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Julian Laubstein
cfbb256360
Fixed some warnings
2014-05-19 10:37:43 +02:00
Alexander Harkness
70cf4a5eaf
Fixed clanging errors.
...
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a
Implemented cacti damage
...
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
madmaxoft
e69a11012f
Merged branch 'master' into VillageGen.
2014-05-18 23:10:23 +02:00
madmaxoft
ec50c0f9e1
Updated SandVillage prefabs to latest Gallery content.
...
This fixes sand village generation.
2014-05-18 23:09:39 +02:00
madmaxoft
a651c865e4
There's no "round" function in MSVC2008.
2014-05-18 22:49:27 +02:00
madmaxoft
e09a04a23a
Fixed datatype truncation in Diff() template.
2014-05-18 22:36:31 +02:00
Mattes D
ac00568183
Merge pull request #998 from mc-server/StatManager
...
Statistic Manager
2014-05-18 22:30:34 +02:00
Julian Laubstein
40ce737a7e
removed the <list> include
2014-05-18 17:30:21 +02:00
Julian Laubstein
cfd3c33dfa
Added unload <pluginname> command
2014-05-18 17:16:02 +02:00
Tycho
8a0d3f7921
Fixed issue with types not being defined for an unused parameter
2014-05-18 15:37:17 +01:00
madmaxoft
a7e52e51dc
Village roads are drawn properly.
2014-05-17 22:26:09 +02:00
madmaxoft
7004043c61
Village houses are height-adjusted onto the terrain.
2014-05-17 21:54:04 +02:00
Julian Laubstein
19f4cd0547
Added load cmd
2014-05-17 19:39:16 +02:00
Julian Laubstein
6951b68aaf
Added load command in the cServer class
2014-05-17 18:38:33 +02:00
Tycho
f451075c1f
derp
2014-05-17 15:32:28 +01:00
Tycho
1f98f21dd1
fixed assignment bugs and Skylight bug
2014-05-17 15:11:58 +01:00
worktycho
4e841146b8
Fix assignment ops 2
2014-05-17 14:29:15 +01:00
worktycho
7777da379d
Fix assignment operators
2014-05-17 14:04:44 +01:00
madmaxoft
fc5c3abcba
Updated PlainsVillage prefabs to the latest Gallery contents.
2014-05-17 02:26:44 +02:00
Howaner
989312c4e7
Add more move checks
...
- Invalid X/Y/Z/Stance check (std::isnan)
- Illegal stance
- Illegal position (32.000.000 is the world size)
2014-05-16 22:04:19 +02:00
tonibm19
5724dcc2c1
Fixed anvil exp removing
2014-05-16 19:33:57 +02:00
Mattes D
0e43f88668
Merge pull request #994 from Howaner/GlobalFixes
...
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
2014-05-15 21:16:04 +02:00
Howaner
28a9c16db2
Fix compile error.
2014-05-15 19:59:52 +02:00
Howaner
6c5ff597bb
Move radius check.
2014-05-15 19:58:48 +02:00
madmaxoft
70b0547499
Fixed a NULL ptr failure in GridStructGen.
...
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
2014-05-15 16:03:45 +02:00
madmaxoft
56f7ad2cd9
Changed village generator defaults to more reasonable values.
2014-05-15 10:44:08 +02:00
madmaxoft
34e5f0c164
Changed village road generation to use multiple prefabs.
2014-05-15 10:43:54 +02:00
madmaxoft
f5fdbdaf29
VillageGen rewritten using BFSPieceGenerator.
...
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
2014-05-15 00:14:06 +02:00
madmaxoft
3660ce6834
cPrefab can be constructed in code.
2014-05-15 00:12:01 +02:00
andrew
466ff2204f
Fixes
2014-05-13 14:53:15 +03:00
madmaxoft
9c8e8ef7ae
VillageGen: Added well placement and the general algorithm description.
2014-05-12 22:43:59 +02:00
andrew
aea866f5b1
Movement Statistics
2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9
cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()
2014-05-12 17:05:09 +03:00
archshift
3a5e04d118
More switch warnings.
2014-05-11 16:54:42 -07:00
archshift
3f9e00a3f3
Fixed a few more switch warnings.
2014-05-11 16:28:48 -07:00
archshift
6c57b38b74
Fixed a warning and a complaint about a never-read variable.
2014-05-11 13:44:30 -07:00
madmaxoft
c0727c4265
Initial VillageGen implementation.
...
WIP, doesn't generate anything yet.
Ref.: 740.
2014-05-11 22:35:41 +02:00
andrew
6cb3483954
Fixed compilation
2014-05-11 21:41:25 +03:00
Tycho
c46f240d81
Added several more testsfor arrays and coordinates
2014-05-11 19:24:09 +01:00
Tycho
5d39ecc64b
Fixed bug that caused Array Setters to always create segments
2014-05-11 18:42:38 +01:00
andrew
e3c6c8f3dd
Fixed stat serialization
2014-05-11 20:30:54 +03:00
Tycho
9568c223ff
SkyLight defaults to 0xFF
2014-05-11 18:24:21 +01:00
Tycho
9278bb732d
Fixed a bug in writting zeros to a non-allocated section
2014-05-11 15:52:02 +01:00
andrew
c7c3724a3e
Statistic Manager
2014-05-11 14:57:06 +03:00
Howaner
5c9f89526a
Rename HandleBlockDigCancel to FinishDigAnimtion.
2014-05-11 11:56:15 +02:00
Mattes D
28815252e6
Merge branch 'master' into SslWebAdmin
2014-05-10 21:27:57 +02:00
Mattes D
7e71f1f7dc
Merge pull request #993 from mc-server/GridStructGen
...
Grid struct gen
2014-05-10 21:21:44 +02:00
Tycho
7ca33bd832
Fixed stupid error
2014-05-10 17:56:59 +01:00
Tycho
43fc1471a1
Merge branch 'master' into chunksparsing/structs
2014-05-10 17:55:43 +01:00
Tycho
0adb5c94b8
Fixed stupid buffer overflow in array setblocks
2014-05-10 17:46:49 +01:00
STRWarrior
079f8cd535
Fixed the console saying no plugins are loaded.
2014-05-10 17:55:39 +02:00
STRWarrior
4ca178f24a
Fixed compile problem.
2014-05-10 17:09:48 +02:00
STRWarrior
7f3683cfab
A portal block now chooses a number between 2000 and 0
2014-05-10 17:03:02 +02:00
STRWarrior
3b1f11bd6a
Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman.
2014-05-10 16:43:06 +02:00
Tycho
cb6200345c
Fixed bug in setting metas
2014-05-10 15:19:06 +01:00
Tycho
d478e3cfb1
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.h
2014-05-10 05:05:44 -07:00
Mattes D
683b839e2b
Client cert is not requested.
2014-05-10 09:21:29 +02:00
Howaner
eb0f713b6a
Add block place/break distance check.
2014-05-09 23:43:00 +02:00
Howaner
c8631d9a9b
Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.
2014-05-09 23:10:02 +02:00
Mattes D
a38d8b6513
Merge pull request #992 from mc-server/coverity_fixes
...
Coverity fixes
2014-05-09 21:20:27 +02:00
Mattes D
839cff62ad
Merged branch 'master' into GridStructGen.
2014-05-09 20:59:59 +02:00
Mattes D
a2e18f0e01
Fixed size_t in FireworksSerializer.
2014-05-09 20:32:27 +02:00
Mattes D
1a5a123301
Fixed message formatting.
2014-05-09 20:16:29 +02:00
Mattes D
a936736acd
Removed unused constants from MineShafts and Ravines.
2014-05-09 20:13:20 +02:00
Mattes D
294b7ca24a
Even more size_t fixes.
2014-05-09 20:05:00 +02:00
Mattes D
d67ea97a26
More size_t fixes.
2014-05-09 19:57:59 +02:00
Mattes D
0fc60edaeb
Removed an unused NetherFortGen variable.
2014-05-09 19:53:57 +02:00
Mattes D
b997fbaf45
Removed an unused macro.
2014-05-09 19:35:35 +02:00
Mattes D
5b54dc3eac
Build fixes after the last size_t batch.
2014-05-09 19:33:22 +02:00
worktycho
c4cd201f18
Range Check on schematic size
...
Fixes CID 55830
2014-05-09 17:39:13 +01:00
Mattes D
dd350bc1f3
World pre-generation distance is settable in world.ini.
2014-05-09 18:32:04 +02:00
Mattes D
56ad2c2124
Lighting thread disabled its chunkstays before deleting them.
2014-05-09 18:32:03 +02:00
Mattes D
fb58ef55be
Fixed MSVC 64-bit build warnings.
2014-05-09 18:32:03 +02:00
worktycho
99af4453ef
Check the height and width values read.
...
Fixes CID 55831
2014-05-09 17:30:47 +01:00
Mattes D
ea593dcaad
Ravines rewritten using cGridStructGen.
...
Ref.: #987 .
2014-05-09 18:30:39 +02:00
worktycho
17c7c31130
Initialise m_HasTeleported in both constructors
2014-05-09 16:56:29 +01:00
Mattes D
95ead1128f
cWormNestCaves rewritten using cGridStructGen.
...
Ref.: #987 .
2014-05-09 11:16:13 +02:00
Mattes D
14543aa3fc
Mineshafts generator rewritten to use GridStructGen.
2014-05-09 10:59:33 +02:00
Mattes D
ee680990ba
Fixed cGridStructGen.
...
Now cNetherFortGen works with the new architecture.
2014-05-08 21:10:55 +02:00
Mattes D
ccf44f18d1
Merge branch 'master' into GridStructGen
2014-05-08 20:17:31 +02:00
Mattes D
c4ea25e136
Fixed MSVC 64-bit build warnings.
2014-05-08 20:16:35 +02:00
madmaxoft
564261cfd9
cNetherFortGen uses cGridStructGen.
...
WIP, this doesn't work properly yet.
2014-05-07 22:34:06 +02:00
Mattes D
d1b719885d
Merge pull request #989 from Howaner/Anvil
...
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
Mattes D
d9cdd4441e
Merge pull request #853 from Howaner/Slabs
...
Grass now grows under up-side-down slabs
2014-05-07 22:18:23 +02:00
Howaner
c96a27f4ae
Superfluous method override.
2014-05-07 21:36:26 +02:00
Howaner
df71cc931b
Missing comma
2014-05-07 21:32:52 +02:00
Howaner
10e3c262db
Send item back to the client when the item get damage.
2014-05-07 21:00:21 +02:00
Howaner
fbb6404cc8
Change m_RepairCost to int.
2014-05-07 20:43:37 +02:00
Howaner
bc4a51781e
Add lava and water check to block handlers.
2014-05-07 20:37:36 +02:00
Howaner
36a2aa2f21
Rename CanChangeDirtToGrass to CanDirtGrowGrass
2014-05-07 12:59:48 +02:00
Howaner
f5fe368220
Merge branch 'master' into Slabs
2014-05-07 12:54:58 +02:00
Howaner
e86bf64867
Where is the problem with clang?
2014-05-07 12:45:20 +02:00
Howaner
80bcc43c7b
Fix MagmaCube save.
2014-05-07 12:43:21 +02:00
Howaner
d6cb6e0423
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.
2014-05-07 12:30:30 +02:00
madmaxoft
da5db2ddf9
Initial cPrefabPiecePool refactoring.
...
Ref.: #986 .
2014-05-07 11:01:30 +02:00
Tiger Wang
e5b42b9f16
Fixed wires powering wires diagonally below them
2014-05-06 23:05:14 +01:00
Mattes D
66c5c81e02
Merge pull request #985 from Howaner/Anvil
...
Add anvil inventory.
2014-05-06 21:46:50 +02:00
Mattes D
e400b1acd8
Merge pull request #927 from mc-server/fixes
...
Small fixes
2014-05-06 21:44:55 +02:00
madmaxoft
ac1c3ba5d9
Fixed an extra space.
2014-05-06 21:43:31 +02:00
Tiger Wang
696a7bc52e
Merge branch 'master' into fixes
...
Conflicts:
src/Vector3.h
2014-05-06 20:15:19 +01:00
Tiger Wang
cca8376a01
Suggestions'd #2
2014-05-06 19:38:01 +01:00
Howaner
954b59d6f4
Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()
2014-05-06 19:38:09 +02:00
