Mattes D
|
6de45037c7
|
Merge pull request #1018 from mc-server/VillageGen
Village gen
|
2014-05-31 19:11:13 +02:00 |
|
STRWarrior
|
d1b23060ad
|
Used recommendations
|
2014-05-31 14:14:55 +02:00 |
|
Howaner
|
683da71c0f
|
Moved the IsDoor check before the meta get.
|
2014-05-31 11:48:54 +02:00 |
|
Howaner
|
0b7ed0f493
|
Add doxy-comment
|
2014-05-31 11:47:03 +02:00 |
|
madmaxoft
|
600c93bdc1
|
Updated PlainsVillage prefabs.
|
2014-05-31 10:33:29 +02:00 |
|
madmaxoft
|
f4e9c88dcd
|
Fixed a memory leak in VillagGen.
|
2014-05-31 10:33:12 +02:00 |
|
Mattes D
|
0b758946ac
|
Merge pull request #951 from worktycho/chunksparsing/structs
Chunksparsing with segments
|
2014-05-31 10:12:54 +02:00 |
|
Howaner
|
2030800ad7
|
Set DraggingItem to Slot directly.
|
2014-05-31 00:27:24 +02:00 |
|
Howaner
|
d422aa4081
|
Fix DBL bug.
|
2014-05-31 00:25:20 +02:00 |
|
Howaner
|
01fc93857c
|
Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0"
|
2014-05-31 00:22:24 +02:00 |
|
Howaner
|
843288493e
|
Fix the furnace result slot.
|
2014-05-30 23:41:17 +02:00 |
|
madmaxoft
|
b9d306a801
|
Fixed bindings for cCompositeChat:SetMessageType().
|
2014-05-30 22:42:00 +02:00 |
|
madmaxoft
|
8bf7aed67c
|
Updated PlainsVillage and AlchemistVillage.
|
2014-05-30 22:40:19 +02:00 |
|
Howaner
|
d8e16f8c1f
|
Better SetOpen() and IsOpen() function from the doors.
|
2014-05-30 22:22:42 +02:00 |
|
Tycho
|
f26ddac619
|
removed NULL assignment to const value
|
2014-05-30 14:50:30 +01:00 |
|
Tycho
|
d854d3af1c
|
removed unneded addressof
|
2014-05-30 14:43:33 +01:00 |
|
madmaxoft
|
e136f6e0f5
|
Fixed cChunkData nibble copying.
|
2014-05-30 11:35:29 +02:00 |
|
madmaxoft
|
730e36844e
|
Test failures break into MSVC debugger.
|
2014-05-30 11:01:13 +02:00 |
|
madmaxoft
|
0b60caac4a
|
Test failures are reported verbosely and into the debug console on Win.
|
2014-05-30 10:56:12 +02:00 |
|
madmaxoft
|
5368c5dd79
|
Fixed sign comparison.
|
2014-05-30 09:49:57 +02:00 |
|
madmaxoft
|
0e2138736c
|
Fixed wrong copy sizes in cChunkData.
|
2014-05-30 09:17:17 +02:00 |
|
madmaxoft
|
8c4dd5dcfd
|
Attempt at fixing an unresolved symbol in gcc / clang.
|
2014-05-29 21:41:44 +02:00 |
|
worktycho
|
be10f07db0
|
Fix bug when a_Idx is not a multiple of SectionBLockCount
|
2014-05-29 19:44:36 +01:00 |
|
worktycho
|
901e3ec494
|
Derp
|
2014-05-29 19:35:47 +01:00 |
|
worktycho
|
b50181e361
|
fix underflow
Wish c++ could specify saturating unsigned underflow.
|
2014-05-29 19:29:06 +01:00 |
|
madmaxoft
|
59068b77b7
|
Fixed wrong block sizes for copying / setting.
|
2014-05-29 20:21:39 +02:00 |
|
worktycho
|
0cfee5d141
|
Fixed Wrong types in nibble sizeofs
|
2014-05-29 19:10:35 +01:00 |
|
Howaner
|
b4ba220934
|
Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug.
|
2014-05-29 19:21:56 +02:00 |
|
worktycho
|
80fe19c0e2
|
Fixed overflow bug
|
2014-05-29 17:41:07 +01:00 |
|
madmaxoft
|
f7777e8c75
|
Added comments, reformatted code.
|
2014-05-29 18:25:08 +02:00 |
|
Tiger Wang
|
aa4477822a
|
Suggestions
|
2014-05-29 16:03:41 +01:00 |
|
Tiger Wang
|
3549d0d5e6
|
More comments!
|
2014-05-29 15:59:39 +01:00 |
|
Tiger Wang
|
bacc873a17
|
Revert "Fixed a food saturation issue"
This reverts commit 67308e4337.
|
2014-05-29 12:12:10 +01:00 |
|
worktycho
|
d9c667d28f
|
Add comment
|
2014-05-29 12:04:37 +01:00 |
|
Tiger Wang
|
365c6f50bd
|
Changed block send queue to use vectors
As suggested by @worktycho.
|
2014-05-29 11:57:06 +01:00 |
|
Tiger Wang
|
ae4371a733
|
Fixed piston power checking
|
2014-05-29 11:56:22 +01:00 |
|
madmaxoft
|
e5187aa645
|
Fixed a memory leak in cPOCPieceGenerator
|
2014-05-29 09:19:20 +02:00 |
|
madmaxoft
|
b56033d541
|
Merge remote-tracking branch 'origin/master' into VillageGen
|
2014-05-29 09:14:47 +02:00 |
|
madmaxoft
|
999662503a
|
Fixed forgotten changes.
|
2014-05-29 09:09:11 +02:00 |
|
madmaxoft
|
10273f64a2
|
Fixed a crash in message formatter.
The code would fail if a message is sent to a player not yet added to a world.
|
2014-05-28 22:41:23 +02:00 |
|
madmaxoft
|
81f756cbda
|
cChunkData: Normalized code style.
|
2014-05-28 22:40:19 +02:00 |
|
madmaxoft
|
7ec44951a0
|
Fixed cChunkData formatting.
|
2014-05-28 16:34:25 +02:00 |
|
madmaxoft
|
d29b242674
|
Fixed a memory leak in cPrefabPiecePool.
The pool pieces weren't freed upon pool destruction.
|
2014-05-28 16:33:10 +02:00 |
|
madmaxoft
|
dff71823d4
|
Merge branch 'master' into VillageGen
|
2014-05-27 22:09:30 +02:00 |
|
madmaxoft
|
6b41d1a422
|
Added AlchemistVillage prefabs (Thanks, KingsCraftAu).
|
2014-05-27 22:08:20 +02:00 |
|
madmaxoft
|
71256c98ed
|
Fixed testing weights in PlainsVillages.
|
2014-05-27 22:06:49 +02:00 |
|
madmaxoft
|
ff99373237
|
cPieceGenerator chooses starting pieces based on weights.
Fixes #1033.
|
2014-05-27 22:05:50 +02:00 |
|
madmaxoft
|
6c25c356c7
|
Biome generators: biome lists can contain spaces.
|
2014-05-27 21:18:15 +02:00 |
|
Tycho
|
19df18c461
|
Fixed test globals to work with precompiled headers
|
2014-05-27 12:46:22 +01:00 |
|
archshift
|
c204735f38
|
ClientHandle.cpp: Process look before pos
|
2014-05-27 00:28:46 -07:00 |
|
archshift
|
0a3570bc9d
|
ClientHandle.cpp: remove redundant code
HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
|
2014-05-26 14:15:32 -07:00 |
|
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 |
|