Howaner
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
archshift
16e0beb5b6
SplashPotionEntity: Use const cItem &
instead of a cItem
2014-07-26 03:55:40 -07:00
archshift
60d4a16514
Fixed indentations, removed redundant init code in SplashPotionEntity.cpp
2014-07-26 03:48:16 -07:00
archshift
0298d34406
Moved potion static functions to EntityEffect to create splash potions through world
2014-07-26 03:48:16 -07:00
archshift
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
Tiger Wang
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
Howaner
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
Tiger Wang
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
Tiger Wang
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
Tiger Wang
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
Mattes D
b41bd2da5c
Merge pull request #1213 from mc-server/chat-color
...
Refactored cChatColor
2014-07-20 20:36:08 +02:00
Tiger Wang
ba24f50e5e
Line tracer invalid chunk fix
...
* Fixes #1230
* Additionally improved speed in some scenarios
2014-07-20 13:39:14 +01:00
Tiger Wang
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
archshift
726312602d
Added m_TicksAlive to entities, allows projectiles to hit their creators
2014-07-20 01:43:07 -07:00
archshift
9e155c6add
Added destroy-timer system to splash potion entities
2014-07-20 01:38:36 -07:00
archshift
d5b163bd3d
Removed references to deprecated cChatColor::Color
2014-07-19 11:12:34 -07:00
madmaxoft
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae
Merge pull request #1214 from mc-server/anti-glob
...
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
Mattes D
c2aa7d78bf
Merge pull request #1223 from mc-server/fixes
...
Fixed small issues throughout the codebase
2014-07-19 13:31:35 +02:00
archshift
7c861f98a2
Minecart: slimmed down SpawnOn by keeping subtype in the payload enum
2014-07-19 02:55:36 -07:00
archshift
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
archshift
93c6520e1e
Fixed splash potion color on toss
2014-07-19 02:46:31 -07:00
archshift
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
archshift
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
archshift
1d8e3e2bb8
Entities/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
madmaxoft
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02:00
Tiger Wang
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
archshift
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
archshift
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
archshift
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
archshift
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
Howaner
52d4c49d5c
Fixed many slime bugs.
...
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
2014-07-17 22:32:23 +02:00
madmaxoft
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
Tiger Wang
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01:00
madmaxoft
70f304a96b
Fixed 3 MSVC warnings in SplashPotionEntity.
2014-07-17 11:07:33 +02:00
madmaxoft
430d8b42a5
Updated cPawn::KilledBy signature for custom death messages.
2014-07-17 11:07:10 +02:00
madmaxoft
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
madmaxoft
cd1e6f8ef0
Fixed formatting for cWitherSkullEntity
2014-07-17 10:24:29 +02:00
Mattes D
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
madmaxoft
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
Tiger Wang
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
Mattes D
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
Tiger Wang
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
madmaxoft
cc452f51c8
Restructured cSplashPotionEntity code.
...
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
madmaxoft
f5259d7651
Only the cEntityEffect::effXXX constants are Lua-exported.
...
The rest of the classes don't need exporting, there's no interface using them anyway.
2014-07-15 11:24:48 +02:00
madmaxoft
5193335efa
Reformatted EntityEffect code.
2014-07-15 09:48:11 +02:00
madmaxoft
d274851578
Fixed a MSVC warning in cEntityEffect::CreateEntityEffect().
2014-07-15 09:43:45 +02:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
Tiger Wang
ad6494fb36
Maybe improved arrow sinking
2014-07-14 21:56:40 +01:00
archshift
061010288a
Readability and clarity changes
2014-07-14 13:46:43 -07:00
Tiger Wang
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
archshift
0409daf736
EntityEffect: Inlined functions, added explicit copy constructor and operator.
2014-07-13 15:43:49 -07:00
archshift
f77723128c
Changed separating comment style from asterisks to slashes.
2014-07-13 15:23:23 -07:00
worktycho
4a6d606f74
Made CreateProjectile a pointer
2014-07-13 15:16:49 +01:00
Howaner
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
Tiger Wang
5f72cdac38
Merge pull request #1154 from mc-server/trappedchests
...
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
archshift
8cbd43e043
Added splash potions to NBT serialization and retrieval
2014-07-11 18:58:11 -07:00
archshift
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
archshift
4e6395d6ff
For now, removed creator member from Entity Effect for pointer safety
2014-07-11 17:27:29 -07:00
madmaxoft
f73042fb02
Simplified the player data loading.
2014-07-11 23:12:57 +02:00
madmaxoft
ebea2b7efc
Player data filenames are based on UUID.
2014-07-11 13:13:10 +02:00
madmaxoft
6cea81e383
Fixed a missing return value.
2014-07-11 00:06:58 +02:00
madmaxoft
2bd486660a
Preparation for player UUID-based storage: LoadFromFile()
2014-07-11 00:06:05 +02:00
archshift
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Tiger Wang
74b6b398e7
Fixed arrow collection animation
...
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01:00
Tiger Wang
372dbbb994
Merge pull request #1135 from mc-server/fixes
...
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
Tiger Wang
7c7501abc5
Added extra space before comments
2014-07-07 21:14:15 +01:00
Tiger Wang
9e44b0aae1
Implemented trapped chests & others
...
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
Tiger Wang
460d6bd0cb
Changed everything to callbacks
2014-07-05 22:59:22 +01:00
Tiger Wang
f4e11d194e
Crash and compile fix
2014-07-04 22:07:26 +01:00
Tiger Wang
79e558be34
Suggestions
2014-07-04 17:42:40 +01:00
Tiger Wang
f4e3c01a71
Various fixed
...
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
2014-07-04 16:49:24 +01:00
Tiger Wang
f635066241
Eps comparison
2014-07-04 12:50:40 +01:00
Tiger Wang
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
Mattes D
39fff19955
Merge pull request #1138 from mc-server/enderchest
...
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
Tiger Wang
89a26cc786
Suggestions
2014-07-02 21:07:34 +01:00
Tiger Wang
abb49d3f33
Suggestion
2014-07-02 18:51:37 +01:00
Tiger Wang
f5659a08b8
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/Entities/Player.cpp
2014-07-02 18:48:05 +01:00
Tiger Wang
c1ae5513ec
Fixed player teleport food drain
2014-07-02 18:46:13 +01:00
Tiger Wang
284c1c0514
Vector clamping fixes
...
Thank you, @madmaxoft.
2014-07-01 22:39:37 +01:00
Howaner
8e11f7a1f6
Fixes.
2014-06-30 21:50:40 +02:00
Tiger Wang
85fae0e521
Implemented Vector3<>::Floor()
2014-06-30 19:21:21 +01:00
Howaner
aa753a92c0
Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE
2014-06-30 15:12:56 +02:00
Tiger Wang
b9d4431f6f
Fixed respawning
...
* Fixes #1103
2014-06-29 22:44:16 +01:00
Tiger Wang
428cfb5c21
Suggestions
2014-06-29 22:41:31 +01:00
Tiger Wang
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
Tiger Wang
536cb62f1c
An unification of code style
2014-06-28 21:14:10 +01:00
Tiger Wang
35dc056f03
Likely fixed too quick food depletion
...
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
Tiger Wang
b6df30831d
Fixed server forcing players afloat
...
* Fixes #1131
2014-06-27 23:13:26 +01:00
Mattes D
e60b73ce69
Merged branch 'howaner/Bow'.
...
Removed the pickup collection broadcast due to bad code.
2014-06-26 18:42:28 +02:00
Mattes D
4826990ea0
Merged branch 'howaner/Pickups'.
2014-06-26 18:35:38 +02:00