1
0
Commit Graph

8269 Commits

Author SHA1 Message Date
Mattes D
439eb8d6cb Merge pull request #1807 from flx5/master
Fixes #493 and #490
2015-03-11 22:43:52 +01:00
Alexander Harkness
b43ac6f0ed Merge pull request #1804 from mc-server/streamlinetravis
Streamline Travis testing
2015-03-11 20:06:22 +00:00
Alexander Harkness
98a4a1f3cd Reduced number of build jobs. 2015-03-11 20:06:07 +00:00
flx5
f6912bd01c Fixed coding conventions for Pull Request #1807 2015-03-11 20:02:11 +01:00
flx5
d8ab99e944 Fixed issue with quotes not appearing in pairs 2015-03-11 19:52:49 +01:00
Mattes D
1b60fe12a8 Merge pull request #1665 from mc-server/Inventory
Own classes for all windows and implemented vanilla-like shift click.
2015-03-11 14:26:04 +01:00
Mattes D
3b91e31ccd Merge pull request #1805 from mc-server/chunkDataFix
Fixed Bug in cChunkData.
2015-03-11 09:56:49 +01:00
flx5
76012ee090 Fixed some markup issues 2015-03-11 04:38:15 +01:00
flx5
451ab6860f Fixed some markup issues 2015-03-11 04:33:17 +01:00
flx5
d130696e95 Fixes #493 and #490 2015-03-11 04:14:17 +01:00
Tiger Wang
12971c4ce2 Reduce amount of testing, realises #1795 2015-03-10 22:48:39 +00:00
worktycho
45fa2d98db Fixed Bug in cChunkData.
FIxed a bug where if the index was not aligned with the sections empty sections would not be set in the correct location.
2015-03-10 20:32:01 +00:00
Howaner
685f6e3713 Moved window code into cpp files 2015-03-10 19:40:53 +01:00
Howaner
a96c21fc0d Merge branch 'master' into Inventory 2015-03-09 22:39:11 +01:00
Howaner
ce6219530a Fixed client kick/crash if many block changes happend 2015-03-09 22:32:12 +01:00
Mattes D
5b74987a59 Merge pull request #1794 from mc-server/MesaPlateauF
Mesa plateau F
2015-03-08 15:59:30 +01:00
STRWarrior
d19f2a472b Added parenthesis around the comparisons 2015-03-08 15:22:01 +01:00
STRWarrior
2bbfd0341f Added proper trees to Mesa biomes
Mesa only has small apple trees.
2015-03-08 13:30:21 +01:00
STRWarrior
134246fb15 Added grass/course dirt layer on MesaPlateauF(M) 2015-03-08 13:29:49 +01:00
Tiger Wang
3d81b0093e Merge pull request #1784 from mc-server/SteppyHeiGen
Added Steppy height generator.
2015-03-06 11:53:12 +00:00
Alexander Harkness
ebaf1a870c Updated license year. 2015-03-05 21:05:05 +00:00
Tiger Wang
6d62a51d53 Merge pull request #1791 from joshi07/master
Added OnEntityTeleport.lua + description to APIDump
2015-03-05 20:28:59 +00:00
Alexander Harkness
7348bf3853 Grass checks for sufficient light before spreading 2015-03-05 19:30:00 +00:00
joshi07
3cef52a7f7 Added OnEntityTeleport.lua hook to APIDump 2015-03-05 20:08:32 +01:00
joshi07
a5e1f970a6 Added description to APIDump for OnEntityTeleport 2015-03-05 19:44:15 +01:00
Mattes D
78120db487 Merge pull request #1790 from joshi07/master
Added OnTeleportEntity hook for plugins.
2015-03-05 13:57:19 +01:00
joshi07
f71b1fe799 Added OnTeleportEntity hook for plugins.
Plugins may or may not allow teleport to the new position.
Updated the HookNotify plugin with it.
2015-03-05 11:52:42 +01:00
Mattes D
d4b505db02 Lua API: Fixed md5 and sha1 hex formatting.
std::setw() is only valid for one output operation and needs to be set again in each loop repetition.
2015-03-03 01:28:58 +01:00
Mattes D
7767af9493 Merge pull request #1781 from mc-server/Vines
Vines in caves
2015-03-01 22:52:40 +01:00
STRWarrior
db2a406c13 Removed trailing whitespace 2015-03-01 20:09:44 +01:00
STRWarrior
3d3735a378 Replaced IntNoiseXX with IntNoiseXXInt 2015-03-01 20:08:05 +01:00
STRWarrior
e63f9bdc1a Replaced cFinishGenPtr with std::make_shared 2015-03-01 20:06:44 +01:00
Mattes D
d2e1ed3a3b Steppy HeiGen: Fixed Linux compilation. 2015-03-01 12:40:53 +01:00
Mattes D
a20c1c6d43 Merge pull request #1780 from DevToaster/master
Modified Player class to use int data type for experience
2015-03-01 12:16:06 +01:00
Mattes D
780a9ae9d1 Added Steppy height generator. 2015-03-01 12:13:39 +01:00
Mattes D
a22a81ef4b Debuggers plugin: Disabled WECUI manipulation. 2015-03-01 12:12:10 +01:00
Alexander Harkness
f53e225189 Fixed raspi easyinstall.
Fixes #1782
2015-03-01 10:10:34 +00:00
STRWarrior
0394acfc0c Made the minimum vine level configurable 2015-02-28 22:40:13 +01:00
STRWarrior
19d7ec51a0 Implemented a vines finisher that creates vines in jungle biomes 2015-02-28 22:37:33 +01:00
DevToaster
f5a216cabc Changed C-styled casts to static_cast and removed unneeded casts 2015-03-01 03:45:06 +10:30
NiLSPACE
24bb911c3c Merge pull request #1769 from mc-server/snowweather
Snow weather
2015-02-28 18:05:06 +01:00
Mattes D
c5f60639e6 Merge pull request #1779 from mc-server/DoorHingesFix
Fixed door placement.
2015-02-28 17:49:26 +01:00
DevToaster
e012c06281 Replaced short int with int for Player experience 2015-03-01 03:09:36 +10:30
DevToaster
b65a6ef210 modified: src/Entities/Player.cpp
modified:   src/Entities/Player.h
2015-03-01 03:03:41 +10:30
STRWarrior
224df08d30 GetSnowStartHeight returns an int 2015-02-28 17:27:28 +01:00
Mattes D
88fc70a06a Fixed door placement.
Doors now have hinges on the correct side, based on what the surroundings are when placing them.
2015-02-28 17:16:21 +01:00
Alexander Harkness
958834f5e9 Merge pull request #1778 from mc-server/OreXP
Added experience drops when mining ores
2015-02-28 15:57:50 +00:00
STRWarrior
e63b4f4913 Added experience drops when mining ores 2015-02-28 16:34:17 +01:00
STRWarrior
81e8577cfd changed int to unsigned
And return 0 instead of -1
2015-02-26 20:26:45 +01:00
Mattes D
e7708d483e Merge pull request #1771 from Raekye/master
Use DoSetSpeed in AddSpeed* in Entity.cpp
2015-02-26 09:10:56 +01:00