1
0
Commit Graph

253 Commits

Author SHA1 Message Date
madmaxoft
e3117d797e Moved profiling scripts into the MCServer folder.
Also they default to the 2010 version of the tools, which is Win7-compatible, and should be 64-bit-compatible, too.
2014-01-14 11:05:27 +01:00
madmaxoft
118b7a121b Moved the win resources into a separate subfolder.
This will allow us to use them in CMake builds.
2014-01-12 17:57:29 +01:00
Mattes D
751c53ecc6 Merge pull request #532 from mc-server/LuaStateErrorHandler
Lua state error handler
2014-01-11 23:33:29 -08:00
madmaxoft
acfebab027 Removed an unused file. 2014-01-11 21:22:40 +01:00
Bill Derouin
1c2004dfbb Fixed missing externals
Turns out you actually have to include the .cpp in the project file
2014-01-10 09:23:53 -06:00
Bill Derouin
cee76f1ace Move biome definition to separate files 2014-01-09 15:21:46 -06:00
Diusrex
ed9a500d6b Undid the changes to cryptlib.cpp.
Instead, altered the VC2008 cryptopp project settings.

Someone else will probably need to do the same thing for the 2013 version, since I don't have access to VC2013.
2014-01-06 10:12:40 -07:00
madmaxoft
0a712931b1 Fixed a race condition in the cQueue class.
Fixes #505.
2014-01-05 15:15:59 +01: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
0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00:00
STRWarrior
4a02898683 Added the Floater files to MCServer.vcproj 2013-12-19 17:46:12 +01:00
Tycho Bickerstaff
1149ab216c Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux
This reverts commit 906fd50343.
2013-12-18 23:14:31 +00:00
madmaxoft
4608beb3c6 Fixed tolua++ compilation.
Duplicate files, wrong includes, const-incorrect code...
2013-12-08 18:24:56 +01:00
madmaxoft
fd68095acc Fixed VS2008 compilation after those huge changes. 2013-12-08 18:13:30 +01:00
Mattes D
6f23d2ec94 Merge pull request #404 from mc-server/fixesnfeatures
Fixes n' features
2013-12-08 09:07:34 -08:00
madmaxoft
906fd50343 Removed unused ToLua files.
Those were used to compile the tolua executable and were getting in the way - Unix makefile tried to compile them into MCS.
2013-12-08 18:05:49 +01:00
Tiger Wang
166f07029d Fixed binding generation and VS2013 compile 2013-12-08 14:45:24 +00:00
madmaxoft
044fd237b6 Moved bindings-related to a Bindings subfolder.
Ref.: #407
2013-12-08 12:17:54 +01:00
madmaxoft
fb2df44458 Fixed LuaStatic intermediate and output folders. 2013-12-04 21:35:29 +01:00
madmaxoft
4fd876aa7c Added a new Debug_LuaStatic configuration.
This re-enables plugin debugging using Decoda, lost when we moved Lua out to a DLL.
2013-12-04 20:35:54 +01:00
madmaxoft
28e905bfff Fixed a linker warning in MSVC debug build. 2013-12-03 22:18:03 +01:00
madmaxoft
0e48fd35bd Made Lua compila as a standalone DLL on Windows.
This enables us to use LuaRocks.
2013-12-03 21:37:34 +01:00
madmaxoft
70cf0c09a8 The server builds and uses Lua as DLL in Debug mode.
This is a test to see how LuaRocks will interact. Only debug mode on Windows is affected, all other platforms and modes are unchanged.
2013-12-02 22:36:59 +01:00
madmaxoft
8e4a1b2ca1 Added the trapdoor header to project file. 2013-11-30 14:52:35 +01:00
madmaxoft
251647f3bd Fixed compilation in VS2008. 2013-11-30 13:54:10 +01:00
madmaxoft
97b03df372 Fixed Win nightbuild scripts after folder moves. 2013-11-27 14:24:36 +01:00
madmaxoft
2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01: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
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
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Tiger Wang
3c2e7f1aad Fixed Visual Studio Files 2013-11-24 17:30:42 +00:00
madmaxoft
082573771f Added cSignEntity into API, added cChunkDesc:GetBlockEntity().
This fixes both #228 and #347.
2013-11-14 15:37:09 +01:00
Daniel O'Brien
452f589e21 added tolua export snippet for VC 2013-11-14 16:29:33 +11:00
madmaxoft
b6ca98f380 Removed cStringMap.
It wasn't used for anything anymore.
2013-11-09 19:54:52 +01:00
Tiger Wang
72ec10f26d Readded BlockPortal.h (portals) 2013-11-02 00:50:03 +00:00
madmaxoft
dab398d5d6 Added 1.7 to protocol recognizer.
The 1.7 protocol currently only reports server description and playercount.
2013-10-30 23:24:46 +01:00
madmaxoft
628eebefd3 Ignoring a few generated files. 2013-10-21 21:40:14 +02:00
madmaxoft
848d061de1 Moved all MobTypesManager functions to cMonster.
This removes some of the memory leaks and is more logical in structure. Also the functions are exported to Lua.
2013-10-20 13:25:56 +02:00
madmaxoft
126ce169f2 Fixed project file after mob update. 2013-10-18 12:54:27 +02:00
madmaxoft
e62cac07c0 Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. 2013-10-13 18:26:45 +02:00
madmaxoft
55999ee118 Moved cMakeDir::MakeDir to cFile::CreateFolder.
And exported to Lua.
2013-10-09 09:57:48 +02:00
Tiger Wang
5db6213f34 Initial Metadata Commit [SEE DESC]
+ Pigs, Minecarts, Sheep, Skeletons, Slimes, Villagers, Wolves, and
Horses have metadata
+ Base code on taming wolves, shearing sheep, and taming horses
+ Sheep and horses have different colours when spawned
2013-10-08 19:20:49 +01:00
madmaxoft
e52dae2c51 Removed the old WebServer library. 2013-10-05 23:12:06 +02:00
madmaxoft
1012fd82fd HTTP Server can now parse multipart/form-data forms; better architecture. 2013-10-04 13:13:34 +02:00
madmaxoft
8130e6dd54 Created basic cHTTPFormParser.
It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 19:30:25 +02:00
madmaxoft
d0b9e81795 Split cHTTPConnection implementation into a separate file. 2013-09-27 19:34:46 +02:00
madmaxoft
f4efcb9080 Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes. 2013-09-27 18:14:26 +02:00
madmaxoft
11e0c73ffd Implemented basic HTTP message header parsing. 2013-09-24 20:52:37 +02:00
Tiger Wang
a8a45a4afc Added button placement handler
Also removed an unneeded variable in the stair handler
2013-09-22 19:34:42 +01:00