archshift
b2f40a7a11
Removed unused assignments.
2014-04-25 18:18:46 -07:00
archshift
73edd2b961
Fixed a couple more warnings.
2014-04-25 17:15:12 -07:00
archshift
2c0bb7b717
Moved the weather picker out of TickWeather(), squashing a warning and improving readability.
2014-04-25 16:55:38 -07:00
jfhumann
26568a852e
Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618)
2014-04-26 01:35:25 +02:00
archshift
c124fc39d4
Removed impossible default case.
...
Squashed a warning.
2014-04-25 16:32:34 -07:00
archshift
083cec5a09
Removed extraneous switch{} in Start()
...
Squashed a warning.
2014-04-25 16:27:15 -07:00
jfhumann
f2b7cb138f
Fixes resource leaks in the yggdrasil authenticator. (CID 43617)
2014-04-26 01:21:06 +02:00
archshift
5ffdaa8142
Moved huge conditional out of InStateChasing(), improving readability
...
Squashed a warning.
2014-04-25 15:49:11 -07:00
jfhumann
c8d5fcfffa
Fix for minor resource leak (CID 43616)
2014-04-26 00:43:01 +02:00
Howaner
e5683ede63
Change m_InvulnerableTicks description again again :D
2014-04-26 00:41:00 +02:00
Howaner
ed1aa02d0c
Change m_InvulnerableTicks description again.
2014-04-26 00:37:40 +02:00
Howaner
ad1410f46e
Change m_InvulnerableTicks description
2014-04-26 00:37:09 +02:00
Howaner
7fd9fe9d5f
Merge branch 'master' into GlobalFixes
2014-04-26 00:34:42 +02:00
Howaner
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
Mattes D
a4f21908b2
Merge pull request #920 from axisd/master
...
Mobs shouldn't burn when it's Raining
2014-04-25 23:48:00 +02:00
Mattes D
43cca14763
Merge pull request #935 from archshift/projectile-fixes
...
Chicken eggs and ender pearls can hit entities.
2014-04-25 23:41:04 +02:00
jfhumann
03402efc49
Should fix CIDs 43631, 43632 and 43633
2014-04-25 23:39:10 +02:00
Tiger Wang
05f52192c9
Implemented comments
2014-04-25 21:22:43 +01:00
archshift
0e0c9d8248
Missed these CMakeLists.
2014-04-25 12:24:09 -07:00
archshift
d64e46186f
Merge remote-tracking branch 'upstream/master'
2014-04-25 10:50:10 -07:00
archshift
e47dab84f3
Cmake generated projects for IDEs include headers in project files.
2014-04-25 09:56:15 -07:00
madmaxoft
6d167b370e
Fixed C++11 check for SharedPtr.
2014-04-25 16:05:24 +02:00
archshift
8aa82d048d
Creator not user.
2014-04-25 06:26:08 -07:00
archshift
256691461b
Comments for TrySpawnChicken() and TeleportUser().
2014-04-25 05:49:18 -07:00
archshift
cb7f1ee4bb
Rename spawn chicken method, Initialize m_HasTeleported.
2014-04-25 05:39:35 -07:00
r.ramazanov
4cd2d57c64
Fix formatting
2014-04-25 12:06:22 +04:00
madmaxoft
f3dfc0349d
Added shared_ptr handling for C++03 mode.
2014-04-25 09:48:52 +02:00
r.ramazanov
827c3760db
Fix for clang
2014-04-25 10:58:48 +04:00
Mattes D
a40108da90
Merge pull request #932 from Howaner/Inventory
...
Fix armor in survival mode.
2014-04-25 08:11:49 +02:00
r.ramazanov
a72744f5c3
Mobs shouldn't burn when it's Raining & Mob Knockback is far too much
2014-04-25 10:08:36 +04:00
r.ramazanov
1c26eb715b
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-25 10:06:12 +04:00
archshift
62e5234535
Small changes; warning fixing.
2014-04-24 20:25:03 -07:00
archshift
ec9787bae2
Chicken eggs and ender pearls can hit entities.
...
Fixed warning by adding dedicated m_HasTeleported for fired arrows.
2014-04-24 19:16:16 -07:00
archshift
0f7bd9fc77
Oops, fixed that.
2014-04-24 19:14:00 -07:00
archshift
624deea6c4
Giants!
...
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
2014-04-24 18:11:11 -07:00
archshift
b008ba5d98
Refactored SendChat(), placing the message-type formatting into its own function.
...
Removed default case warning in the process.
2014-04-24 18:03:49 -07:00
Howaner
ccd9023202
Add commit what the code is doing.
2014-04-25 00:10:52 +02:00
Howaner
cee70390fa
Add unkown armor warning and fix armor stacks.
2014-04-25 00:09:22 +02:00
Tiger Wang
3397f9faec
Fixed indent
2014-04-24 22:07:20 +01:00
Tiger Wang
c949c1e755
Implemented suggestions
2014-04-24 22:03:47 +01:00
Howaner
376dc880b3
Add armor to switch() in ItemHandler.cpp
2014-04-24 23:03:04 +02:00
Tiger Wang
acbd4e6503
Another small speed improvement?
2014-04-24 21:52:01 +01:00
Tiger Wang
ffce8d6907
Implemented suggestions
2014-04-24 21:49:56 +01:00
madmaxoft
4f49c978cf
Replaced MSVC-specific decorators with our universal ones.
2014-04-24 22:43:20 +02:00
madmaxoft
616fb15508
cByteBuffer uses void * instead of char * in data interface.
...
This makes it compatible with any pointer type.
2014-04-24 22:42:33 +02:00
madmaxoft
a02e8e8021
Declared a SharedPtr that hopefully resolves on all platforms.
...
MSVC2008 has it in std::tr1, all the others in std.
2014-04-24 22:30:19 +02:00
madmaxoft
c7694687f5
Fixed filename case.
2014-04-24 22:15:21 +02:00
Mattes D
85e0b0eae9
Merge pull request #929 from archshift/master
...
Renamed mob source files to better fit the CamelCase naming style.
2014-04-24 22:12:28 +02:00
madmaxoft
e33573ab59
Attempted CMake inclusion for PolarSSL++.
2014-04-24 21:53:42 +02:00
madmaxoft
c4b4447a3a
Authenticator uses some C++ SSL objects.
2014-04-24 21:53:41 +02:00
madmaxoft
c701adbd24
Initial C++ SSL classes.
2014-04-24 21:53:41 +02:00
madmaxoft
449cf77420
Changed cByteBuffer constructor to take a size_t instead of int.
2014-04-24 21:52:24 +02:00
archshift
8fc45c5730
Fixed class capitalization for the cave spider.
2014-04-24 12:18:17 -07:00
Howaner
9cbb3a339f
Fix armor in survival mode.
2014-04-24 20:41:25 +02:00
Tiger Wang
48904ae201
Merge branch 'master' into fixes
...
Conflicts:
src/World.h
2014-04-24 18:57:25 +01:00
r.ramazanov
d126adc124
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-24 10:32:26 +04:00
archshift
06819595b0
Fixed references to renamed files.
2014-04-23 15:25:10 -07:00
archshift
c2f2ef7cb4
Rename mob source files to fit CamelCase.
...
Rename Cavespider.cpp to CaveSpider.cpp
Rename Cavespider.h to CaveSpider.h
Rename Magmacube.cpp to MagmaCube.cpp
Rename Magmacube.h to MagmaCube.h
Rename Zombiepigman.cpp to ZombiePigman.cpp
Rename Zombiepigman.h to ZombiePigman.h
2014-04-23 15:22:49 -07:00
madmaxoft
695baed226
Updated docs for StringToEnchantmentID.
...
Ref.: mc-server/Core#67
2014-04-23 23:06:29 +02:00
madmaxoft
6d7da6b15d
Updated NetherFort prefabs to latest Gallery content.
2014-04-23 23:03:09 +02:00
Tiger Wang
7f5cf417de
Some change to Entity.cpp
...
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
Tiger Wang
f763242e5c
Small changes
2014-04-23 21:06:07 +01:00
STRWarrior
9660c4816f
The new leaves don't decay anymore.
...
Fixes #792
2014-04-23 16:57:32 +02:00
r.ramazanov
103c867f1f
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-23 18:15:28 +04:00
r.ramazanov
5deb35c5cf
Mobs shouldn't burn when it's Raining #906
...
Mob Knockback is far too much #776
2014-04-23 18:15:04 +04:00
Mattes D
0d0e0af2d8
Merge pull request #925 from archshift/master
...
Added monsters.ini rule for fireproof mobs.
2014-04-23 09:46:06 +02:00
archshift
8768669428
Renamed getter and setter for IsFireproof.
2014-04-23 00:12:37 -07:00
archshift
e1476ebb26
Added IsFireproof hook for monsters.ini
2014-04-22 13:17:42 -10:00
archshift
a37b36adab
Fireproof status getter and setter.
2014-04-22 12:59:31 -10:00
madmaxoft
2533842ca4
Updated NetherFort prefabs from the Gallery server.
2014-04-22 22:26:01 +02:00
Mattes D
b3a9b73278
Merge pull request #923 from archshift/master
...
Added flag for fireproof entities.
2014-04-22 15:04:04 +02:00
archshift
06f41699af
Fixed indentation and changed m_Fireproof to m_IsFireproof.
2014-04-22 02:36:39 -10:00
archshift
bca7f29490
Lay foundation for fireproof entities.
...
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
2014-04-22 01:59:34 -10:00
Mattes D
6492aa000b
Merge pull request #909 from jfhumann/fixes
...
Bug fixes and optimizations.
We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00
jfhumann
865e8e22e5
reverted the revert of the minecart collision detection fix.
2014-04-21 14:04:36 +02:00
r.ramazanov
a967313839
Mobs shouldn't burn when it's Raining #906
2014-04-21 13:13:25 +04:00
madmaxoft
e3ec857264
Added prefab hitboxes.
...
The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish.
2014-04-21 10:31:30 +02:00
madmaxoft
7c6ef26be9
Added enchantment combining into cEnchantments.
2014-04-21 10:31:30 +02:00
madmaxoft
bdd8b43b3e
Replaced X.size() with X.empty(), where applicable.
2014-04-21 10:31:29 +02:00
Mattes D
4c7621ed16
Fixed a warning in CraftingRecipes.
2014-04-21 09:21:31 +02:00
Mattes D
9f58046b5b
Allow 1.6.4 Forge clients to log in.
...
Fixes #913 .
2014-04-21 08:22:25 +02:00
Mattes D
d7f88396e0
Fixed enchanting return values.
...
Items are enchanted in those cases, so return true.
Ref.: #914 .
2014-04-21 06:41:11 +02:00
madmaxoft
7b246d9a8d
Fixed MSVC compilation.
2014-04-20 13:50:37 +02:00
daniel0916
098be1c7fc
Fixed Code
2014-04-19 22:37:29 +02:00
daniel0916
cb90029f72
Merge branch 'master' into Enchanting
2014-04-19 20:56:29 +02:00
jfhumann
f48d43f050
Fixed Flint and Steel, reverted Minecart change, renamed a parameter name
2014-04-19 20:51:52 +02:00
jfhumann
4dd7610381
Declared one mutex as mutable in order to allow for const correct get accessors.
2014-04-19 17:53:02 +02:00
daniel0916
11ff36c683
Fixed Code (2)
2014-04-19 16:10:05 +02:00
daniel0916
a6de7bf1cd
Fixed Code
2014-04-19 15:10:50 +02:00
madmaxoft
6eac586794
Fixed formatting, made function static.
2014-04-19 13:05:58 +02:00
madmaxoft
5f3df1445f
Merge remote-tracking branch 'origin/Beacons'
2014-04-19 13:01:28 +02:00
jfhumann
5bed1c09bc
Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does.
2014-04-18 22:47:59 +02:00
jfhumann
fde1555352
Small style changes
2014-04-18 22:20:24 +02:00
jfhumann
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
Tiger Wang
19358fc7d5
Compilation fix
2014-04-18 20:20:00 +01:00
Tiger Wang
598719d7ab
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-18 20:17:52 +01:00
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
daniel0916
b239de66db
Merge branch 'master' into Enchanting
2014-04-18 15:04:32 +02:00
madmaxoft
6d3bde5221
Added performance test of the nether fort generator.
2014-04-18 14:35:33 +02:00
daniel0916
56613d2b22
Fixed Errors
2014-04-18 14:34:29 +02:00
daniel0916
3efd232829
Removed old include
2014-04-18 14:10:31 +02:00
Tiger Wang
6cb63a768d
Fixed #906
2014-04-18 12:59:14 +01:00
Tiger Wang
200ea6254c
Fixed #904
2014-04-18 12:54:17 +01:00
madmaxoft
193dcca1e3
Removed unsupported C++11 features.
2014-04-18 09:36:11 +02:00
Mattes D
b7e074b10b
Merge pull request #891 from mc-server/fixes
...
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
madmaxoft
6779010242
Added area flooring.
...
Fixes #743 .
2014-04-17 22:03:30 +02:00
Tiger Wang
bdea8706d8
Added new AI rules
...
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
2014-04-17 18:50:25 +01:00
daniel0916
0086fcfef1
Fixed some Errors (not all)
2014-04-17 19:31:43 +02:00
madmaxoft
afb20132fe
Added Prefab initializers to SELFTEST code.
2014-04-17 17:50:52 +02:00
madmaxoft
be091800f8
Prefabs can have per-piece per-placement weights.
...
Fixes #753 .
Also upgraded NetherFortPrefabs to lates Gallery contents.
2014-04-17 17:32:08 +02:00
Tiger Wang
18c3b18a3f
Compile fix?
2014-04-17 13:02:20 +01:00
daniel0916
f9343a8490
Modified many things
2014-04-17 13:15:35 +02:00
Tiger Wang
2151ee997c
Implemented weighted pressure plates
2014-04-17 12:11:31 +01:00
Mattes D
35e847d2f5
Merge pull request #896 from axisd/master
...
Mobs rotation
2014-04-17 08:45:14 +02:00
r.ramazanov
7bcc920662
Mobs rotation
2014-04-17 09:35:26 +04:00
madmaxoft
09866bb382
Added asserts for proper game state.
...
This is to help hunt #889 .
2014-04-16 18:10:48 +02:00
daniel0916
a0725747af
Fixed conflicting enchantments checking
2014-04-16 14:52:09 +02:00
daniel0916
a12a9117c2
Added deletions from merge conflict
2014-04-16 14:33:03 +02:00
daniel0916
5a9acb7eb6
Merge branch 'master' into Enchanting
2014-04-16 14:31:02 +02:00
daniel0916
8d67562238
Fixed merge conflict
2014-04-16 14:30:55 +02:00
daniel0916
8c33b3c415
Fixed double enchanting items
2014-04-16 13:31:37 +02:00
madmaxoft
99e4225269
Attempted fix for the client crash with the new protocols.
2014-04-15 23:40:06 +02:00
daniel0916
2cb8538e2e
Code Optimization
2014-04-15 22:03:15 +02:00
daniel0916
36f747d674
Added Book Enchanting
2014-04-15 21:43:52 +02:00
Howaner
e81fc2779e
Add more checks to cSlotAreaEnchanting
2014-04-15 21:12:59 +02:00
daniel0916
fb3c755c0a
Modified names
2014-04-15 20:55:37 +02:00
Howaner
8df922e3e0
Add linux compatibility
2014-04-15 20:42:39 +02:00
Tiger Wang
82b3d543e7
Rewrote redstone powering to use power levels
2014-04-15 13:15:56 +01:00
madmaxoft
b5ea5fbf90
Added support for per-piece per-placement weights in cPieceGenerator.
...
Ref.: #753 .
2014-04-15 12:57:52 +02:00
madmaxoft
146824cb68
NetherFortPrefabs: Fixed a connector in MidStaircase.
2014-04-15 12:57:52 +02:00
madmaxoft
d12d7b6715
Implemented the 1.7.6 protocol and authenticator.
...
Server works both in online and offline modes with 1.7.9.
2014-04-14 22:52:59 +02:00
daniel0916
b5401ec03a
Added ItemPlaceCount in SlotArea
...
Thanks to Howaner for helping
2014-04-14 22:05:04 +02:00
madmaxoft
d505ffc704
A client UUID is generated when the server is in offline mode.
...
1.7.9 client works with these changes in offline mode.
2014-04-14 20:21:00 +02:00
madmaxoft
ffe65b6a18
Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176
2014-04-14 18:53:56 +02:00
madmaxoft
0f55dcf036
Initial 1.7.6 protocol support.
...
Doesn't work yet because of missing UUIDs.
2014-04-14 18:52:21 +02:00
daniel0916
55224d25ef
Removed Debug Message
2014-04-14 16:48:14 +02:00
daniel0916
0ba0e39db4
Added/Modified last things for Enchanting System
2014-04-14 16:46:59 +02:00
daniel0916
a51a099c81
Blocked enchanting a item twice
2014-04-14 13:39:44 +02:00
daniel0916
fb26d2ba87
Fixed Bookshelf Checking
...
Code by LO1ZB
2014-04-14 11:56:50 +02:00
daniel0916
856e900bf8
Bug fixes
2014-04-14 11:48:12 +02:00
daniel0916
fce9ea65c3
Fixed invisibility enchantments
2014-04-13 22:15:10 +02:00
daniel0916
2618569e01
Fixed mistake
2014-04-13 17:09:18 +02:00
daniel0916
d258be678a
Fixed Error?
2014-04-13 16:15:57 +02:00
daniel0916
3733ee2c0e
Code Update
2014-04-13 15:32:15 +02:00
daniel0916
9dc4617e8d
Fixed mistake
2014-04-13 13:53:10 +02:00
daniel0916
c88464e62a
Fixed Server Crash
2014-04-13 13:36:03 +02:00
daniel0916
1429d2f1b1
Some Fixes
2014-04-13 13:33:47 +02:00
daniel0916
b506a74076
Added Yggdrasil Authentication System
...
Code by Howaner. Fixes/Changes by me.
2014-04-13 13:04:56 +02:00
madmaxoft
34cf058b02
ChunkStay must be disabled while being deleted.
...
Fixes #758 .
2014-04-12 22:35:04 +02:00
madmaxoft
75b7244f05
Fixed chunkstays not being removed on auto-delete.
...
Fixes #837 .
2014-04-12 22:15:09 +02:00
daniel0916
2689a63e9c
Merge remote-tracking branch 'upstream/master' into Enchanting
2014-04-12 19:55:37 +02:00
madmaxoft
83b25d085c
Updated the NetherFort prefabs to current Gallery contents.
...
Code exported from the Gallery server by the GalExport plugin.
2014-04-12 19:36:50 +02:00
daniel0916
dd1f8fb1f5
Fixed Bookshelves Checking (not completly)
2014-04-12 18:52:17 +02:00
daniel0916
e6e702e7fd
Added complete Enchanting System
...
http://minecraft.gamepedia.com/Enchantment_mechanics
2014-04-12 14:58:46 +02:00
Tiger Wang
c0c47d33c5
Entities handle chunks properly again
...
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
Tiger Wang
b3f6afefe9
Simplified pickup speed randomisation
2014-04-12 13:14:35 +01:00
STRWarrior
433bd530f3
Some tweaks
...
GetPyramidLevel returns 0 when no layers were found, 1 for one layer etc.
Auto adjust the minY and/or maxY to 0 if the beacon is low.
2014-04-12 00:35:13 +02:00
STRWarrior
eb4dd23775
Removed debug message.
2014-04-12 00:21:37 +02:00
STRWarrior
e19556ebf6
Simplefied GetPyramidLevel
2014-04-12 00:13:16 +02:00
STRWarrior
875c2557c3
Implemented the skeleton code for the beacon.
...
There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
2014-04-12 00:01:15 +02:00
madmaxoft
f44a291da8
Fixed issues with 64-bit MSVC compilation.
2014-04-11 13:09:19 +02:00
Tycho
01546020fc
Replaced all the .data() calls so the code compiles in VS2008
2014-04-10 12:12:36 -07:00
madmaxoft
22d56d1a3f
Fixed enchantment parsing.
...
Fixes #880 . Enchantment parsing now reports in detail which value failed to parse
2014-04-10 19:09:37 +02:00
Alexander Harkness
9ad87f670b
Fixed GitHuB WebEdit fail.
2014-04-10 15:52:00 +01:00
Alexander Harkness
2d02ff1df8
Update Monster.cpp
2014-04-10 15:50:43 +01:00
Mattes D
e08a31daf5
Merge pull request #871 from worktycho/worldstorage
...
Removed check for enqueuing a chunk that is already enqueued to be loaded
2014-04-08 19:55:50 +02:00
Tiger Wang
c3fcc5b132
cRedstoneSimulator.cpp style improvements
2014-04-08 18:49:53 +01:00
Alexander Harkness
ea17441e8a
Merge pull request #872 from worktycho/bugfix
...
Fixed missing - that caused all neighbour lookups to go to the chunkmap
2014-04-08 17:03:20 +01:00
Tycho
18793ca568
Fixed missing - that caused all neighbour lookups to go to the chunkmap
2014-04-08 08:59:50 -07:00
Tycho
10e72a122c
Removed check for enqueuing a chunk that is already enqueued to be loaded
...
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
wiseoldman95
6a0c122dfb
Uppercased Z
...
Minor, no code changed.
2014-04-08 17:59:42 +03:00
wiseoldman95
fb90afd651
Comments: Inverted Z axis.
...
-Comments fix, No code has been changed.
-Inverted the Z axis in the comments and changed all dependent comments accordingly.
-Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN.
2014-04-08 17:55:03 +03:00
wiseoldman95
506f5def04
Added comments regarding latching and orientation
...
No real code was changed.
2014-04-08 17:14:23 +03:00
Alexander Harkness
4d32f41b8b
Fixed the thing properly.
2014-04-08 14:48:24 +01:00
Alexander Harkness
8d251601cf
Merge pull request #862 from mc-server/redstonefix
...
Fixed #859
2014-04-08 07:37:26 +01:00
Tiger Wang
f13cf1a021
Maybe speed improvements?
...
* Use a single index to determine from when to begin copying data
* Use heightmap to determine first nonair block
2014-04-07 20:57:14 +01:00
daniel0916
427924fbb0
Modified comment
2014-04-07 20:41:47 +02:00
daniel0916
1dfd2b1c5f
Fixed Errors
2014-04-07 20:25:30 +02:00
daniel0916
296d0acbff
Added deleted things for merging
2014-04-07 20:13:45 +02:00
daniel0916
2e9754ac1c
Merge remote-tracking branch 'upstream/master' into Enchanting
2014-04-07 20:12:17 +02:00
daniel0916
93a7494e4b
Fixed merge conflict
2014-04-07 20:11:43 +02:00
wiseoldman95
dab01b27c6
Fixed IsOn
2014-04-07 21:04:06 +03:00
daniel0916
af566d5a79
Added Enchantment-Slot-Level generating
2014-04-07 19:52:35 +02:00
wiseoldman95
011123726b
Removed stray IsLocked
2014-04-07 20:26:23 +03:00
wiseoldman95
45eb539a17
Removed unneeded spacings
2014-04-07 20:00:38 +03:00
wiseoldman95
4f8f686292
Slight cleanup
...
It is more efficient and readable if we do nothing unless we're not locked.
2014-04-07 19:55:17 +03:00
Alexander Harkness
57a474ba01
Fixed some more minor issues with the redstone simulator.
2014-04-07 17:37:53 +01:00
Alexander Harkness
5374730753
Improved the speed a little more.
2014-04-07 17:28:16 +01:00
Alexander Harkness
634c4d6770
Fixed the redstone simulator.
2014-04-07 17:12:06 +01:00
andrew
c79ba3494c
Statistic/Achievement defs
2014-04-07 16:31:15 +03:00
Tiger Wang
74c4789c6f
Attempt to fix errors
2014-04-07 12:43:43 +01:00
Tiger Wang
440b74af6c
Fixed #859
2014-04-07 12:02:41 +01:00
Alexander Harkness
4082adbbad
Fix some of the comments in the PR tycho just did.
2014-04-07 11:35:37 +01:00
Alexander Harkness
76b321a0f4
Merge pull request #861 from worktycho/simulator
...
Added support for redstone latching
2014-04-07 11:32:57 +01:00
madmaxoft
f9b2c2956e
Fixed HTTP chunked encoding.
...
Fixes #858 .
2014-04-07 08:11:56 +02:00
Tiger Wang
a42d1f8517
Blocklight and skylight now compressed
2014-04-06 23:30:21 +01:00
madmaxoft
95fb90eaa6
Fixed 1.6.4 client crash on composite chat messages.
2014-04-06 22:28:41 +02:00
madmaxoft
de3df0a71f
Fixed crash in protocols sending 64-bit ints.
...
Fixes #855 .
2014-04-06 22:15:49 +02:00
madmaxoft
7119dd293a
Updated the tolua executable for Windows.
2014-04-06 22:05:44 +02:00
Howaner
4d7b250a50
Remove old import
2014-04-06 21:45:55 +02:00
Howaner
7da308a7e1
Merge branch 'master' into Slabs
2014-04-06 21:43:23 +02:00
Howaner
039191499c
Add CanChangeDirtToGrass function to Block Handlers.
2014-04-06 21:41:01 +02:00
Tycho
f5cb81eb1b
Added support for redstone latching
...
fixes #856
2014-04-06 11:09:33 -07:00
Tycho
23395a5ce1
Merge branch 'master' into override
...
Conflicts:
lib/tolua++/CMakeLists.txt
2014-04-05 14:12:17 -07:00
madmaxoft
143a5e61fc
Fixed Endiannes conversion routines for floats and doubles.
...
This bug has been introduced in 8825d30aabfixes #854 .
2014-04-05 22:34:05 +02:00
madmaxoft
22794e7208
Fixed double projectile spawning.
...
Two spawn packets were sent per projectile.
2014-04-05 22:26:10 +02:00
madmaxoft
d43c5a9c47
Removed debugging log from entity physics handling.
2014-04-05 22:25:40 +02:00
madmaxoft
1cab52f867
Added cPlayer:SendRotation() API function.
2014-04-05 12:09:30 +02:00
Tiger Wang
3201d1bf16
Nibbletypes are compressed
...
+ Added nibble compression
* Fixed an off by one
2014-04-04 23:16:52 +01:00
Mattes D
2e789b63d3
Merge pull request #840 from Howaner/NewBlocks
...
Add tall flower handler.
2014-04-04 15:06:54 +02:00
Tiger Wang
15a0ceec26
Speed and memory improvements
...
* Changed array to be continuous, so no more layer splitting
2014-04-04 13:01:05 +01:00
madmaxoft
d77ca77086
Merge branch 'master' into HTTPSizeT
2014-04-04 13:29:48 +02:00
madmaxoft
87f39e9e28
Explicit change record size.
2014-04-04 13:19:25 +02:00
madmaxoft
4b4c3f2a20
Changed cNoise seed to signed.
2014-04-04 12:28:38 +02:00
madmaxoft
bc227299d0
Fixed format string mismatch.
2014-04-04 12:08:14 +02:00
madmaxoft
4be894f060
More Clang warning fixes in the protocols.
2014-04-04 11:47:46 +02:00
madmaxoft
3590f97e00
Fixed CreateHexDump's format string.
2014-04-04 11:19:57 +02:00
madmaxoft
e1f75ab6d0
Fixed CreateHexDump's signedness.
2014-04-04 10:42:17 +02:00
madmaxoft
5dee19648d
More Clang warning fixes in the protocols.
2014-04-04 10:31:50 +02:00
madmaxoft
396abb5db6
Fixed silly Clang's warnings in FastNBT.
2014-04-04 10:19:21 +02:00
madmaxoft
8825d30aab
Fixed some Clang warnings in protocols.
2014-04-04 10:13:25 +02:00
madmaxoft
402d85d896
Fixed Clang warnings in itemhandlers.
2014-04-04 09:56:57 +02:00
Howaner
32d054e8fd
Merge branch 'master' into Slabs
...
Conflicts:
src/Blocks/BlockDirt.h
2014-04-03 22:03:18 +02:00
Howaner
0fb40da877
Change CanBeAt() from big flower
2014-04-03 21:53:18 +02:00
Howaner
cbb0352e51
Remove old function
2014-04-03 21:44:23 +02:00
madmaxoft
e304bd08a2
Documented the units and range for entity rotations.
2014-04-03 21:44:03 +02:00
Howaner
ca08a44c98
Grass now grows under up-side-down slabs
2014-04-03 21:43:40 +02:00
Tiger Wang
e1ba51e6ca
Merge remote-tracking branch 'origin/master' into chunkysparsing
2014-04-03 19:18:34 +01:00
Tiger Wang
d5faf5a38e
Fixed some bugs
...
* Fixed undefined behaviour
* Fixed compression failure
2014-04-03 19:17:04 +01:00
madmaxoft
1b78bef4b3
Removed unneeded asserts.
2014-04-03 09:38:29 +02:00
Mattes D
25529ba62f
Fixed a few MSVC type warnings.
2014-04-03 09:27:17 +02:00
Mattes D
12b82de502
Removed the bindings to set old g_BlockXXX arrays.
...
Those were supposed to be read-only; there's no point in writing to them anyway.
Also fixed MSVC type warnings in the code.
2014-04-03 09:26:44 +02:00
Tiger Wang
357411a489
Performance improvements and chunk flipping fixed
2014-04-02 22:53:03 +01:00
Mattes D
e7b8e17746
Merge pull request #849 from mc-server/minorfixes
...
Minor fixes
2014-04-02 21:26:45 +02:00
Tiger Wang
da267649a1
With eXtra line!
2014-04-02 20:04:41 +01:00
Tiger Wang
43af11ee38
Removed extra brackets
2014-04-02 20:03:42 +01:00
Tycho
0075b2f72e
Merge branch 'master' into HTTPSizeT
...
Conflicts:
src/HTTPServer/EnvelopeParser.h
src/HTTPServer/HTTPFormParser.h
src/HTTPServer/MultipartParser.h
2014-04-02 07:51:48 -07:00
madmaxoft
5c6d474599
Fixed boat placement code.
2014-04-02 16:40:28 +02:00
madmaxoft
26c3bc4076
Fixed more virtual destructors for interfaces.
2014-04-02 16:40:27 +02:00
Tycho
b449ad8613
Merge branch 'MacFixes'
...
Conflicts:
src/DeadlockDetect.cpp
src/World.cpp
2014-04-02 06:54:57 -07:00
Tycho
741a64c250
Merge branch 'master' into HTTPSizeT
2014-04-02 06:37:24 -07:00
Tycho
1f5a4a39f2
Fixed All signedness warnings in HTTPServer.cpp
2014-04-02 06:36:25 -07:00
Tycho
7ece0cc836
Fixed format string in HTTPConnection
2014-04-02 05:10:08 -07:00
Tycho
93bb5369a8
Fixed Comparison to -1 in HTTPMessage.h
2014-04-02 05:06:38 -07:00
Mattes D
01c38505fd
Merge pull request #831 from mc-server/Wither
...
Wither
2014-04-02 12:00:26 +02:00
madmaxoft
bcd7f9669b
Added schematic string serializer self-test.
2014-04-02 11:56:27 +02:00
madmaxoft
3301c5be1f
Fixed StringCompression's GZIP handling for larger strings.
2014-04-02 11:56:10 +02:00
madmaxoft
bcf5021feb
Exported the Base64 encoding and decoding functions to Lua API.
2014-04-01 22:47:39 +02:00
madmaxoft
e7e65b5005
Merged branch 'msDifference'.
2014-04-01 21:21:11 +02:00
madmaxoft
1229795ff0
cBlockArea: Added the msMask merge strategy.
2014-04-01 20:50:10 +02:00
madmaxoft
1795cca552
Rewritten HTTPServer to use size_t for data lengths.
2014-04-01 16:36:00 +02:00
madmaxoft
2672b14c03
More cFile warning fixes.
2014-04-01 16:00:20 +02:00
madmaxoft
b9a090d835
Fixed clang warnings in cGZipFile.
2014-04-01 15:00:30 +02:00
madmaxoft
42e30b6513
Fixed clang warnings in BlockHandlers.
2014-04-01 14:58:17 +02:00
madmaxoft
45150e9754
Fixed clang warnings in cFile.
...
We only support 32-bit filesizes (files < 2 GiB).
2014-04-01 14:58:05 +02:00
madmaxoft
aa7552309a
Simplified the anvil placement code.
2014-04-01 14:23:11 +02:00
madmaxoft
7cc322332b
Removed an unneeded code branch.
2014-04-01 13:38:40 +02:00
madmaxoft
7aa6a3b866
LOG() API reads the LogLevel from the cCompositeChat's MessageType.
2014-04-01 09:32:14 +02:00
Tiger Wang
ef48b30baa
Final realisation of suggestions
2014-03-31 22:37:05 +01:00
madmaxoft
8126d9e66e
Console logging supports cCompositeChat as its parameters.
2014-03-31 22:51:14 +02:00
Tiger Wang
fc940b6da4
Realised suggestions
2014-03-31 21:36:19 +01:00
Tiger Wang
ee07b7ae3e
Simplified and fixed slabs, fixes #835
2014-03-31 20:34:11 +01:00
Tiger Wang
0836fe9a84
Fixed a few Y too high/low asserts
2014-03-31 20:33:33 +01:00
STRWarrior
c4e07631c8
Added new merge strategy "msDifference"
2014-03-31 19:47:18 +02:00
madmaxoft
43844fc0f0
cCompositeChat has a MessageType param in the constructor.
...
This should make it easier to use.
2014-03-31 13:28:38 +02:00
madmaxoft
8288e53c0b
Fixed a few Clang warnings in BlockHandlers.
2014-03-30 23:13:13 +02:00
madmaxoft
a5c0600e6c
Fixed a few clang warnings.
2014-03-30 20:02:30 +02:00
madmaxoft
1bda9b0424
Merge branch 'NetherFortGen'.
2014-03-30 19:17:33 +02:00
Mattes D
e474f40ac9
Merge pull request #834 from narroo/issue503
...
Issue503 pull Request
2014-03-30 16:58:42 +02:00
worktycho
5260146f3c
Merge pull request #838 from mc-server/lilypads
...
Lilypads
2014-03-30 15:17:35 +01:00
Tiger Wang
a87bd5788f
Another curly
2014-03-30 13:07:28 +01:00
madmaxoft
ceabb372f0
Added all current NetherFort prefabs.
2014-03-30 00:33:59 +01:00
madmaxoft
3eb531a8c8
Added asserts for critical data in cPrefab.
2014-03-30 00:20:28 +01:00
madmaxoft
6b29edc158
Re-fixed nether fort piece count check.
2014-03-30 00:20:06 +01:00
madmaxoft
475fc4b1ab
Fixed chest rotator.
2014-03-30 00:12:54 +01:00
madmaxoft
597bdd9f80
NetherForts have a minimum number of pieces.
...
The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces.
2014-03-30 00:12:19 +01:00
madmaxoft
47a427d3dc
Merge branch 'master' into NetherFortGen
2014-03-29 23:05:17 +01:00
madmaxoft
d64d9145d1
cPrefab now uses a struct for block type definition in CharMap.
...
As suggested by worktycho in 7b585290fc
2014-03-29 22:56:48 +01:00
Mattes D
37812813d3
Merge pull request #842 from mc-server/ProjectileHooks
...
Projectile hooks
2014-03-29 22:32:50 +01:00
madmaxoft
782c111b81
Renamed lua dll for tolua++.exe.
...
Fixes #843 .
2014-03-29 22:29:34 +01:00
STRWarrior
98a12127ce
Fixed the OnProjectileHitBlock hook not stopping projectiles.
2014-03-29 17:05:24 +01:00
STRWarrior
ec4638a228
Added HOOK_PROJECTILE_HIT_BLOCK.
2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e
Fixed error when the hook gets called.
2014-03-29 15:43:03 +01:00
STRWarrior
339d555111
Added HOOK_PROJECTILE_HIT_ENTITY
2014-03-29 15:26:41 +01:00
narroo
4492bd58f1
Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler.
2014-03-29 10:00:44 -04:00
Tiger Wang
515e4bdb13
Compare for inequality in FACE_NONE checks
2014-03-29 13:18:26 +00:00
Howaner
736c7950a2
Add "a_RelY < cChunkDef::Height" to BlockBigFlower
2014-03-29 13:11:49 +01:00
Tiger Wang
aefabfcafa
Removed leftover clienthandle code
2014-03-29 10:25:40 +00:00
Tiger Wang
fb16554322
Fixed players not updating after world change
...
Addendum to 6dea7993f2
2014-03-29 01:21:56 +00:00
Tiger Wang
519bd0b989
Curly brackets
2014-03-28 23:51:52 +00:00
Tiger Wang
6dea7993f2
Fixed #721 and FS439
2014-03-28 23:25:11 +00:00
Tiger Wang
6eacf1aa92
Fixed a minor ini key duplication bug
2014-03-28 23:07:50 +00:00
Tiger Wang
79aa082b04
Fixed infinite minecart items
2014-03-28 22:52:23 +00:00
Tiger Wang
aee1f8f9d1
Fixed block interaction rate check
2014-03-28 22:52:04 +00:00
Tiger Wang
8ece214920
Fixed a potential crash
2014-03-28 22:51:39 +00:00
Tiger Wang
283a66bcae
Some fixes to lilypads
...
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
2014-03-28 22:51:30 +00:00
madmaxoft
76f0d167b1
NetherFortGen: Added several more prefabs.
...
Also extended the defauls MaxDepth value to 12.
2014-03-28 23:39:40 +01:00
Howaner
a78bacac3c
Add tallgrass drop to big flowers.
...
Add tallgrass drop, when a players break a tallgrass with the shear.
2014-03-28 23:14:58 +01:00
Howaner
f2f6096ee5
door -> flower
2014-03-28 22:24:54 +01:00
Howaner
efc89b2c43
Add tall flower handler.
2014-03-28 22:22:29 +01:00
