Tycho
84c83e0deb
Fix a few warnings
2014-06-16 15:03:07 +01:00
madmaxoft
6b503b45a0
Fixed a copypasta error in WormNestCaves generator settings.
2014-06-16 14:53:33 +02:00
madmaxoft
c41299b4d4
Updated the SandFlatRoofVillage prefabs.
2014-06-16 10:18:44 +02:00
archshift
b2fbcaf1bf
Implemented PR suggestions
...
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
2014-06-15 20:27:27 -07:00
madmaxoft
d9719e696c
Added random offsets to cGridStructGen.
...
Fixes #740 .
2014-06-15 23:34:44 +02:00
Mattes D
a72ec6300d
Merge pull request #1090 from mc-server/saveoncrash
...
Data is saved on crash
2014-06-15 23:16:37 +02:00
Tiger Wang
abbd11be6d
Players are saved regularly
...
* Fixes #1076
2014-06-15 20:28:08 +01:00
Tiger Wang
f822a46bdb
Fixed bad comparison crash
...
* Fixes #1095
2014-06-15 19:42:14 +01:00
Tiger Wang
2a6ca71a0b
Fixed daylight sensor unpowering
...
* Fixes #1094
2014-06-15 16:27:20 +01:00
Mattes D
c684812b30
Merge pull request #1019 from mc-server/cPlayerSetSpeed
...
cPlayer set speed
2014-06-14 18:57:32 +02:00
madmaxoft
493d364331
Removed an unused tolua_end and tolua_begin pair.
2014-06-14 18:23:27 +02:00
madmaxoft
a89422ea4c
Simplified speed clamping.
2014-06-14 18:16:10 +02:00
madmaxoft
3f009a7c9e
Refactored speed-setting to use a common function for all cases.
2014-06-14 17:10:53 +02:00
Mattes D
f1e3010839
Fixed bindings generation for Win64 builds.
...
Fixes #1092 .
2014-06-14 15:47:37 +02:00
Mattes D
af981cc718
Fixed MSVC Bindings generation.
2014-06-14 15:00:57 +02:00
worktycho
d5a99d5b78
Remove windows bindings crutch
2014-06-14 13:48:12 +01:00
madmaxoft
f8f7748a09
Merge branch 'master' into cPlayerSetSpeed
2014-06-14 12:06:48 +02:00
Tiger Wang
c1deda5d8f
Fixed a repeater issue
...
* Repeaters now properly continuously update their powering
* Minor cosmetic improvements
2014-06-14 10:47:10 +01:00
Tiger Wang
8a80843ddf
Reverted portal creation code
...
It wasn't really working and needs more development
2014-06-14 10:18:16 +01:00
Tiger Wang
a70b8298b6
Cauldrons check the heightmap
2014-06-14 10:14:04 +01:00
Tiger Wang
7188a1f670
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/World.h
2014-06-14 09:57:07 +01:00
Tiger Wang
4b28a24514
Reduced cPluginManager code duplication
2014-06-14 09:51:42 +01:00
Mattes D
90e3e2b4e6
Merge pull request #1089 from mc-server/tolua-auto
...
automaticlly build tolua and generate bindings as part of build.
2014-06-13 16:32:34 +02:00
madmaxoft
f76420ac55
Removed an unused fwd declaration.
2014-06-13 09:38:25 +02:00
Tycho
c82f4f6309
Fixed order of initalisation
2014-06-12 18:56:48 +01:00
Tycho
93d4a8aa92
Removed unnessicary indirection from Entity iterator list
2014-06-12 18:51:33 +01:00
tycho
9254666a85
automaticlly build tolua and generate bindings as part of build.
2014-06-12 18:00:53 +01:00
worktycho
e10940d57c
Fixed compile
2014-06-12 17:24:14 +01:00
Tiger Wang
1bce1ac432
Fixed two redstone bugs
...
* Fixed chunk border powering
* Fixed quick place-replace powering
2014-06-12 17:13:52 +01:00
Alexander Harkness
db4d786a84
Merge pull request #1082 from mc-server/cauldronfixes
...
Add biome-aware downfall functions.
2014-06-12 16:50:08 +01:00
Tiger Wang
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
STRWarrior
a6a87f1996
Merge pull request #1084 from mc-server/PlankRoads
...
Plank Roads
2014-06-11 22:13:05 +02:00
madmaxoft
220e6f5880
DispenserEntity code cleanup after PR merge.
2014-06-11 19:46:24 +02:00
madmaxoft
d6b2660f36
Merge remote-tracking branch 'joannis/master'
2014-06-11 19:38:14 +02:00
STRWarrior
7cf544079f
Roads in villages are made out of wooden planks if they generate on water.
2014-06-11 19:12:29 +02:00
Alexander Harkness
f9fd519360
Changed the teleport permissions to the new ones.
2014-06-11 17:26:10 +01:00
worktycho
70c20d7772
Fixed constness
2014-06-11 17:17:19 +01:00
archshift
aa7c82580f
Player.h: Moved doxy-comments to Entity.h
...
Moved doxy-comments to the defining function in Entity.h rather than the overloaded functions in Player.h
Comment for each function (instead of assumed encapsulating comments)
@deprecated tag for ForceSetSpeed()
2014-06-11 07:52:34 -07:00
Tiger Wang
e24830f0b1
Compile fix
2014-06-11 13:49:57 +01:00
Tiger Wang
1a9467574e
Reduced code duplication
...
call @maxmaxoft!
calling...
call connected (0:20)
call ended
2014-06-11 13:40:34 +01:00
Tiger Wang
f7913d3b74
IsWeatherSunnyAt does something useful :D
2014-06-11 13:37:04 +01:00
madmaxoft
b3300e3854
Added cBlockArea:GetCoordRange to Lua API.
2014-06-11 14:22:27 +02:00
Alexander Harkness
c09207cabc
SMICOLOSL
...
Meant to be semicolons up there.
2014-06-11 13:20:31 +01:00
madmaxoft
7e4abcfe2d
Revert "Initial Mesa Bryce implementation."
...
This reverts commit 1ff1a93866
.
2014-06-11 14:15:18 +02:00
Tiger Wang
711113cd2b
Updated unnecessary function :/
2014-06-11 13:10:10 +01:00
Alexander Harkness
c5010ebcc1
Add DoxyComments to he weather things.
...
Also changed the function names.
2014-06-11 13:01:52 +01:00
Alexander Harkness
c3c3782c67
Add new IsWeatherWet hook for cauldrons.
...
@madmaxoft can you comment?
2014-06-11 10:33:16 +01:00
worktycho
3e25852382
Removed assert that is now informed by type system
2014-06-11 10:04:34 +01:00
madmaxoft
1ff1a93866
Initial Mesa Bryce implementation.
2014-06-10 22:59:45 +02:00
Tiger Wang
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Tiger Wang
35b79e5d71
Portal improvements and suggestions
2014-06-10 20:43:27 +01:00
madmaxoft
c259dad7b8
Fixed clang warnings about abs() in Noise.cpp.
...
MSVC provides a float overload of abs(), clang does not. Using the proper fabs().
2014-06-10 18:27:17 +02:00
madmaxoft
366ecf9dfd
Fixed a race condition when adding a player to a world.
2014-06-10 18:25:53 +02:00
madmaxoft
6c43799cc5
Fixed gcc compilation.
2014-06-10 09:20:32 +02:00
madmaxoft
9ff0ef87d4
Added an experimental height generator, Mountains.
2014-06-09 23:40:51 +02:00
madmaxoft
bead36f5ed
Added cRidgedMultiNoise, fixed cPerlinNoise.
2014-06-09 23:38:50 +02:00
madmaxoft
2b45e720ad
Added Y coord checks and documentation to cBlockDoorHandler.
2014-06-09 21:35:46 +02:00
madmaxoft
dcc71a3b7b
Merge remote-tracking branch 'howaner/Redstone'
2014-06-09 21:20:26 +02:00
madmaxoft
02b509b81d
ToLua can now be run in pure-lua mode.
...
See the src/Bindings/AllToLua_lua.bat for usage example.
2014-06-09 17:05:22 +02:00
madmaxoft
ec0976f9b0
Fixed a crash when creating negative-size blockareas.
...
Now the server emits a warning instead and continues execution.
2014-06-09 00:49:02 +02:00
Mattes D
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
madmaxoft
28b82d5bbb
Proper fix for long interaction.
...
Fixes #1078 and #1038 .
2014-06-08 11:32:52 +02:00
madmaxoft
0544b96f80
docs/Generator: Added the easy Finishers.
2014-06-07 13:59:51 +02:00
madmaxoft
ec40c7c83a
Added RainbowRoads finisher generator.
2014-06-07 13:59:50 +02:00
Tiger Wang
d5649df326
Further improvements on redstone speed
...
Based on suggestions of @worktycho
* Repeaters now walk their data structure only when needed
* Fixed a bug with cChunkData returning an incorrect value for whether a
meta had changed
2014-06-07 10:39:36 +01:00
archshift
b768e54ce8
Fixed mob hitbox sizes, removed TODOs
...
Measured bat and blaze in vanilla, updated values.
Cavespiders are, in fact, passive in the day.
2014-06-07 00:40:01 -07:00
worktycho
43342540c8
Fixed Time of day
2014-06-06 23:54:24 +01:00
Tiger Wang
5f56773dde
Further reduced redstone idle CPU consumption
...
* Repeaters and wires are no longer unnecessarily ticked
* Fixed #1063 , likely addressed #1062
* Fixed bugs regarding duplicate values
2014-06-06 20:36:50 +01:00
Tiger Wang
156c9851b8
Suggestions
2014-06-05 17:58:29 +01:00
JoannisO
720ae4f757
- Fixed a lot of alignment
2014-06-05 12:26:27 +02:00
Tiger Wang
b73bf1a1e3
Fixed decision failure
2014-06-05 08:28:01 +01:00
Tiger Wang
f22a1b226c
Fixed compilation
2014-06-05 08:25:26 +01:00
Tiger Wang
22236a103a
Redstone fixes and improvements [SEE DESC]
...
Haha, see desc.
* Improved redstone speed through a marking dirty system. Only a select
few devices are still continuously simulated
* Fixed redstone crashing with recent piston changes
2014-06-04 23:23:22 +01:00
Tiger Wang
873043c8e4
Suggestions
2014-06-04 21:51:19 +01:00
Tiger Wang
ea49abd113
Time and weather is saved, part of #1058
...
Also fixed unreliability in Health and LootPickup loading.
2014-06-04 20:52:54 +01:00
Tiger Wang
9c7a6bc443
Health of monsters is now saved
2014-06-04 20:09:02 +01:00
Tiger Wang
7d3d9e92e8
Fixed a NetherFinisher bug
2014-06-04 20:01:05 +01:00
Tiger Wang
ccbf6cc446
Configurable portals
2014-06-04 20:00:55 +01:00
Tiger Wang
74cd4f5521
Suggestions
2014-06-04 18:59:56 +01:00
Mattes D
c11488ccd7
Merge pull request #1011 from SphinxC0re/SomeWarningFixes
...
Fixed some warnings
2014-06-04 18:02:45 +02:00
Howaner
33fbdedea3
Fix itemframe break.
2014-06-04 15:16:30 +02:00
Tiger Wang
3278a403b5
Removed use of auto
2014-06-04 13:24:43 +01:00
Tiger Wang
01f38d8836
Added checks for no downfall biomes
2014-06-04 13:22:50 +01:00
Tiger Wang
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
JoannisO
852e162f95
- Removed the code that removed fireworks from a dispenser even thought
...
they weren't launched.
2014-06-04 12:40:01 +02:00
worktycho
c94d0c8144
derp
2014-06-04 11:39:21 +01:00
JoannisO
e5b345a9c9
- Fixed variable names in a function.
2014-06-04 12:37:51 +02:00
JoannisO
2c103a713e
- Fixed a lot of astethics
2014-06-04 12:35:45 +02:00
worktycho
ae37dfec8d
Fixed bad coordinate
2014-06-04 11:29:08 +01:00
worktycho
98c575ebc2
Make sure m_StackSizeToBeUsedInRepair Always has a valid value
2014-06-04 11:12:06 +01:00
worktycho
85be62a8cd
Removed unused field test
2014-06-04 11:02:17 +01:00
worktycho
87c4d0ea57
Initialise m_Callbacks field to NULL in empty constructor.
2014-06-04 10:58:09 +01:00
Tiger Wang
9ef4b9d52d
Exploded creepers drop nothing, part of #1058
2014-06-04 09:27:50 +01:00
Tiger Wang
c4e0da2d0a
Fixed mob loading, part of #1058
2014-06-04 09:22:19 +01:00
Tiger Wang
8e57f75622
Fixed #1057
2014-06-04 09:21:44 +01:00
Julian Laubstein
8604dedfdf
Update IncrementalRedstoneSimulator.cpp
2014-06-04 10:20:20 +02:00
madmaxoft
c0015d01c6
Player permissions aren't logged to console anymore.
...
This was only logspam on most servers and there are alternative ways to list players' permissions.
2014-06-03 19:50:27 +02:00
JoannisO
7993caa553
- Fixed an issue where there were 2 "DispChunk"-s in the same function.
...
Resused the initial one.
2014-06-03 19:43:15 +02:00
JoannisO
c0716bfcf6
- Fixed a bug where I didn't return anything in the GetShootVector
...
function. This was however passed as "working" by GCC.
2014-06-03 19:39:56 +02:00
madmaxoft
492f99eaeb
Merge remote-tracking branch 'howaner/Inventory'
2014-06-03 19:30:01 +02:00
madmaxoft
d92520016d
Fixed OnProjectileHitBlock bindings.
...
Also sorted the various cLuaState::Push() functions.
2014-06-03 19:29:23 +02:00
Mattes D
0c5492946b
Merge pull request #1028 from mc-server/pistonfixes
...
Piston fixes
2014-06-03 19:02:40 +02:00
JoannisO
2ecf425c39
- Fixed a bug where I used the FireCharge ITEM instead of the Projectile
...
ENUM
2014-06-03 18:19:06 +02:00
JoannisO
daae75b30b
- Cleaned up the code massively
...
- Stopped using cChunk in the GetShootVector class. Parameter is now the
Metadata of the block
- Stopped using cChunk in the SpawnProjectileFromDispenser method now
using coordinates and finding the chunk by itself.
- Removed the matrix calculations from GetShootVector.
2014-06-03 17:21:38 +02:00
Joannis
545478802b
- Added doxy comments and exported to lua
...
- Manipulation of the ShootVector is not to be done by the function that
wants to spawn a projectile.
2014-06-03 09:26:14 +02:00
Mattes D
60786cb06d
Merge pull request #1052 from mc-server/UnderwaterBaseGen
...
Underwater base gen
2014-06-02 21:49:47 +02:00
Tiger Wang
5fc7592cba
Merge remote-tracking branch 'origin/pistonfixes'
...
Conflicts:
src/Chunk.cpp
2014-06-02 19:49:14 +01:00
STRWarrior
b9ca7bd120
Small tweak for mobs
...
Mobs move a bit smoother and aren't able to move allot when in air.
2014-06-02 14:16:36 +02:00
madmaxoft
b7dc4177d0
cBlockArea reading hotfix.
...
This should fix the crashes introduced with chunksparsing. Not the most performant solution, but at least it should work.
Ref.: #1056
2014-06-02 14:07:36 +02:00
madmaxoft
23b0823108
Update UnderwaterBase prefabs.
...
Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
2014-06-01 22:02:58 +02:00
Tiger Wang
a84f107400
Suggestions two
2014-06-01 20:00:11 +01:00
Mattes D
61edb83ce5
Merge pull request #844 from mc-server/ProjectileHitBlock
...
OnProjectileHitBlock tweak.
2014-06-01 20:10:03 +02:00
Tiger Wang
576f89c1d5
Implemented bed homes
...
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
2014-06-01 18:46:59 +01:00
worktycho
750333855c
abort does not take a parameter.
2014-06-01 17:23:02 +01:00
worktycho
476fdc9952
Use abort in SIGSEGV and SIGABRT handlers
...
This should cause Mcserver to generate core dumps when it crashes.
2014-06-01 17:05:51 +01:00
STRWarrior
319169eafb
Made a_BlockHitPos a reference
2014-06-01 14:06:47 +02:00
madmaxoft
046c149797
Updated UnderwaterBase prefabs.
2014-06-01 10:07:57 +02:00
madmaxoft
75fe89b8ae
Updated AlchemistVillage prefabs.
2014-06-01 09:27:54 +02:00
Howaner
12f3c0fcdf
Players can't set items in the result slot, when they shift a item.
2014-06-01 00:50:35 +02:00
Howaner
a18b6c2311
Add HandleSmeltItem() call for achievements.
2014-06-01 00:43:09 +02:00
Howaner
5368e66486
Missing return;
2014-06-01 00:29:17 +02:00
Tiger Wang
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
madmaxoft
7672ca7eef
Added an initial version of the underwater base generator.
2014-05-31 22:06:14 +02:00
Mattes D
6de45037c7
Merge pull request #1018 from mc-server/VillageGen
...
Village gen
2014-05-31 19:11:13 +02:00
JoannisO
b436359237
- Changed the name of the ProjectileLookVector method.
...
Note: I still think the new name is unclear. Any other suggestions are
welcome.
2014-05-31 16:08:15 +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
92d9ab0f6d
Wrong arrow commit.
2014-05-30 22:25:57 +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
JoannisO
ab633c8bd6
- Prefixed all args with "a_"
...
- Added braces around the cases.
2014-05-29 20:19:36 +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
60a37c1370
Very minor code changes
2014-05-29 16:58:55 +01:00
Tiger Wang
cea3a8e7e8
Cauldrons fill
2014-05-29 16:58:40 +01: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
Howaner
142fa83124
Code improvements
2014-05-28 19:32:20 +02:00
Howaner
9f645b2c75
Fix hay place sound.
2014-05-28 17:05:13 +02:00
Howaner
421588d25d
Fix fire break.
2014-05-28 16:59:51 +02:00
Howaner
e7a7c45c36
Add throw sound and fix arrow server crash.
2014-05-28 16:39:59 +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
Howaner
d4f90259b8
Fix Y-Position from arrow entity.
2014-05-28 16:12:10 +02:00
Howaner
61b6fdde75
Fix right click bugs.
2014-05-28 16:07:51 +02:00
Howaner
d8072da61f
Fix skull bugs.
2014-05-28 15:54:43 +02:00
JoannisO
427bddc189
- Removed breaks. I thought it wouldn't compile without them but the
...
issue was appearantly solved with an earlier commit.
2014-05-28 15:16:45 +02:00
JoannisO
4bc02781af
- Fixed an issue where dispensers would only shoot arrows (appearantly
...
some commits didn't come through)
- Cleaned up the code according to suggestions.
2014-05-28 14:34:33 +02:00
Joannis
e5fd782524
- Implemented vertical dispensing for projectiles.
...
- Fixed some terrible commit issues on my side.
2014-05-28 09:10:09 +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
Joannis
1128dc783f
- Fixed the ampersands and asterisks to fit the format.
...
- Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing.
2014-05-27 11:08:06 +02: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
JoannisO
74801f5647
- Added support for more types of projectiles in the Dispenser
...
- Improved the method of spawning projectiles in the world
- Added another method for spawning the projectiles
2014-05-26 14:47:04 +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
JoannisO
c9c2a4f479
Added Arrow- and FireCharge-Dispensing to DispenserEntity.
2014-05-26 08:44:16 +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
STRWarrior
5e90976cd9
Added doxy-comments
2014-05-22 17:10:35 +02:00
STRWarrior
592a0b6147
cEntity::SetSpeed(a_Vector3d) isn't virtualized anymore
2014-05-22 11:46:38 +02:00
STRWarrior
73455d2938
cPlayer overrides the SetSpeedXX functions
...
Fixed compile error
2014-05-22 11:08:44 +02:00
STRWarrior
5ef6c8fe72
Both SetSpeed functions are now overridden by cPlayer
2014-05-22 10:54:07 +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
Howaner
27f95454a9
Simplified the HandleAnvilItemName() code.
2014-05-06 17:31:02 +02:00
madmaxoft
8f262d8a9d
Initial cGridStructGen refactoring.
...
Ref.: #987 .
2014-05-06 16:41:55 +02:00
Tiger Wang
1df7dbe7c9
Suggestions'd
2014-05-05 23:45:35 +01:00
madmaxoft
9542b0b875
Changed cPieceGenerator to support pairings.
...
Fixes #982 .
2014-05-05 23:05:30 +02:00
madmaxoft
e4af9a21af
Prefabs can specify that they don't want flooring.
...
Previously the flag was ignored.
2014-05-05 22:28:54 +02:00
Howaner
dca3af1f0f
Change int to size_t return.
2014-05-05 22:11:48 +02:00
madmaxoft
b69a0c914e
Fixed a flipped condition in cBlockArea::Merge().
2014-05-05 20:33:50 +02:00
Howaner
a138671e0e
Fix SetRepairedItemName() in SlotArea.cpp
2014-05-05 17:36:22 +02:00
Howaner
f2617d0683
Add comments to CanTakeResultItem()
2014-05-05 17:34:44 +02:00
Howaner
c162d69e7b
Add doxycomments to cSlotAreaAnvil functions.
2014-05-05 17:34:41 +02:00
Howaner
8a6119437d
Changed HandleAnvilItemName() length to size_t in ClientHandle.h
2014-05-05 17:34:38 +02:00
Howaner
ecc62dbb9c
Add anvil shift click.
2014-05-05 17:34:35 +02:00
Howaner
ca3c9ce84d
This isn't a enchantment table :D
2014-05-05 17:34:32 +02:00
Howaner
7fe6e40bf7
Add clicks, exp subtraction, item check, ...
2014-05-05 17:34:29 +02:00
Howaner
6ac332cd06
Add MC|ItemName plugin message.
2014-05-05 17:34:24 +02:00
Howaner
3c102870f6
Add anvil window and slot area.
2014-05-05 17:34:17 +02:00
Mattes D
3c40544336
Merge pull request #978 from mc-server/VectorAssignmentOperator
...
Vector3 warning fixes
2014-05-05 17:19:55 +02:00
worktycho
ef85bef978
Fixed crash on creating a world during plugin initialisation
2014-05-05 16:06:45 +01:00
Tiger Wang
bde40af406
Fixed formatting
2014-05-05 15:43:45 +01:00
Tiger Wang
a94546a047
Fixed 027efe09ea
2014-05-04 14:42:12 +01:00
Tiger Wang
0d1804e439
Merge branch 'master' into redstoneimprovements
...
Conflicts:
src/ClientHandle.cpp
src/Entities/FallingBlock.cpp
src/Mobs/AggressiveMonster.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
Tiger Wang
027efe09ea
Fixed lever and button powering direction
2014-05-04 14:00:59 +01:00
madmaxoft
136aeb1f64
Removed convert-assign operator.
...
We want all conversions to be explicit, not hidden.
2014-05-04 13:29:32 +02:00
Tiger Wang
bcd8f727b4
Fixed pressure plate oversights
...
* Fixed stone pressure plates not checking for the correct distance for
players
* Fixed pressure plates in general not link powering the blocks beneath
them
2014-05-04 00:39:03 +01:00
Tiger Wang
41f6643fd2
Fixed portal Z direction loop coding failure
...
* Fixed portals created in the ZP/ZM direction eating its frame
* Changed return type of a function
2014-05-04 00:38:06 +01:00
madmaxoft
383fe0cc1e
Hotfixed Chunked transfer encoding in Yggdrasil.
...
By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979 , a proper parser implementation is still needed.
2014-05-03 23:59:45 +02:00
madmaxoft
eaf3dcb9f7
Fixed connection encryption.
...
Fixes #975 .
2014-05-03 23:46:04 +02:00
madmaxoft
b4496278a5
Removed the controversial Vector3::operator <.
...
It hasn't been used in any C++ code and Lua doesn't need it.
2014-05-03 20:17:47 +02:00
madmaxoft
d4ae00434c
Fixed float comparison warnings in Vector3.
...
There's a bitwise comparison (Equals), and there's Eps-based comparison (EqualsEps).
2014-05-03 19:57:34 +02:00
madmaxoft
ee79bd10c2
Implemented a true assignment operator for Vector3.
2014-05-03 19:34:46 +02:00
madmaxoft
4377a5c31e
Fixed vanilla fluid simulator.
...
Fixes #919 .
2014-05-03 19:23:59 +02:00
Tycho
ec407dd27d
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
2014-05-03 06:07:56 -07:00
Tycho
616ddf5ca5
cCHunkBuffer that compiles with TestGlobals.h
2014-05-03 06:02:51 -07:00
madmaxoft
cbf4a17e05
Attempted fix for CLang warnings in Vector3.h.
...
C++11 seems to have deprecated classes that have custom copy-constructor but not a custom assignment operator.
2014-05-02 23:50:22 +02:00
madmaxoft
3942ebdcb6
WebAdmin outputs a log message about HTTP / HTTPS status.
2014-05-02 23:46:32 +02:00
madmaxoft
58224863c0
Fixed vanilla fluid simulator.
...
Fixes #919 .
2014-05-02 22:07:30 +02:00
madmaxoft
8ff7cf9262
Fixed a buffer overflow in cChunk:SetLight().
...
There are only half as many bytes for light than there are blocktypes.
2014-05-02 20:56:42 +02:00
madmaxoft
92c022c140
Open files in shared mode on windows, so that other tools may read them.
...
This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode.
2014-05-02 20:55:50 +02:00
madmaxoft
5082d55e85
A bit of reformatting.
2014-05-02 19:40:12 +02:00
madmaxoft
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
madmaxoft
202ce3e737
Fixed MagmaCube spawning.
...
Fixes #928 .
2014-05-02 19:17:22 +02:00
madmaxoft
5c7876c2dd
Added a sanitizer for Spawn egg damage value.
...
This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928 .
2014-05-02 19:13:57 +02:00
madmaxoft
4d704255de
HOOK_DISCONNECT has cClientHandle as its first parameter.
...
Ref.: #655 .
2014-05-02 12:35:34 +02:00
madmaxoft
06da2c86b4
Fixed warnings in ManualBindings.
2014-05-01 23:43:11 +02:00
madmaxoft
d950c8346f
Fixed warnings in Lua helpers.
2014-05-01 23:38:35 +02:00
madmaxoft
6bdd3ee35e
Merged branch 'master' into SslWebAdmin.
2014-05-01 23:20:00 +02:00
madmaxoft
cb07541029
Fixed a warning in Noise.
2014-05-01 23:10:37 +02:00
madmaxoft
e24bdc9328
More ClientHandle fixes.
2014-05-01 23:03:23 +02:00
madmaxoft
ed75d3a836
Fixed warnings in ClientHandle.
2014-05-01 22:58:58 +02:00
madmaxoft
fb173a756c
Fixed warnings in cByteBuffer.
2014-05-01 22:54:22 +02:00
madmaxoft
a4d8c6d656
Fixed warning in BlockID.
2014-05-01 22:47:02 +02:00
madmaxoft
a91129af4a
Fixed warnings in cBlockArea.
2014-05-01 22:44:52 +02:00
madmaxoft
b6b86b7270
Fixed warnings in FastNBT.
2014-05-01 22:43:37 +02:00
madmaxoft
a6eba4ff8b
Fixed warning in cCallbackSslContext::cDataCallbacks.
2014-05-01 22:41:41 +02:00
madmaxoft
e175ae551c
Fixed warning in cBlockArea.
2014-05-01 22:41:18 +02:00
madmaxoft
4a95271790
Merge branch 'master' into SslWebAdmin
2014-05-01 22:16:29 +02:00
madmaxoft
30e81156eb
Added a missing return statement.
2014-05-01 22:02:45 +02:00
madmaxoft
b0056cdcf8
Removed the explicit copy constructor for cItem.
...
The compiler generates an implicit one with the same contents and warns about it. The function left in for ToLua to generate the binding for it.
2014-05-01 22:02:25 +02:00
madmaxoft
9221b45898
cSslContext has virtual destructor now.
2014-05-01 21:23:37 +02:00
Tycho
8780b324ff
Merge branch 'master' into chunksparsing/structs
2014-05-01 11:50:40 -07:00
Mattes D
a2cffb0363
Fixed MSVC2013 compilation.
2014-05-01 20:22:23 +02:00
Mattes D
d9e5dbf165
Renamed PublicKey to CryptoKey in CMakeLists.txt
2014-05-01 18:06:23 +02:00
madmaxoft
772b57ca04
Anvil saver pads data to 4K boundaries.
...
Fixes #524 .
2014-05-01 18:00:10 +02:00
madmaxoft
1587b21edd
Renamed cPublicKey to cCryptoKey.
...
The class can hold both the private key and the public key, bad naming on PolarSSL's part.
Also somewhat fixed the cert and key loading in cHTTPServer.
2014-05-01 15:21:41 +02:00
madmaxoft
60850fe3e8
Fixed crashes in the SSL HTTP connection.
2014-05-01 15:08:15 +02:00
madmaxoft
272c232efb
Implemented SSL connection for WebAdmin.
...
Fixes FS-319.
2014-05-01 11:48:03 +02:00
madmaxoft
a04cb6d146
Fixed HTTP message parsing, prepared for SSL.
2014-05-01 11:34:15 +02:00
madmaxoft
e1b6a16945
Added a (disabled) test of low-security ciphersuites.
...
Enabling this allows the connection to be sniffed and decoded using Wireshark, when given the SSL private key.
2014-05-01 11:33:29 +02:00
madmaxoft
e2bf3783e8
Fixed BufferedSslContext's buffer reading and writing.
2014-05-01 11:32:25 +02:00
madmaxoft
47feb91e57
cSslContext supports setting own cert / privkey.
2014-05-01 00:28:27 +02:00
madmaxoft
e6786074d5
Added cBufferedSslContext implementation.
2014-05-01 00:27:42 +02:00
madmaxoft
ab2dfb44fa
If webadmin.ini doesn't exist, example one is written immediately.
2014-04-30 17:37:25 +02:00
madmaxoft
f2b5790776
Fixed a warning when an empty item is being created.
2014-04-30 17:36:51 +02:00
madmaxoft
ae2d18daee
Ladders set as transparent.
2014-04-30 17:13:56 +02:00
madmaxoft
58929a9948
Removed the unused cBlockingTCPLink class.
2014-04-30 17:06:46 +02:00
Mattes D
014fab58e6
Merge pull request #965 from mc-server/SslWrappers
...
Ssl wrappers
2014-04-30 17:05:13 +02:00
madmaxoft
1dbdb8ed91
Delayed sending the KeepAlive packet for 3 seconds after login.
...
This should alleviate #889 .
2014-04-29 23:10:50 +02:00
madmaxoft
c045bb3f4c
Removed unneeded #includes.
2014-04-29 17:45:20 +02:00
madmaxoft
6cb2d2461f
Moved the rest of the Crypto objects into their own respective files.
2014-04-29 17:37:15 +02:00
madmaxoft
d9f7ae6a4d
Moved cPublicKey to its separate file in PolarSSL++.
2014-04-29 17:13:08 +02:00
madmaxoft
7e972f6a5d
Merge branch 'master' into SslWrappers
2014-04-29 15:41:24 +02:00
madmaxoft
015bf244b5
Added BiomeToString() API function.
2014-04-29 15:36:29 +02:00
madmaxoft
5d33ce226f
Added BiomeToString() API function.
2014-04-29 15:36:05 +02:00
madmaxoft
79ec770d77
Added missing initialization.
2014-04-29 11:17:47 +02:00
madmaxoft
ec33bbe294
Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.
2014-04-29 11:04:54 +02:00
madmaxoft
709ae320e0
Disabled MSVC warnings about constant bool expressions.
2014-04-28 22:30:07 +02:00
madmaxoft
55a7f392cc
Hopefully fixed repeated clang warnings.
2014-04-28 22:22:07 +02:00
madmaxoft
dffd38e53b
Fixed a MSVC warning.
2014-04-28 22:21:49 +02:00
madmaxoft
0b16e6821f
Merged branch 'master' into SslWrappers.
2014-04-28 22:05:02 +02:00
madmaxoft
bab3a3cd31
Added the G1 root cert.
...
Now the authenticator finally works.
2014-04-28 21:16:52 +02:00
madmaxoft
16b3eae862
Added a debug cert printing function.
2014-04-28 21:16:32 +02:00
Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
madmaxoft
8ab8fb344f
Fixed braces.
2014-04-28 20:37:22 +02:00
madmaxoft
f04957321d
Fixed missing return value warning in MSVC.
2014-04-28 20:37:12 +02:00
madmaxoft
8ae472df86
Merge remote-tracking branch 'worktycho/master'
2014-04-28 20:16:37 +02:00
Tycho
ad5cdf9f2d
Removed static from combinators.
...
THis allows us to use the functions in template params at the cost of polluting the global namespace.
2014-04-28 11:07:06 -07:00
Tycho
6d520e398b
Fixed unbraced ifs
2014-04-28 11:00:43 -07:00
Tycho
05fe6d6c58
Removed inlines from combinators
...
gcc requires external linkage for functions provided to template parameters
2014-04-28 10:52:48 -07:00
Tycho
a42480cf82
Template Magic
...
Removed need to allocate a fake meta block by using templates to provide a version
of the code that does not use metas. Also changed the function to a template
argument to make sure that the compilier is able to inline it.
2014-04-28 10:31:07 -07:00
Howaner
acd2804f31
Revert "Withers now use the new invulnerable."
...
This reverts commit 619592b5a0
.
2014-04-28 13:51:40 +02:00
Howaner
26e935cb20
Revert "Changed the old invulnerable methods from the wither to the new."
...
This reverts commit d50f8f6f11
.
2014-04-28 13:51:22 +02:00
Mattes D
c063051645
Merge pull request #954 from mc-server/projectiles-split
...
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
madmaxoft
ef57133f9b
Reordered constructors.
2014-04-27 23:35:17 +02:00
madmaxoft
bb73af6843
Fixed a late-night typo.
2014-04-27 23:31:26 +02:00
madmaxoft
9dc9713a9c
Fixed warnings.
2014-04-27 23:12:52 +02:00
madmaxoft
4c165f8a6d
Fixed player spawning #953 .
2014-04-27 23:11:36 +02:00
Tycho
744e00c904
Worked around const pointer
2014-04-27 13:43:59 -07:00
Mattes D
051bb8cfbd
Merge pull request #958 from worktycho/bugfix
...
Bugfix
2014-04-27 22:42:22 +02:00
madmaxoft
dd52719c2d
Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.
2014-04-27 22:28:14 +02:00
madmaxoft
0bdc49221b
PolarSSL wrappers for the SSL context.
2014-04-27 22:27:53 +02:00
worktycho
c7260b2f63
Merge pull request #959 from mc-server/fixes-2
...
Coverity fixes
2014-04-27 13:24:51 -07:00
madmaxoft
f301d052cf
cSocket creates the socket in Connect if no socket is present yet.
2014-04-27 22:20:49 +02:00
Tycho
077179277c
Fixes to uninitallsed array access in Noise.cpp
...
CID 43634, 43634
2014-04-27 13:20:00 -07:00
Tycho
71c51783f3
Initalize counter in fastrandom
...
Fixes CID 43622
2014-04-27 13:15:19 -07:00
Tycho
a2b1fa6520
Initialised MetaArrays in BlockArea
...
Fixes CID 43621
2014-04-27 13:12:36 -07:00
Tycho
25d933883a
Removed unneeded assert
...
Fixed CID 43610
2014-04-27 13:07:21 -07:00
Tycho
35dc88e4ff
Removed Old Asserts
...
Removed asserts about non-negative numbers on what are now unsigned types
Fixes CID 43608
2014-04-27 12:42:29 -07:00
Tycho
d15743df1c
Removed old unused code
2014-04-27 12:41:22 -07:00
Tycho
ee354a405b
Fixed OnPluginMessage hook not exiting early.
...
OnPluginMessage hook would call all plugins even after one returned true.
Fixes CID 43512
2014-04-27 12:37:08 -07:00
Mattes D
5c46f9dd39
Merge pull request #864 from mc-server/Stat
...
Statistic/Achievement defs
2014-04-27 19:37:45 +02:00
andrew
bef3c6d47d
Added some comments
2014-04-27 20:26:50 +03:00
archshift
cd38e792b7
Revert "Creative players cannot throw ender pearls."
...
This reverts commit 75bb36574b
.
2014-04-27 10:24:39 -07:00
archshift
75bb36574b
Creative players cannot throw ender pearls.
2014-04-27 10:01:50 -07:00
archshift
15324f3bbd
Fixed ToLua errors, added newlines
2014-04-27 09:42:31 -07:00
Tiger Wang
bbc5faa723
Redstone simulator now directly accesses cChunk
...
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
madmaxoft
fdac27c63d
Another attempt at #889 .
...
The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
2014-04-27 17:31:58 +02:00
Tycho
6f1fea759e
Fixed bad comment
2014-04-27 08:14:56 -07:00
Tycho
d412630904
Fixed a couple of segfaults and made Free a seperate function
2014-04-27 08:11:56 -07:00
Mattes D
a0f6149d05
Merge pull request #948 from jfhumann/staticFixes
...
Fixes motivated by Coverity #1
2014-04-27 17:00:37 +02:00
Tycho
48a2488477
Added other half of implementation
2014-04-27 07:38:16 -07:00
Tycho
2730a41946
Fixed issues with gcc
2014-04-27 07:10:30 -07:00
Tycho
e3bdc81ca0
Fixed MobProximity Counter to remove chunk copys
2014-04-27 06:46:13 -07:00
Tycho
dcb2a590e3
Fixed bad merge
2014-04-27 06:45:33 -07:00
Tycho
57b8ee9163
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift
cc39d314ae
Fixed ToLua issues
2014-04-26 17:58:06 -07:00
archshift
e3c3795aa4
Moved cFireworkEntity out of ProjectileEntity.h
2014-04-26 17:50:05 -07:00
archshift
cb93a57963
Moved cGhastFireballEntity out of ProjectileEntity.h
2014-04-26 17:41:07 -07:00
archshift
de7eaa5735
Moved cFireChargeEntity out of ProjectileEntity.h
2014-04-26 17:35:31 -07:00
archshift
08b77f4880
Moved cThrownSnowballEntity out of ProjectileEntity.h
2014-04-26 17:24:44 -07:00
archshift
2f9580ad65
Moved cExpBottleEntity out of ProjectileEntity.h
2014-04-26 17:19:45 -07:00
archshift
bc5c28a0be
Moved cThrownEnderPearl out of ProjectileEntity.h
2014-04-26 17:08:39 -07:00
archshift
de23a115a5
Moved cThrownEggEntity out of ProjectileEntity.h
2014-04-26 17:02:47 -07:00
archshift
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
Tiger Wang
15767badac
A tiny speed improvement in ApplyFoodExhaustion()
2014-04-26 23:52:18 +01:00
Tiger Wang
b4b3b5ce64
More comments!
...
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
2014-04-26 23:50:24 +01:00
archshift
e2194e6e90
Added static const, initialized fields.
2014-04-26 15:32:14 -07:00
Mattes D
da931da603
Merge pull request #941 from archshift/master
...
Fixed lots of warnings, and other small changes.
2014-04-26 23:26:59 +02:00
archshift
7841bad27a
More small fixes.
2014-04-26 14:05:00 -07:00
archshift
5a0625eccc
Moar alignment.
2014-04-26 11:00:59 -07:00
Tycho
e40f9d6e5b
Implemented Chunk Sparsing with segments
2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner
d50f8f6f11
Changed the old invulnerable methods from the wither to the new.
2014-04-26 17:47:25 +02:00
Howaner
619592b5a0
Withers now use the new invulnerable.
2014-04-26 17:37:35 +02:00
Howaner
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
Mattes D
1139b117c4
Merge pull request #863 from mc-server/chunkysparsing
...
Chunky sparsing
2014-04-26 15:12:10 +02:00
jfhumann
a1765a2896
Fixed unitialized member in gZipFile (CID 43673)
2014-04-26 14:23:53 +02:00
archshift
80b97fd9dd
Fixed mobs that don't naturally spawn.
2014-04-25 20:49:55 -07:00
archshift
acff6148b6
Moved switch{} out of GetArmorCoverAgainst().
2014-04-25 19:49:08 -07:00
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
Tycho
b0dd3dca3d
Fixed link errors
2014-04-12 10:44:31 -07: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
madmaxoft
5bc5272a4e
Fixed member construction order.
2014-04-12 00:24:35 +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
madmaxoft
8bcb176a19
Lighting reads blocktypes only for blocks under heightmap.
...
This should theoretically speed it up, since less data is copied back and forth.
Also implemented a possibly more cache-friendly blocklight starter algorithm (PrepareBlockLight2()), is disabled by default, needs perf testing.
2014-04-12 00:04:50 +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