1
0
Commit Graph

1847 Commits

Author SHA1 Message Date
madmaxoft
52f88b9595 Merge branch 'IniFileCleanup' 2013-10-26 19:43:34 +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
Alexander Harkness
3272b45bc5 Added a string reserve. 2013-10-19 21:30:54 +01:00
Alexander Harkness
5ba998174a Fixed compile error. silly parentheses creeping in. 2013-10-19 21:21:44 +01:00
Alexander Harkness
0677872d88 Changed the code according to xoft's suggestions. 2013-10-19 21:13:47 +01:00
Alexander Harkness
f7c9230106 Fixed general failings with everything. Fixes #211.
My editor fixed some extra tabs in globals.
2013-10-19 17:37:47 +01:00
Alexander Harkness
9701a7fb84 Added a HTML escaping function to cWebAdmin.
Apparently my editor fixed some failed tabs too.
2013-10-19 17:17:33 +01:00
madmaxoft
ca538d5323 Adapted code style. 2013-10-18 20:02:53 +02:00
madmaxoft
24aad485b9 StringToItem() recognizes "ItemName:Dmg" strings.
This allows commands such as "/i woodenshovel:40"
2013-10-18 18:13:20 +02:00
madmaxoft
546dbf3c53 Fixed item-breaking.
This fixes #232.
2013-10-18 18:01:19 +02:00
madmaxoft
5d4fa298d3 Fixed indentation and re-styled conditions. 2013-10-18 16:34:01 +02:00
Mattes D
2a9997881c Merge pull request #259 from tonibm19/patch-2
Fixed horse saddle
2013-10-18 07:29:23 -07:00
madmaxoft
e6bb025a9f Fixed webadmin logging.
This fixes #262.
2013-10-18 12:50:50 +02:00
Mattes D
8bba2b02a1 Merge pull request #253 from SamJBarney/master
Merge of Mob Spawning code by mgueydan
2013-10-18 03:41:43 -07:00
tonibm19
2c187e53b7 Moved lines
don't know if I did well
2013-10-17 21:28:45 +02:00
tonibm19
90c39c55a9 More fixes
- You can only tame horses with nothing at hand
- Fixed rearing
2013-10-17 18:41:52 +02:00
tonibm19
137ed5a556 Improved horse saddling [SEE DESC]
Now it checks if horse is already saddled, and if it's, you don't lose the saddle. Also, if the horse isn't tammed, you can't saddle it.
2013-10-16 19:50:59 +02:00
madmaxoft
6a1149cf46 Fixed compilation errors. 2013-10-16 15:15:51 +02:00
tonibm19
2f8a0a8a3a Added extra line 2013-10-15 21:26:43 +02:00
tonibm19
4ee2632d4f Fixed saddle horse 2013-10-15 21:25:33 +02:00
tonibm19
400cab0b86 Fixed a big fail.I did 2013-10-15 18:17:17 +02:00
tonibm19
06b7e09e70 Added extra line (yes, again) 2013-10-15 17:32:15 +02:00