410 Commits

Author SHA1 Message Date
Elkien3
ee63795272
Merge pull request #38 from aegroto/master
declare war command typo fix
2018-11-25 11:45:30 -06:00
aegroto
710362fbdf declare war command typo fix 2018-11-25 18:42:45 +01:00
Elkien3
1c2213397b
Merge pull request #37 from Coder12a/master
Fix diplomacy
2018-11-24 22:01:09 -06:00
Coder12a
770ed6d3db Fix diplomacy 2018-11-24 17:15:26 -06:00
Elkien3
9d8af02e2f try to fix issue 2018-11-24 09:45:10 -06:00
Elkien3
cb2913742c
Merge pull request #35 from Coder12a/master
Small changes and fixes:
2018-11-22 20:13:32 -06:00
Coder12a
f8a3347aba Small bug fix and changes to siege banner
I ran a small test on my computer. Players not in a faction will not be kill after 5 minutes on another factions land because it failed to check whether player's faction was blank. It check if the blank faction was an enemy which would return false and fail to kill the player.

I made a change in the can_claim_parcel function. You could only claim over faction land if your faction is at war with them.

Small bug fix with siege banner. The siege stage started at zero which made it take longer. before the fix it would stay on stage 1 longer then the other stages.
2018-11-20 18:32:55 -06:00
Elkien3
0b9d5e0a25
Merge pull request #34 from Coder12a/master
Add diplomacy feature
2018-11-20 14:35:57 -06:00
Coder12a
e6a417feca Add diplomacy feature 2018-11-20 14:28:45 -06:00
Coder12a
8277621575 Spawn kill 5 minute delay 2018-11-19 16:25:50 -06:00
Elkien3
fad810c120 Merge branch 'master' of https://github.com/Elkien3/kingdoms_game 2018-11-19 11:46:15 -06:00
Elkien3
9d60769aa3 add some skins 2018-11-19 11:46:14 -06:00
Elkien3
ae200a7300
Merge pull request #31 from Coder12a/master
Bug fix: setadmin chat command was setting the faction to false.
2018-11-19 11:24:14 -06:00
Coder12a
7c9d50ff64 Bug fix: setadmin chat command was setting the faction to false. 2018-11-19 11:19:21 -06:00
Elkien3
fa800ca6d2
Merge pull request #30 from Coder12a/master
Bug fix: admin factions should not kill players that spawn on there land.
2018-11-19 11:10:33 -06:00
Coder12a
4be8c76a2c Admin factions should never disband from inactivity. 2018-11-19 10:14:14 -06:00
Coder12a
76166c527f Bug fix: admin factions should not kill players that spawn on them.
New players die at spawn because it is claimed by admin faction.
2018-11-19 10:07:49 -06:00
Elkien3
18343b8fab
Merge pull request #29 from aegroto/master
added die-on-spawn while on enemy parcels and added more checks on si…
2018-11-18 16:54:31 -06:00
aegroto
bbb0ced95b added die-on-spawn while on enemy parcels and added more checks on siege banners 2018-11-18 23:49:53 +01:00
Elkien3
23d8ded585
Merge pull request #28 from aegroto/master
siege banner timer increased
2018-11-08 21:36:54 -06:00
aegroto
a2ce15b09c siege banner timer increased 2018-11-08 22:54:47 +01:00
Elkien3
398162f2c4
Merge pull request #27 from aegroto/master
added siege banners
2018-11-08 15:39:53 -06:00
aegroto
b464b0fe52 added siege banners 2018-11-08 22:20:34 +01:00
Elkien3
33bcca137f Merge branch 'master' of https://github.com/Elkien3/kingdoms_game 2018-11-03 20:10:50 -05:00
Elkien3
7e00ebbd8e make a walking light bug killer abm 2018-11-03 20:10:48 -05:00
Elkien3
654e72bc6b
Merge pull request #26 from aegroto/master
betterfall lost fix re-applied
2018-11-03 08:20:32 -05:00
aegroto
173a344fa9 betterfall lost fix re-applied 2018-11-03 12:18:09 +01:00
Elkien3
2a65c834f1 update playeranim 2018-11-01 14:12:48 -05:00
Elkien3
2741950a5f
Merge pull request #25 from aegroto/master
has_permission syntax fix
2018-11-01 08:34:29 -05:00
aegroto
983163b6b9 has_permission syntax fix 2018-11-01 13:41:57 +01:00
Elkien3
829ea20b8c
Merge pull request #24 from aegroto/master
fix for the global kick issue (closes #23)
2018-10-31 16:02:52 -05:00
aegroto
9446caa721 has_permission bug mitigation 2018-10-31 21:54:48 +01:00
aegroto
183aa3aff5 fix for the global kick issue 2018-10-31 21:44:33 +01:00
Elkien3
655f4eacf0 revert factions 2018-10-28 10:28:51 -05:00
Elkien3
19f2f2e0f2 remove some factio nadmin requrements 2018-10-26 20:31:22 -05:00
Elkien3
3871a4b1dd remove faction_user requirement 2018-10-26 20:11:04 -05:00
Elkien3
eb7c6eb472 add skin 2018-10-26 19:54:23 -05:00
Elkien3
402ed76f5f remove need for faction_user 2018-10-26 19:54:19 -05:00
Elkien3
0943e48525 update to bobs version 2018-10-26 19:38:28 -05:00
Elkien3
550316611f add skins 2018-10-23 21:57:52 -05:00
Elkien3
a90185abd4 add skin 2018-10-20 21:38:34 -05:00
Elkien3
903e805c7a add betterfall fix 2018-10-19 15:03:17 -05:00
Elkien3
aeaff08b78 fix betterfall as picco requested 2018-10-19 12:12:08 -05:00
Elkien3
0735ec822e remove some broken items 2018-10-15 14:39:44 -05:00
Elkien3
294343521f give new players some food 2018-10-15 10:43:24 -05:00
Elkien3
d6ba30e417 make parcels smaller 2018-10-15 09:21:51 -05:00
Elkien3
953d6966ec make factions like i want it 2018-10-15 09:00:05 -05:00
Elkien3
691bcae96c give saplings 2018-10-15 08:34:22 -05:00
Elkien3
3dc868862e remove campfire 2018-10-15 08:34:12 -05:00
Elkien3
2cd6fd4566 remove banners 2018-10-15 08:05:16 -05:00