madmaxoft
c510683d2a
Fixed unaligned memory access in FastNBT.
...
This should fix #420 .
2014-01-02 17:33:18 +01:00
Tycho Bickerstaff
042b72bc17
rewrote queue not to use promises for waits
2014-01-02 12:32:55 +00:00
Tycho Bickerstaff
7694a0788c
Merge branch 'master' into threadsafequeue
...
Conflicts:
src/OSSupport/Queue.h
2013-12-31 16:32:08 +00:00
Tycho Bickerstaff
c52a46a5e3
merged changes from upstream
2013-12-31 16:24:53 +00:00
madmaxoft
d4e29a0d18
Merge branch 'FishingHook'
2014-01-01 15:31:57 +01:00
STRWarrior
db00a36ff8
OnPlayerFishing doesn't have a const cItems anymore
2014-01-01 15:09:53 +01:00
andrew
852c52bee9
Fixed GetPhysicalRAMUsage on Linux
2014-01-01 11:18:56 +02:00
Tycho Bickerstaff
098ed91a48
fogot to add promise classes
2013-12-31 16:13:13 +00:00
Tycho Bickerstaff
512d1b9ebe
clean up code for patching
2013-12-31 15:58:21 +00:00
Tycho Bickerstaff
18fb814c34
Merge branch 'master' into threadsafequeue
2013-12-31 15:53:17 +00:00
Tycho Bickerstaff
173ed0e653
Merge branch 'master' into cmake-fixes
2013-12-31 15:52:51 +00:00
Tycho Bickerstaff
f3736b1eb7
refactored chunk Queue to seperate class
2013-12-31 15:48:57 +00:00
STRWarrior
020a8b457d
implemented the recommendations Xoft gave.
2013-12-31 14:53:10 +01:00
Tycho Bickerstaff
c3e34ee81a
removed unneccisary cast
2013-12-31 09:16:44 +01:00
Tycho Bickerstaff
1957f982bc
fixed warnings in LineBlockTracer.cpp
2013-12-31 09:16:44 +01:00
Tycho Bickerstaff
8e7e990cfe
fixed warnings in LightingThread.cpp
2013-12-31 09:16:43 +01:00
Tycho Bickerstaff
3da41de553
take Z axis into account when calculating neighboors in LightingThread::ChunkReady
2013-12-31 09:16:43 +01:00
Tycho Bickerstaff
2e1588820d
fixed warnings in World.cpp
2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
2e113c63f9
fixxed warnings in Server.cpp
2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
3152c72959
fixed warnings in Inventory.cpp
2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
c83dfdb66e
fixed warnings in bytebuffer.cpp
2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
e41dec458c
fixed ClientHandle warnings
2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
9ebc623a0a
fixed warnings in webadmin.cpp
2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
25d42c44d5
fixed warnings in BlockArea.cpp
2013-12-31 09:16:40 +01:00
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
STRWarrior
cd435ffca9
Implented OnPlayerFishing and OnPlayerFished.
2013-12-30 22:56:08 +01:00
madmaxoft
ee15d4e08e
Fixed compilation in VC2008.
...
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +01:00
madmaxoft
a1211bcdff
Added support for out-of-source builds.
2013-12-28 14:42:11 +01:00
madmaxoft
90213d324a
Merge branch 'master' into cmake-win
2013-12-27 11:53:12 +01:00
madmaxoft
1cf6502be2
Made cmake compilation possible on Windows.
2013-12-27 11:51:08 +01:00
Tiger Wang
f1142af455
Server now handles death messages
2013-12-26 14:55:19 +00:00
Mattes D
ac0c024e31
Merge pull request #472 from mc-server/Extreme_Hills_M
...
Extreme hills
2013-12-26 06:20:31 -08:00
madmaxoft
2560fb40c6
Added proper precompiled headers for MSVC.
2013-12-26 14:54:46 +01:00
STRWarrior
6884d4235e
Simplefied Extreme Hills M pattern select.
2013-12-26 14:37:48 +01:00
madmaxoft
5689c00131
cBlockArea: Fixed writing full-height areas.
2013-12-26 10:59:01 +01: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
Tiger Wang
d0572e73a0
Moved increment operator to back of variables
2013-12-26 00:12:06 +00:00
STRWarrior
b767fd784c
Extreme Hills M biomes now generate gravel, stone and grass patterns.
2013-12-25 23:18:33 +01:00
STRWarrior
e282eb73c8
Changed tbGravel. Vanilla has 3 layers of gravel and then stone.
2013-12-25 23:05:22 +01:00
STRWarrior
caf3b6d70c
Normal extreme hills (plus) now generate a stone/grass pattern.
2013-12-25 22:43:26 +01:00
STRWarrior
2f59a93f2a
Re-added empty line.
2013-12-25 22:10:27 +01:00
STRWarrior
59b80c84fa
This generates gravel in Extreme Hills M biomes.
2013-12-25 22:08:41 +01:00
Mattes D
abbb82d442
Merge pull request #471 from mc-server/Fishing_Catapult
...
You are now able to sweep mobs to your position using fishing rods.
2013-12-25 11:48:26 -08:00
madmaxoft
77aaa5c367
Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer
2013-12-25 19:50:18 +01:00
madmaxoft
c2befd9777
Fixed block area height check.
...
The block area couldn't be read up to chunk height.
2013-12-25 19:39:07 +01:00
tonibm19
4cee3d8fe3
(Hopefully) fixed if conditions
2013-12-25 19:32:45 +01: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
548273c8f7
Preliminary mobile entity saving
...
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
tonibm19
6b6b6e7498
Implemented xoft suggestion (partly)
...
I only get it working in first condition. It seems it's not compatible with else if...
2013-12-25 16:59:26 +01:00
Tiger Wang
1a02d94ed2
Fixed rails not updating with diagonals
2013-12-25 14:12:48 +00: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
tonibm19
258bb45880
BLOCKTYPE...
2013-12-24 19:31:32 +01:00
tonibm19
96c94a79a7
Fixed compilation
2013-12-24 19:25:34 +01:00
tonibm19
e3f89400d8
Implemented xoft suggestion
2013-12-24 19:13:18 +01:00
tonibm19
276f7dae5c
Using BLOCKTYPE instead of int
2013-12-24 19:08:22 +01:00
tonibm19
59f8068cf4
Fixed comments
2013-12-24 18:41:49 +01:00
tonibm19
85fc1478fa
Changed a little how detection works and added comments.
2013-12-24 18:37:09 +01:00
tonibm19
c06388aa4a
Storing Y -1 and -2 blocks in a variable
2013-12-24 18:07:33 +01:00
Tiger Wang
9e5e415674
Merge pull request #469 from mc-server/Android_Update
...
Android update
2013-12-24 08:20:55 -08:00
Tiger Wang
ae6cb01e56
Fixed comments in main.cpp and Player.cpp
2013-12-24 15:16:30 +00:00
Tiger Wang
c6314e8935
Implemented stone and wooden pressure plates
2013-12-24 15:02:55 +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
STRWarrior
b424877448
Fixed getting configure button going to port 0.
2013-12-24 14:44:24 +01:00
Alexander Harkness
200f37c41f
removed the function def also
2013-12-24 13:26:54 +00:00
Alexander Harkness
e1d3b201bd
Finally removed the function.
2013-12-24 13:25:58 +00:00
tonibm19
5e24577373
Using parenthesis
2013-12-24 12:35:40 +01:00
tonibm19
84bfffcc15
Fixed a possible crash
2013-12-24 12:23:20 +01:00
Alexander Harkness
8c91f7062a
fixed compile?
2013-12-24 10:36:06 +00:00
Alexander Harkness
af6389ea7a
finally removed them all?
2013-12-24 10:30:36 +00:00
Alexander Harkness
8674c6800f
updated another file...
2013-12-24 10:29:18 +00:00
Alexander Harkness
b397dc438b
Updated MakeColour's defenition in the header.
2013-12-24 10:24:08 +00:00
Alexander Harkness
085008ff8c
Update as per xoft's instructions.
2013-12-24 10:17:44 +00:00
Alexander Harkness
be79d12966
Update chat colours
...
@madmaxoft, is this right? fixes #467
2013-12-24 10:14:33 +00:00
madmaxoft
5bbe72bc90
Replaced esCreeper with esMonster.
...
Any monster will be able to explode, and also this fixes #425 .
2013-12-23 22:36:22 +01:00
Tiger Wang
1014c737a4
Improved player fall particle positions
2013-12-23 21:18:01 +00:00
Tiger Wang
76444470a4
Provides an enhancement to daylight sensors
2013-12-23 15:22:05 +00:00
tonibm19
99ade2fa12
Improved iron golem detection algorithm
...
- You need to make it like in vanilla
- Only used blocks are removed
2013-12-23 12:00:08 +01: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
003043f8ab
Added some comments in main.cpp
2013-12-23 09:41:34 +00:00
tonibm19
c6946fb8c4
Some fixes (SEE DESC)
...
-Added missing mobs (wither, enderdragon and iron golem) to type to string list.
-Wither and iron golem can now spawn
2013-12-23 10:32:49 +01:00
tonibm19
b95ee2d230
You can now spawn iron golems.
...
You can spawn them like in vanilla.
2013-12-23 10:26:45 +01:00
Tiger Wang
11fbfb458d
Daylight sensor sensing enhancement
2013-12-22 23:20:43 +00:00
Tycho Bickerstaff
d0cd9a2b36
added link dependency between WorldStorage and OSSupport
2013-12-22 22:52:21 +00:00
STRWarrior
5af74fe77c
Fixed bug where snowgolems could replace non-solid blocks to snow blocks.
2013-12-22 21:12:34 +01:00
Tiger Wang
48b388aa97
A fix for daylight sensors
2013-12-22 20:06:15 +00:00
Tiger Wang
b02a81678c
Implemented knockback and critical hit
2013-12-22 20:04:17 +00:00
Tiger Wang
43e8196309
Added many event catchers
...
* Window close
* CTRL-C
* etc.
2013-12-22 20:03:58 +00:00
Tiger Wang
945ba36d1b
Implemented fall particles
2013-12-22 20:03:09 +00:00
STRWarrior
5a9b26d322
Snow golems die in hot biomes and leave a snow trail.
2013-12-22 20:40:07 +01:00
STRWarrior
4115724736
You can spawn snow golems with snow blocks and pumpkins.
2013-12-22 20:15:56 +01:00
STRWarrior
488d7ddd7d
EnderDragons and SnowGolems are able to spawn.
2013-12-22 20:15:09 +01:00
STRWarrior
05c670dc50
Fixed cacus breaking when next to any non-air block.
2013-12-22 18:37:56 +01:00
Tycho Bickerstaff
75abce905d
fixed bad merge
2013-12-22 16:33:40 +00:00
Tycho Bickerstaff
10e5540f98
merged in more warning fixes
2013-12-22 16:25:02 +00:00
Tycho Bickerstaff
a295e0c342
merged in changes
2013-12-22 16:22:25 +00:00
Tycho Bickerstaff
09b9661fff
Merge branch 'master' into threadsafequeue
2013-12-22 16:14:34 +00:00
Tycho Bickerstaff
15a980a616
merged in warnings changes
2013-12-22 16:11:34 +00:00
