Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• ee63795272
  Merge pull request #38 from aegroto/master master Elkien3 2018-11-25 11:45:30 -06:00
• 710362fbdf declare war command typo fix aegroto 2018-11-25 18:42:45 +01:00
• 1c2213397b
  Merge pull request #37 from Coder12a/master Elkien3 2018-11-24 22:01:09 -06:00
• 770ed6d3db Fix diplomacy Coder12a 2018-11-24 17:15:26 -06:00
• 9d8af02e2f try to fix issue Elkien3 2018-11-24 09:45:10 -06:00
• cb2913742c
  Merge pull request #35 from Coder12a/master Elkien3 2018-11-22 20:13:32 -06:00
• f8a3347aba Small bug fix and changes to siege banner Coder12a 2018-11-20 18:32:55 -06:00
• 0b9d5e0a25
  Merge pull request #34 from Coder12a/master Elkien3 2018-11-20 14:35:57 -06:00
• e6a417feca Add diplomacy feature Coder12a 2018-11-20 14:28:45 -06:00
• 8277621575 Spawn kill 5 minute delay Coder12a 2018-11-19 16:25:50 -06:00
• fad810c120 Merge branch 'master' of https://github.com/Elkien3/kingdoms_game Elkien3 2018-11-19 11:46:15 -06:00
• 9d60769aa3 add some skins Elkien3 2018-11-19 11:46:14 -06:00
• ae200a7300
  Merge pull request #31 from Coder12a/master Elkien3 2018-11-19 11:24:14 -06:00
• 7c9d50ff64 Bug fix: setadmin chat command was setting the faction to false. Coder12a 2018-11-19 11:19:21 -06:00
• fa800ca6d2
  Merge pull request #30 from Coder12a/master Elkien3 2018-11-19 11:10:33 -06:00
• 4be8c76a2c Admin factions should never disband from inactivity. Coder12a 2018-11-19 10:14:14 -06:00
• 76166c527f Bug fix: admin factions should not kill players that spawn on them. Coder12a 2018-11-19 10:07:49 -06:00
• 18343b8fab
  Merge pull request #29 from aegroto/master Elkien3 2018-11-18 16:54:31 -06:00
• bbb0ced95b added die-on-spawn while on enemy parcels and added more checks on siege banners aegroto 2018-11-18 23:49:53 +01:00
• 23d8ded585
  Merge pull request #28 from aegroto/master Elkien3 2018-11-08 21:36:54 -06:00
• a2ce15b09c siege banner timer increased aegroto 2018-11-08 22:54:47 +01:00
• 398162f2c4
  Merge pull request #27 from aegroto/master Elkien3 2018-11-08 15:39:53 -06:00
• b464b0fe52 added siege banners aegroto 2018-11-08 22:20:34 +01:00
• 33bcca137f Merge branch 'master' of https://github.com/Elkien3/kingdoms_game Elkien3 2018-11-03 20:10:50 -05:00
• 7e00ebbd8e make a walking light bug killer abm Elkien3 2018-11-03 20:10:48 -05:00
• 654e72bc6b
  Merge pull request #26 from aegroto/master Elkien3 2018-11-03 08:20:32 -05:00
• 173a344fa9 betterfall lost fix re-applied aegroto 2018-11-03 12:18:09 +01:00
• 2a65c834f1 update playeranim Elkien3 2018-11-01 14:12:48 -05:00
• 2741950a5f
  Merge pull request #25 from aegroto/master Elkien3 2018-11-01 08:34:29 -05:00
• 983163b6b9 has_permission syntax fix aegroto 2018-11-01 13:41:57 +01:00
• 829ea20b8c
  Merge pull request #24 from aegroto/master Elkien3 2018-10-31 16:02:52 -05:00
• 9446caa721 has_permission bug mitigation aegroto 2018-10-31 21:54:48 +01:00
• 183aa3aff5 fix for the global kick issue aegroto 2018-10-31 21:44:33 +01:00
• 655f4eacf0 revert factions Elkien3 2018-10-28 10:28:51 -05:00
• 19f2f2e0f2 remove some factio nadmin requrements Elkien3 2018-10-26 20:31:22 -05:00
• 3871a4b1dd remove faction_user requirement Elkien3 2018-10-26 20:11:04 -05:00
• eb7c6eb472 add skin Elkien3 2018-10-26 19:54:23 -05:00
• 402ed76f5f remove need for faction_user Elkien3 2018-10-26 19:54:19 -05:00
• 0943e48525 update to bobs version Elkien3 2018-10-26 19:38:28 -05:00
• 550316611f add skins Elkien3 2018-10-23 21:57:52 -05:00
• a90185abd4 add skin Elkien3 2018-10-20 21:38:34 -05:00
• 903e805c7a add betterfall fix Elkien3 2018-10-19 15:03:17 -05:00
• aeaff08b78 fix betterfall as picco requested Elkien3 2018-10-19 12:12:08 -05:00
• 0735ec822e remove some broken items Elkien3 2018-10-15 14:39:44 -05:00
• 294343521f give new players some food Elkien3 2018-10-15 10:43:24 -05:00
• d6ba30e417 make parcels smaller Elkien3 2018-10-15 09:21:51 -05:00
• 953d6966ec make factions like i want it Elkien3 2018-10-15 09:00:05 -05:00
• 691bcae96c give saplings Elkien3 2018-10-15 08:34:22 -05:00
• 3dc868862e remove campfire Elkien3 2018-10-15 08:34:12 -05:00
• 2cd6fd4566 remove banners Elkien3 2018-10-15 08:05:16 -05:00
• 1341547155 remove interact mod Elkien3 2018-10-15 08:05:07 -05:00
• 973e064ee3 comment out print Elkien3 2018-10-14 21:59:40 -05:00
• 41a1612182 add betterfall Elkien3 2018-10-14 21:46:31 -05:00
• 566e4006fd add bedrock Elkien3 2018-10-14 21:45:40 -05:00
• 4b0b678b43 lower world size Elkien3 2018-10-14 21:44:48 -05:00
• d15e7a8e37 remove sneak glitch mod Elkien3 2018-10-14 21:44:02 -05:00
• e549b30070 remove seige hammer Elkien3 2018-10-14 21:43:43 -05:00
• 4a71d63565 remove backpack Elkien3 2018-10-14 21:42:53 -05:00
• b1cf2b5b4b make all players able to use email Elkien3 2018-10-14 21:42:46 -05:00
• 9548179185 remove ctf_pvp_engine and add factions Elkien3 2018-10-14 21:42:30 -05:00
• c246e6d514 add back tnt blocks Elkien3 2018-10-12 08:55:14 -05:00
• 12b948ed7d add skin Elkien3 2018-09-30 21:38:07 -05:00
• 9a0b5067ce add skin Elkien3 2018-09-25 21:57:46 -05:00
• b8f8f818fc
  Merge pull request #21 from archfan7411/master Elkien3 2018-09-22 20:05:05 -05:00
• 4f5d042af0
  use block comments Elkien3 2018-09-22 20:04:13 -05:00
• ad49732dfe
  Comment out tin ore generation archfan 2018-09-22 20:56:15 -04:00
• 6dd64ac33c
  Double output for both recipes archfan 2018-09-22 18:23:56 -04:00
• 756de77bd4
  Add tin+copper=bronze archfan 2018-09-22 17:56:20 -04:00
• ed53e5913e
  Add bronze recipe (steel+copper) archfan 2018-09-22 16:41:10 -04:00
• 9ae0d492bc Merge branch 'master' of https://github.com/Elkien3/kingdoms_game Elkien3 2018-09-18 17:07:04 -05:00
• a435a39cd3 add skins Elkien3 2018-09-18 17:07:01 -05:00
• 29bf35b7ee
  Merge pull request #20 from cpdef/master Elkien3 2018-09-10 13:00:15 -05:00
• e0f35081c9 restore missing picture nodes cpdef 2018-09-10 16:50:55 +02:00
• ccf1c71a11
  remove debug messages cpdef 2018-09-10 16:42:02 +02:00
• 2b8f9507b8
  remove print() s cpdef 2018-09-10 16:37:34 +02:00
• 3244793486
  delete obsolete things, clean cpdef 2018-09-10 16:34:55 +02:00
• af835f1928
  fix and clean paiting cpdef 2018-09-10 16:28:57 +02:00
• 309cdf7aeb
  Merge pull request #19 from Billy-S/master Elkien3 2018-09-07 22:30:46 -05:00
• d18eaa5532
  Added protection check for steel signs as well Billy S 2018-09-07 17:26:56 -04:00
• 0e68f2cb41
  Merge pull request #18 from Billy-S/master Elkien3 2018-09-07 16:25:21 -05:00
• e2ab721ed5
  Added protection check Billy S 2018-09-07 16:56:23 -04:00
• 1526e12155
  Merge pull request #17 from cpdef/master Elkien3 2018-09-03 11:50:04 -05:00
• 486299173c
  painting remove debug messages cpdef 2018-08-31 22:56:47 +02:00
• 11b3898c29 fix ceiling-pic unknown after reboot cpdef 2018-08-31 22:49:57 +02:00
• a4cc9eecda add ksins Elkien3 2018-08-31 15:31:13 -05:00
• 8196fd0cce
  add ceiling/floor place feature cpdef 2018-08-31 16:40:15 +02:00
• 8dc89a2b5c add skin Elkien3 2018-08-30 08:37:38 -05:00
• e376fa8753 Merge branch 'master' of https://github.com/Elkien3/kingdoms_game Elkien3 2018-08-21 08:20:37 -05:00
• a14d454419 add skins Elkien3 2018-08-21 08:20:29 -05:00
• a52daee83a
  Merge pull request #16 from aegroto/welcome_message Elkien3 2018-08-17 09:14:10 -05:00
• e7848bfd63 added welcome message aegroto 2018-08-17 16:06:03 +02:00
• d035977118 change skin Elkien3 2018-08-10 22:02:27 -05:00
• 22f5e1ed8c add skin Elkien3 2018-08-08 11:37:54 -05:00
• 437a6a0d4a fix bug Elkien3 2018-08-06 09:23:57 -05:00
• bbe7d1d986 fix skin Elkien3 2018-07-31 12:21:35 -05:00
• 1ae9a63bd3 add spanish translation Elkien3 2018-07-30 19:26:57 -05:00
• 830cdb2409 add skin Elkien3 2018-07-30 07:52:48 -05:00
• 4964c44ec3 add knockout Elkien3 2018-07-27 10:04:21 -05:00
• c42267755a add skin Elkien3 2018-07-27 08:28:18 -05:00
• 77d66bdd76 add skin Elkien3 2018-07-26 09:37:23 -05:00