Commit Graph

236 Commits

Author SHA1 Message Date
agrecascino
e6f850ce47 Merge pull request #17 from shamoanjac/master
Fixed powercap conversion
2016-08-15 15:47:34 -04:00
shamoanjac
3e3b69178c Fixed powercap conversion 2016-08-15 18:31:11 +02:00
agrecascino
e1dbcbf473 Merge pull request #16 from shamoanjac/master
fixes + powercap
2016-08-15 12:12:40 -04:00
shamoanjac
f44b059afc Fixed /f promote 2016-08-15 16:39:19 +02:00
shamoanjac
7137f09b4c Prepared power and maxpower for model migration 2016-08-15 15:00:57 +02:00
shamoanjac
19940d92ee Claiming chunks also lowers the power cap 2016-08-15 14:31:03 +02:00
shamoanjac
ad985c681d Updated version 2016-08-15 12:07:32 +02:00
shamoanjac
047ae6ae7c Added decrease_maxpower and increase_maxpower 2016-08-15 10:16:12 +02:00
shamoanjac
ba012f1c0a Small enhancements and switched from power-only system to power/maxpower 2016-08-15 09:54:28 +02:00
agrecascino
62f3b01498 Merge pull request #15 from shamoanjac/master
Fixed /f setspawn
2016-08-14 19:51:19 -04:00
shamoanjac
f5fd22c272 Fixed /f setspawn 2016-08-15 01:50:13 +02:00
agrecascino
bd3c2b4432 Merge pull request #14 from shamoanjac/master
Big fix
2016-08-14 18:57:09 -04:00
shamoanjac
c5c540cd01 Fixed faction creation not being broadcasted 2016-08-15 00:47:31 +02:00
shamoanjac
07c6968778 Fixed protection checking 2016-08-15 00:37:16 +02:00
shamoanjac
95ab0e3bfd Added some extra checks for building permissions + fixed /f promote 2016-08-15 00:24:30 +02:00
shamoanjac
c87e691a42 Fixed /f who showing only one person 2016-08-14 23:55:42 +02:00
shamoanjac
0670497f94 Small semantic change 2016-08-14 23:27:51 +02:00
shamoanjac
631a5b9808 Merge branch 'master' of https://github.com/shamoanjac/factions
Conflicts:
	chatcommands.lua
	factions.lua
2016-08-14 15:57:18 +02:00
shamoanjac
4df6d0357b Replaced "chunk" with "parcel" 2016-08-14 15:53:40 +02:00
shamoanjac
53e0398558 Replaced all references to "chunks" with the term "parcel" 2016-08-14 15:46:35 +02:00
shamoanjac
a38c82a4e7 Fixed player_faction being used instead of faction 2016-08-14 15:43:53 +02:00
agrecascino
df97039e3f Merge pull request #13 from shamoanjac/master
Fixed brackets bug
2016-08-12 11:19:27 -04:00
shamoanjac
4c3e5025d6 Fixed brackets bug 2016-08-12 17:18:09 +02:00
agrecascino
048e0a1d6d Merge pull request #12 from shamoanjac/master
Verbosity
2016-08-12 11:14:32 -04:00
shamoanjac
2d7237692a Added faction name to /f who and to /f 2016-08-12 17:09:43 +02:00
shamoanjac
abe814f195 Added /f chat command 2016-08-12 11:34:39 +02:00
shamoanjac
9931060c71 Enhanced doxygen comments 2016-08-12 11:16:43 +02:00
agrecascino
da573828f7 Merge pull request #11 from shamoanjac/master
fixes
2016-08-09 20:49:32 -04:00
shamoanjac
be791384bd Fixed add_player() and on_create 2016-08-10 02:46:54 +02:00
shamoanjac
3ec12936d6 Fixed formatting on /f newrank callback 2016-08-10 02:43:31 +02:00
shamoanjac
1f67d1ed01 Fixed newrank bug 2016-08-10 02:42:31 +02:00
shamoanjac
167a245244 Fixed on_spawn bug 2016-08-10 02:13:40 +02:00
agrecascino
746573abec Merge pull request #10 from shamoanjac/master
Fixed /f where bug
2016-08-09 20:07:46 -04:00
shamoanjac
0dc86e2076 Fixed /f where bug 2016-08-10 02:01:50 +02:00
agrecascino
1ff7e6069e Merge pull request #9 from shamoanjac/master
Fixed chunpos bug + faction broadcast name bug
2016-08-09 20:00:26 -04:00
shamoanjac
e5baf22d52 Fixed chunpos bug + faction broadcast name bug 2016-08-10 01:54:18 +02:00
agrecascino
c2cef304da Merge pull request #8 from shamoanjac/master
Fixes + verbose events
2016-08-09 19:28:22 -04:00
shamoanjac
1326104d28 Implemented callbacks for faction events 2016-08-09 23:00:53 +02:00
agrecascino
8ee4238893 Merge pull request #7 from shamoanjac/master
Fixes
2016-08-09 06:08:09 -04:00
shamoanjac
69ff206590 Underpowered factions' chunks can now be claimed 2016-08-09 04:39:40 +02:00
shamoanjac
b41f7bda72 Added /f free for admins 2016-08-08 23:42:20 +02:00
shamoanjac
719b39d99b Fixed infinite claiming bug 2016-08-08 23:36:56 +02:00
agrecascino
b28ee1a336 Merge pull request #6 from shamoanjac/master
Added /f promote and removed faction_user requirement
2016-08-08 17:30:13 -04:00
shamoanjac
48139c5877 Added /f promote and removed faction_user requirement 2016-08-08 23:25:31 +02:00
agrecascino
a2d491d4f7 Merge pull request #5 from shamoanjac/master
Added convert function and command
2016-08-08 16:50:03 -04:00
shamoanjac
3445066913 Added banners support 2016-08-08 21:09:10 +02:00
shamoanjac
4568785238 Prepared for war 2016-08-08 19:23:39 +02:00
shamoanjac
bacec849db Added convert function and command 2016-08-08 18:51:17 +02:00
agrecascino
d9a18d48ca Merge pull request #4 from shamoanjac/master
JustWerks(tm)
2016-08-08 11:45:21 -04:00
shamoanjac
4d28033aa2 Added HUD which displays name of faction whose land you're in 2016-08-08 17:14:39 +02:00