1
0
Commit Graph

1867 Commits

Author SHA1 Message Date
tonibm19
8a6511d329 fixed indentation 2013-10-28 21:45:49 +01:00
tonibm19
b26acdb9db extra line 2013-10-28 21:41:43 +01:00
tonibm19
669beef2de attempt at fixing indentation 2013-10-28 21:37:45 +01:00
tonibm19
b182f25324 Extra line 2013-10-28 21:00:14 +01:00
tonibm19
1841d77952 Fixed indentation 2013-10-28 20:58:50 +01:00
tonibm19
8c9fa9cf35 Added random chicken spawn when throwing an egg 2013-10-28 20:57:04 +01:00
tonibm19
1ff051c9a3 Now saddled horses spawn a saddle pickup when killed 2013-10-28 20:28:16 +01:00
tonibm19
5a723454a9 Now saddle pigs spawn a saddle pickup when killed 2013-10-28 20:27:05 +01:00
madmaxoft
1eac38f3d7 Fixed indentation in tonibm19's code. 2013-10-28 19:54:03 +01:00
Mattes D
65b43604a5 Merge pull request #294 from tonibm19/patch-3
Correct wool drops when shearing a sheep.
2013-10-28 11:51:46 -07:00
tonibm19
984277f65e Fixed compilation
STR_Warrior code had an error (I copied&pasted it before)
2013-10-28 19:47:38 +01:00
tonibm19
6e554c3b52 Use STR_Warrior code and changed variable name 2013-10-28 19:42:02 +01:00
madmaxoft
df20c19986 Renamed cWindow constants to include the "wt" prefix. 2013-10-28 13:30:24 +01:00
tonibm19
144b528257 Extra line 2013-10-27 10:42:16 +01:00
tonibm19
a42561cf5a Sheep fixes.
Now amount of wool you get when shearing a sheep is random.
Sheeps only spawn in white color (I will add sheep dying soon).
2013-10-27 10:41:25 +01:00
madmaxoft
3fa03e854f Added cChunk::UnboundedRelGetBlockLights().
This queries both BlockLight and SkyLight for the specified block.
2013-10-27 09:19:13 +01:00
madmaxoft
a7d44d69dd Authenticator doesn't save the ini file.
Didn't load it -> shouldn't save it.
2013-10-27 09:09:39 +01:00
madmaxoft
f032a2ff74 Merge branch 'origin/LoadWorlds/cAuthenticatorINI' 2013-10-27 09:04:39 +01:00
STRWarrior
cb06f35cb8 Changed "cIniFile IniFile" to cIniFile & IniFile" 2013-10-26 19:47:12 +02:00
madmaxoft
52f88b9595 Merge branch 'IniFileCleanup' 2013-10-26 19:43:34 +02:00
STRWarrior
77661f4c59 Both the LoadWorlds() function and cAuthenticator now use the cIniFile object from the Root::Start() function. 2013-10-26 17:08:28 +02:00
madmaxoft
323ebf119f cIniFile: Renamed functions to make meaning more explicit.
For example KeyComment() -> GetKeyComment() / AddKeyComment()
2013-10-25 11:38:14 +02:00
madmaxoft
9e9198e090 cIniFile doesn't store filename internally anymore. 2013-10-25 11:15:44 +02:00
madmaxoft
86bec4c57c cMonster: Improved doxycomments. 2013-10-25 10:41:19 +02:00
madmaxoft
5331555708 Renamed cMonster::GetSpawnRate() to GetSpawnDelay(). 2013-10-24 16:45:13 +02:00
madmaxoft
99d369d837 cPickup cleanup. 2013-10-24 16:44:25 +02:00
madmaxoft
625c5f86de Fixed cPickup's constructor's parameter naming. 2013-10-24 15:05:23 +02:00
madmaxoft
eca6955a2d Cleanup in cPlayer. 2013-10-24 12:24:40 +02:00
madmaxoft
d359c5a2fe Unified cPlayer's Heal() function with cEntity's. 2013-10-24 12:24:39 +02:00
Alexander Harkness
54f5f71c9a Merge pull request #286 from tigerw/pickupdelay
Pickups now have collection delay when vomited
2013-10-23 23:36:25 -07:00
Tiger Wang
4d2c810c64 Pickups now have collection delay when vomited
Implements FS#394.
2013-10-24 00:30:20 +01:00
madmaxoft
88db43e8d3 Fixed cLuaWindow's binding.
No longer exporting multiple inheritance.
2013-10-23 13:31:04 +02:00
madmaxoft
b8a2793228 Fixed bindings for cHopperEntity:GetOutputBlockPos(). 2013-10-23 12:09:11 +02:00
madmaxoft
90bea6a914 Fixed cDropSpenserEntity bindings generating an extra var.
Caused by inadvertently exporting multiple-inheritance from a class that is not Lua-exported.
2013-10-23 11:17:16 +02:00
madmaxoft
730195c47e Exported cHopperEntity to API.
This allows hoppers to be created by plugins during chunk generation.
2013-10-23 11:12:04 +02:00
madmaxoft
d3db97301b Removed cRoot:m_PrimaryServerVersion from Lua API.
We have the accessor methods for it.
2013-10-23 11:06:39 +02:00
madmaxoft
0152a6ffb4 Temporary fix for world not locking chunkmap in TickMobs.
Reported as #283; this is a hotfix only.
2013-10-22 18:30:26 +02:00
madmaxoft
4cf0862c12 Fixed an assert in cMonster 2013-10-22 17:54:23 +02:00
madmaxoft
76ed2f441a Implemented UnboundedRel BlockLight and SkyLight.
Also unified the various UnboundedRel operations to use the same underlying structure.
2013-10-22 17:54:09 +02:00
madmaxoft
3a95aad523 Added ASSERTs to all ChunkDef operations.
This should avoid errors such as #276.
2013-10-21 21:38:31 +02:00
madmaxoft
5174d9cbd6 Fixed GetHTMLEscapedString() binding, removed obsolete memory function from API. 2013-10-21 13:22:47 +02:00
madmaxoft
b6741865f2 Fixed memory leak in cMobFamilyCollecter. 2013-10-20 14:16:21 +02:00
madmaxoft
d8576a7953 Reimplemented cMonster::FamilyFromType() as a simple switch (duh!) 2013-10-20 14:15:55 +02:00
madmaxoft
6075f7cecd Fixed memory leaks in cMobCensus, moved GetSpawnRate() to cMonster. 2013-10-20 14:00:45 +02:00
madmaxoft
71d06e3015 Fixed binary search in StringToMobType(). 2013-10-20 13:42:59 +02:00
madmaxoft
d16d0a7ab7 Fixed memory leaks in cMobSpawner. 2013-10-20 13:33:23 +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
359918127b Rewritten MobTypesManager not to leak memory. 2013-10-20 13:10:21 +02:00
madmaxoft
34928378b8 Fixed loading allowed mobs in world. 2013-10-20 10:23:30 +02:00
madmaxoft
0258213d24 Merge branch 'htmlescape'. 2013-10-20 09:14:30 +02:00