1
0
Commit Graph

2963 Commits

Author SHA1 Message Date
madmaxoft
557ebc88d7 Removed faulty .gitattributes.
They cause git to think that files have been modified although they have not, and makes it impossible to revert the files to un-changed form.
See http://stackoverflow.com/questions/5009096/files-showing-as-modified-directly-after-git-clone 's first answer.
2013-11-27 09:32:53 +01:00
Mattes D
49760db89d Merge pull request #370 from mc-server/foldermove2
Moved all the folders :D
2013-11-27 00:23:17 -08:00
madmaxoft
2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Alexander Harkness
83d582d083 Removed a -Ofast bit. 2013-11-27 07:19:12 +00:00
Tiger Wang
b358032fe9 Makefile fix 2013-11-26 23:15:32 +00:00
Tiger Wang
e1f3cb1879 ANOTHER compile fix
This one was broken by bear. :P
2013-11-26 22:56:35 +00:00
Tiger Wang
2ef9cf700d Hopefully fixed last of the Linux compile errors 2013-11-26 22:50:33 +00:00
Tiger Wang
3e3e63d946 Compile fix again 2013-11-26 22:45:08 +00:00
Tiger Wang
f87bb1619e Fixed Linux compile again 2013-11-26 22:43:22 +00:00
Tiger Wang
2dee812667 Possibly fixed Linux makefile 2013-11-26 22:37:44 +00:00
Tiger Wang
1c526ed52b Fixed tolua++ files 2013-11-26 22:11:40 +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
Alexander Harkness
139bd34690 Merge branch 'master' into foldermove2 2013-11-26 17:15:39 +00:00
Alexander Harkness
770ef8c60b Fixed loads more of them. 2013-11-26 17:14:46 +00:00
Alexander Harkness
0b153f62f0 Another 2013-11-26 17:09:04 +00:00
Alexander Harkness
a6b67e9cc1 And another. 2013-11-26 17:06:58 +00:00
Alexander Harkness
c775011c98 Fixed another. 2013-11-26 17:06:26 +00:00
Alexander Harkness
66482c9db7 Fixed another one. 2013-11-26 17:06:00 +00:00
Alexander Harkness
f792117ce5 Fixed a mis-include 2013-11-26 17:04:07 +00:00
STRWarrior
686e0c12e2 cWorld::SpawnExperienceOrb() now returns the entity ID of the spawned orb.
Documented etExpOrb.
2013-11-26 15:37:15 +01:00
Mattes D
6041fa1e62 Merge pull request #368 from mc-server/ExpOrbs
Exp orbs
2013-11-26 01:48:46 -08:00
Tiger Wang
3466d2cad9 Fixed all outstanding VS compilation issues
Also updated VS2008 files.
2013-11-25 21:32:09 +00:00
STRWarrior
1358a74412 Added ExpOrb.cpp and ExpOrb.h to MCServer.vcproj. 2013-11-25 22:09:20 +01:00
STRWarrior
a0c6342a29 Documented SpawnExperienceOrb in cWorld 2013-11-25 21:51:52 +01:00
STRWarrior
960b1654a6 Exported cWorld::SpawnExperienceOrb() function to the Lua API. 2013-11-25 21:48:43 +01:00
STRWarrior
18b5ccbc08 Fixed Details Xoft gave.
Increased the range where orbs (should) track you.
Blazes give 10 xp now.
2013-11-25 21:43:43 +01:00
madmaxoft
0fef69e612 Fixed cFile compilation on Linux. 2013-11-25 21:24:41 +01:00
STRWarrior
dd76700d8d Added cWorld::SpawnExperienceOrb function.
Most mobs now give proper Exp.
2013-11-25 21:03:26 +01:00
STRWarrior
6641db0583 Implented ExpOrb class. 2013-11-25 20:05:52 +01:00
STRWarrior
f86f67907c Implented SendExperienceOrb in ClientHandle. 2013-11-25 20:04:39 +01:00
STRWarrior
b93d1b5027 Implented Spawn Experience Orb packet. 2013-11-25 20:04:01 +01:00
Tiger Wang
28b09377f3 Updated VS includes 2013-11-25 18:43:46 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
madmaxoft
2d68969a45 AnvilStats: Fixed compilation. 2013-11-24 22:10:27 +01:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Tiger Wang
16435995a5 Moved SQLite, LuaExpat, and MD5 to /lib 2013-11-24 17:33:47 +00:00
Tiger Wang
a92f475a75 Removed old project files 2013-11-24 17:31:53 +00:00
Tiger Wang
3c2e7f1aad Fixed Visual Studio Files 2013-11-24 17:30:42 +00:00
madmaxoft
274bdc40ff BiomeVisualiser: Added 1.7 biomes, recolored using AMIDST colors. 2013-11-24 17:49:04 +01:00
Alexander Harkness
a01d4a7b4a Removed excess includes. 2013-11-24 14:57:44 +00:00
Alexander Harkness
ac99f3df9d Removed extra endif. 2013-11-24 14:38:41 +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
4e463d591d Removed pedantic build and added optimisation to debug builds. 2013-11-24 14:31:36 +00:00
Alexander Harkness
998fb17fdc Moved tolua++ 2013-11-24 14:29:35 +00:00
Alexander Harkness
1de69f5b54 Moved zlib 2013-11-24 14:28:29 +00:00
Alexander Harkness
d7ca8ea57b Moved Lua 2013-11-24 14:27:32 +00:00
Alexander Harkness
4c67f49c87 Moved JSONCPP 2013-11-24 14:24:26 +00:00
Alexander Harkness
9c10729f00 Moved iniFile 2013-11-24 14:22:15 +00:00