Commit Graph
100 Commits
Author SHA1 Message Date
Alexander Harkness 2d9179f4ab Merge branch 'master' of github.com:mc-server/MCServer 2014-10-11 21:41:04 +01:00
Alexander Harkness f42d520ccf Added a guide to the easy install method. 2014-10-11 21:40:32 +01:00
Alexander Harkness b19742fe5a Added easy installation method for Linux. 2014-10-11 21:31:49 +01:00
Alexander Harkness 6af9d5ba01 Fixed compilation. 2014-10-11 18:39:46 +01:00
Alexander Harkness 93833069a8 Merge branch 'master' into issue850
Conflicts:
	src/BlockID.h
2014-10-11 18:32:21 +01:00
Alexander Harkness faa8e721d5 Reverted submodule changes. 2014-10-11 17:03:30 +01:00
Alexander Harkness 01f7ff303d Reordered .gitmodules. Fixes #496 2014-10-08 21:14:02 +01:00
Alexander Harkness fa00cbeda3 Added MagicCarpet 2014-10-08 21:13:38 +01:00
Alexander Harkness 27e69f32c6 Removed MagicCarpet 2014-10-08 21:13:10 +01:00
Alexander Harkness ccbd5ba6a2 Added Handy. 2014-10-08 21:11:09 +01:00
Alexander Harkness 3b68949cc9 Added ChatLog 2014-10-08 21:08:21 +01:00
Alexander Harkness 8f625867f7 Removed ChatLog. 2014-10-08 21:07:55 +01:00
Alexander Harkness ce11888851 Added chunkWorx. 2014-10-08 21:05:24 +01:00
Alexander Harkness de41e2a04c Removed ChunkWorx 2014-10-08 21:04:26 +01:00
Alexander Harkness ad42adb5fa Removed polarSSL makefile. Fixes #591.
Also normalises polarssl submodule URL.
2014-09-27 12:04:54 +01:00
Alexander Harkness 28c385d38e Merge pull request #1434 from Masy98/master
Added me to the contributors list
2014-09-14 17:03:24 +01:00
Alexander Harkness 1707a149f7 Gittip is now Gratipay
Also, 7000th Commit!
2014-09-13 12:04:20 +01:00
Alexander Harkness 76a73b2528 Updated CI Links to new ones. 2014-09-13 12:03:29 +01:00
Alexander Harkness 32002694b0 Grammar fixes. 2014-09-10 18:47:59 +01:00
Alexander Harkness 35a42fc437 Merge pull request #1413 from mc-server/versionInfo
Added abilty to set build info
2014-09-10 17:50:18 +01:00
Alexander Harkness 13016c6163 Update Zip2008_PDBs.list 2014-09-09 13:27:26 +01:00
Alexander Harkness 130b2b8991 Update Zip2008.list 2014-09-09 13:27:02 +01:00
Alexander Harkness ed79622734 Merge pull request #1316 from ChriPiv/master
Add entry for bat in monsters.ini
2014-08-11 19:24:33 +01:00
Alexander Harkness 4fd9ac60e0 Merge pull request #1204 from Howaner/Blocks
Fix sapling drop.
2014-07-17 20:40:14 +01:00
Alexander Harkness d33881d752 Restored style continuity. 2014-06-21 21:07:31 +01:00
Alexander Harkness 35a4aa419c Merge pull request #1096 from mc-server/redstonerefactor
Moved delayed repeaters to be handled in a seperate pass
2014-06-18 21:22:53 +01:00
Alexander Harkness 383c5c2c89 Typo Correction 2014-06-12 19:31:16 +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
Alexander Harkness f9fd519360 Changed the teleport permissions to the new ones. 2014-06-11 17:26:10 +01:00
Alexander Harkness c335b8d773 Update APIDesc.lua 2014-06-11 13:34:49 +01:00
Alexander Harkness c09207cabc SMICOLOSL
Meant to be semicolons up there.
2014-06-11 13:20:31 +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
Alexander Harkness fd2ff3845e Update GETTING-STARTED.md 2014-06-11 08:49:33 +01:00
Alexander Harkness 5950212829 Test 2014-06-11 07:40:58 +01:00
Alexander Harkness d5679f51de Removed derpbadge. 2014-06-11 07:39:18 +01:00
Alexander Harkness c5d1ca7dac Small change for easier understanding. 2014-06-08 20:54:41 +01:00
Alexander Harkness e5da3097de Corrected the furnace fuels. Solves #1071 2014-06-07 18:25:18 +01:00
Alexander Harkness e06f786f11 Stuff. 2014-05-27 20:24:04 +01:00
Alexander Harkness 2194238ef0 Update main.css 2014-05-26 17:17:54 +01:00
Alexander Harkness 1d6dbb6278 Minor fixes. 2014-05-26 12:29:45 +01:00
Alexander Harkness 69c3964875 Update README.md 2014-05-26 10:50:42 +01:00
Alexander Harkness 16e4af0793 Update README.md 2014-05-26 10:50:17 +01:00
Alexander Harkness a352ec3895 SEMICOLONS! 2014-05-25 19:46:16 +01:00
Alexander Harkness 50e29aba77 A fix that is better than #950. 2014-05-25 18:32:42 +01:00
Alexander Harkness 882e8e044c Update README.md 2014-05-25 10:21:58 +01:00
Alexander Harkness 34d69bd589 Update README.md 2014-05-25 10:08:26 +01:00
Alexander Harkness bcdced34ab Update README.md 2014-05-25 10:06:41 +01:00
Alexander Harkness 43eaa573fd Updated the installation instructions in the README. 2014-05-25 10:03:53 +01:00
Alexander Harkness 2eca98a41a Update README.md 2014-05-24 22:04:15 +01:00
Alexander Harkness cc2b84ed9e Update README.md 2014-05-24 22:03:31 +01:00
Alexander Harkness ecb358a36e Update README.md 2014-05-24 22:02:19 +01:00
Alexander Harkness deb69f150d Standardised a badge. 2014-05-24 22:00:16 +01:00
Alexander Harkness 0d7dd5fe76 Update README.md 2014-05-24 21:56:56 +01:00
Alexander Harkness bd68b71dd7 Update README.md 2014-05-24 21:55:55 +01:00
Alexander Harkness 078b5f6506 Update README.md 2014-05-24 21:55:02 +01:00
Alexander Harkness 86086aa357 Update README.md 2014-05-24 21:49:45 +01:00
Alexander Harkness bc4d7b3d35 Update README.md 2014-05-24 21:48:38 +01:00
Alexander Harkness f3a8560f89 Update README.md 2014-05-24 21:48:12 +01:00
Alexander Harkness 507df71845 Update Player.cpp 2014-05-20 13:35:39 +01:00
Alexander Harkness 1de4408a18 Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Alexander Harkness 6de0257bbe Derp 2014-05-19 13:31:19 +01:00
Alexander Harkness dc39d88d3f Should have fixed assumptions about entity width.
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Alexander Harkness 70cf4a5eaf Fixed clanging errors.
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01: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
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
Alexander Harkness 5f5bdaca65 Merge pull request #870 from wiseoldman95/patch-1
Comments: Inverted Z axis.
2014-04-08 16:09:11 +01:00
Alexander Harkness c388b84267 Merge pull request #869 from wiseoldman95/patch-1
Added comments regarding latching and orientation
2014-04-08 15:15:39 +01: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
Alexander Harkness 20a12beec3 Merge pull request #865 from wiseoldman95/patch-2
Redstone simulator - cleaning up repeater lock code
2014-04-07 19:20:37 +01: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
Alexander Harkness 4082adbbad Fix some of the comments in the PR tycho just did. 2014-04-07 11:35:37 +01:00
Alexander Harkness 76b321a0f4 Merge pull request #861 from worktycho/simulator
Added support for redstone latching
2014-04-07 11:32:57 +01:00
Alexander Harkness dc1d620c90 Merge pull request #845 from mc-server/License
License
2014-03-30 17:34:33 +01:00
Alexander Harkness 411c4ddd79 Merge pull request #779 from mc-server/tntburnexplode
TNT explodes when consumed by fire
2014-03-10 18:57:12 +00:00
Alexander Harkness 61b68bd519 Merge pull request #788 from worktycho/warnings
Fixed some warnings
2014-03-10 17:44:08 +00:00
Alexander Harkness 4638d8f5e2 Merge pull request #770 from xdot/master
cBlockInfo-related changes from #723
2014-03-08 11:44:16 +00:00
Alexander Harkness 03624f33a7 Merge pull request #730 from tonibm19/master
added mooshroom to cow conversion
2014-02-27 21:15:47 +00:00
Alexander Harkness 72d312ac9b Merge pull request #690 from tonibm19/master
Now mobs can't escape from fences.
2014-02-17 16:12:59 +00:00
Alexander Harkness 745ad159f3 Merge pull request #688 from worktycho/Flags
Added -Wextra
2014-02-17 11:04:00 +00:00
Alexander Harkness d47e0b055b Merge pull request #692 from mc-server/wolfcleanup
Wolf cleanup
2014-02-17 10:21:38 +00:00
Alexander Harkness 16df93c500 Merge pull request #685 from MuhammadWang/patch-1
Fixed a minor error
2014-02-16 07:08:51 +00:00
Alexander Harkness 233f0add29 Merge pull request #682 from Howaner/GlobalFixes
Disable Hunger Death; Add Exp Bottle Effect; Set max. Tablist Players to 60
2014-02-16 07:05:11 +00:00
Alexander Harkness 584f7bd806 Merge pull request #679 from mc-server/NotchDeath
NotchApple
2014-02-15 19:04:13 +00:00
Alexander Harkness a57c8bd7da Merge pull request #677 from mc-server/BroadcastParticleEffect
Broadcast particle effect
2014-02-15 10:52:31 +00:00
Alexander Harkness 2152b8ca19 Merge pull request #659 from tonibm19/master
Maybe fixed boat placing
2014-02-10 17:27:46 +00:00
Alexander Harkness b9aa0420a3 Merge pull request #646 from worktycho/warningfixes
Fixed most of the reordering warnings
2014-02-05 18:24:08 +00:00
Alexander Harkness f9a4c49fd4 Contributors now match real life, and are alpha-sorted. 2014-01-31 17:16:08 +00:00
Alexander Harkness 79ef653cb7 Fixed some more. 2014-01-31 07:41:21 +00:00
Alexander Harkness d3b8796c48 Fixed at least a little of the plugin guide. 2014-01-30 21:19:45 +00:00
Alexander Harkness e0cb06dfae Update Core 2014-01-30 17:54:10 +00:00
Alexander Harkness 6b51c62d78 Merge pull request #586 from worktycho/BindingsMove
Implented xofts suggestions in #577
2014-01-25 05:53:01 -08:00
Alexander Harkness e21dcb3809 Merge pull request #582 from worktycho/BindingsMove
added dependecies for bindings regen
2014-01-23 11:56:12 -08:00
Alexander Harkness 9c93ab15ab Fix a crash but somewhere... 2014-01-20 19:02:37 +00:00
Alexander Harkness b3ac2d9e23 Fix bad nested headings. 2014-01-18 15:17:19 +00:00
Alexander Harkness 935600bf0a Merge pull request #554 from worktycho/compression
Added user setting compression factor
2014-01-17 11:11:37 -08:00