1
0
Commit Graph

979 Commits

Author SHA1 Message Date
Morgan Redshaw
782818ffb5 Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. 2013-12-30 21:30:20 -07:00
madmaxoft
ee15d4e08e Fixed compilation in VC2008.
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +01:00
Tycho Bickerstaff
d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00
Tycho Bickerstaff
94ca07cfbf Merge branch 'master' of github.com:mc-server/MCServer 2013-12-22 13:19:27 +00:00
Tiger Wang
f1142af455 Server now handles death messages 2013-12-26 14:55:19 +00:00
Mattes D
e0e01d0615 Merge pull request #461 from mc-server/repeaters
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
STRWarrior
5eacf327b7 Fixed Parentheses. 2013-12-25 18:14:00 +01:00
STRWarrior
17a84111ce You are now able to sweep mobs to your position using fishing rods. 2013-12-25 17:26:17 +01:00
Tiger Wang
40c2826a21 Braced up some code 2013-12-25 14:05:37 +00:00
Tiger Wang
508e505ace Used IsGamemodeCreative() function 2013-12-24 23:47:04 +00:00
Tiger Wang
ae6cb01e56 Fixed comments in main.cpp and Player.cpp 2013-12-24 15:16:30 +00:00
Tiger Wang
89f87f66a5 Improved knockback animation
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
2013-12-24 15:02:35 +00:00
Alexander Harkness
af6389ea7a finally removed them all? 2013-12-24 10:30:36 +00:00
Tiger Wang
1014c737a4 Improved player fall particle positions 2013-12-23 21:18:01 +00:00
Tiger Wang
9c796bf6b4 Clarified some code in Player.cpp 2013-12-23 09:51:41 +00:00
Tiger Wang
d8221854d2 Fixed a comment in Entity.cpp 2013-12-23 09:41:45 +00:00
Tiger Wang
b02a81678c Implemented knockback and critical hit 2013-12-22 20:04:17 +00:00
Tiger Wang
945ba36d1b Implemented fall particles 2013-12-22 20:03:09 +00:00
STRWarrior
8d51c22b36 Fishing underground is slower and fishing while raining is faster. 2013-12-22 15:22:50 +01:00
STRWarrior
caccf72b46 Fixed compiler warnings. 2013-12-22 14:54:07 +01:00
STRWarrior
7a299f1ba6 Fishing now uses a countdown instead of a random number each tick. 2013-12-22 14:48:22 +01:00
STRWarrior
bd6574230a Floater now dissapears when the player doesn't have an fishing rod equipped. 2013-12-21 17:31:05 +01:00
Tycho Bickerstaff
9f41761e8e Root is now warnings clean 2013-12-21 15:38:37 +00:00
Tycho Bickerstaff
38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +00:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
STRWarrior
128de10a2f You could now only get fish from non-source blocks. Fixed it. 2013-12-21 14:11:21 +01:00
STRWarrior
8efde94e4e Fixed bug where you could get fish from non-source blocks. 2013-12-21 14:07:32 +01:00
STRWarrior
af98fc6170 Fixed bug where the floater could pop in the water while you could already get a fish. 2013-12-20 18:34:08 +01:00
madmaxoft
8570d08eb4 More reordering fixes. 2013-12-20 17:11:51 +01:00
madmaxoft
d6de11da07 Sorted a few constructors to remove warnings. 2013-12-20 16:39:20 +01:00
Tycho Bickerstaff
32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
madmaxoft
8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
Mattes D
39251bccd3 Merge pull request #450 from mc-server/redstonefixes
Multiple fixes
2013-12-19 13:58:49 -08:00
STRWarrior
a1ce0a6d73 Fixed #include in Floater.cpp. 2013-12-19 22:44:10 +01:00
STRWarrior
32d117a498 The floater now actualy dives under water. 2013-12-19 22:18:05 +01:00
Tiger Wang
03a8dfc4a8 Fixed PlayerAbilities and creative 2013-12-19 20:53:47 +00:00
STRWarrior
3d70d7198d Implented IsFishing, SetIsFishing and GetFloaterID(). 2013-12-19 17:33:21 +01:00
STRWarrior
86bfed735e Added cFloater class. 2013-12-19 17:32:06 +01:00
Tycho Bickerstaff
0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00:00
Tycho Bickerstaff
e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
STRWarrior
199123d4f2 Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. 2013-12-16 18:03:39 +01:00
STRWarrior
459d636948 Added HandleSpeedFromAttachee so an entity can override the function. 2013-12-16 18:02:33 +01:00
madmaxoft
f521cbeb31 Fixed cClientHandle::Tick() being called from two threads.
When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread.
Final fix for #187.
2013-12-16 10:41:51 +01:00
STRWarrior
007d668c1b Server saves if a player is flying. 2013-12-15 21:25:13 +01:00
STRWarrior
9b8112dbc2 Merge pull request #437 from mc-server/ShootTo_function
Shoot to function
2013-12-15 12:05:18 -08:00
STRWarrior
5e75408b3b Renamed ShootTo function to ForceSetSpeed. 2013-12-15 20:19:58 +01:00
STRWarrior
0efd74f114 This adds a function that allows you to 'shoot' a player towards a direction. 2013-12-15 18:54:54 +01:00
madmaxoft
368b7a40b5 Fixed indentation. 2013-12-15 15:58:03 +01:00
STRWarrior
b10d0b95cb Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function 2013-12-15 14:48:17 +01:00
STRWarrior
9c2089dc5a cPlayer is using the broadcast functions. 2013-12-15 10:52:54 +01:00
STRWarrior
8c04afe18a Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. 2013-12-14 22:34:49 +01:00
STRWarrior
71250b275f Added E_EFFECT_<Effect> 2013-12-14 22:23:20 +01:00
STRWarrior
37069288d5 Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. 2013-12-14 18:03:00 +01:00
STRWarrior
78aca16d58 Exported the cTNTEntity 2013-12-14 16:28:17 +01:00
Mattes D
8a6c28b8f0 Merge pull request #423 from mc-server/redstoneimprovements
Redstone and configuration improvements
2013-12-14 06:41:00 -08:00
STRWarrior
483ef89503 Fixed not getting XP from mobs. 2013-12-14 12:50:08 +01:00
Tiger Wang
4622d4ac09 Improved player permissions logging 2013-12-14 02:54:08 +00:00
Tiger Wang
0aeece7fda Fixes to redstone wire and torches
+ Wires now power blocks around the block beneath
* Torches no longer power off if it is on a linked powered block
* Enhanced code, split functions, etc.
2013-12-14 02:40:54 +00:00
Tiger Wang
4e11095441 Groups.ini and Users.ini are now generated 2013-12-14 02:02:26 +00:00
STRWarrior
39443c63ad Using "a_ClosestPlayer != NULL" in cExpOrb. 2013-12-13 15:32:25 +01:00
STRWarrior
bba51755d4 ExpOrbs now move. 2013-12-11 16:14:08 +01:00
Tycho Bickerstaff
822a92a9b6 moved entities to globs 2013-12-10 23:09:16 +00:00
Tycho Bickerstaff
dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
madmaxoft
3712ee7b11 Fixed angle normalization typo. 2013-12-08 18:54:04 +01:00
Tiger Wang
1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft
6785bb7c16 Fixed normalizing large angles. 2013-12-08 13:08:56 +01:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder.
Ref.: #407
2013-12-08 12:17:54 +01:00
Tiger Wang
30ead79049 Renamed animation function
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
Tiger Wang
ec226e00ab Puking now uses GetEyeHeight() 2013-12-06 20:41:58 +00:00
Tiger Wang
289e8cba21 Fixed eating using wrong animation 2013-12-06 20:28:27 +00:00
Tiger Wang
44d5fd1e87 Tools make a sound when breaking, fixes #266 2013-12-06 19:59:14 +00:00
madmaxoft
2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00