1
0
Commit Graph

5282 Commits

Author SHA1 Message Date
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
madmaxoft
087210302f Updated MSVC side of CMake files after recent changes. 2014-04-25 23:45:16 +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
Mattes D
20e0465fd1 Merge pull request #938 from archshift/xcode-oops
Oops, forgot some CMakeLists in #937
2014-04-25 23:38:45 +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
worktycho
e2718418bb Merge pull request #937 from archshift/xcode-headers
Cmake generated projects for IDEs include headers in project files.
2014-04-25 18:33:30 +01:00
archshift
0f9e399351 Move to line 47. 2014-04-25 10:32:39 -07:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift
ce505f6814 Use libc++ on OSX
Fixes issues with f3dfc0349d in XCode.

Tested on Mac (Makefile and XCode) and Linux.
2014-04-25 07:58:59 -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
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
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