Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-06 10:50:22 +01:00
Code Issues Projects Releases Wiki Activity
793 Commits 6 Branches 0 Tags 106 MiB
be4a9fba85
Commit Graph

556 Commits

Author SHA1 Message Date
fullwall
1cebe9271a Add clear to waypoint editor 2012-11-01 14:01:17 +08:00
fullwall
6290ea977f Fix for equipment 2012-11-01 09:17:13 +08:00
fullwall
79160706bb Changes to equipment 2012-10-31 23:54:01 +08:00
fullwall
ead7db1990 Update null equipment 2012-10-31 23:35:17 +08:00
fullwall
cc8d9c10a8 Changes to Behaviour 2012-10-31 21:52:50 +08:00
fullwall
18d9853f00 Add powermock as a testing dependency 2012-10-31 15:43:49 +08:00
fullwall
5ce050ec86 Better world safety 2012-10-31 15:03:13 +08:00
fullwall
0c2a689793 Test 2012-10-31 14:46:24 +08:00
fullwall
43e218be05 Work around entity equipping 2012-10-31 14:13:38 +08:00
fullwall
eec27c07e4 Move setImplementation call 2012-10-31 12:15:16 +08:00
fullwall
ae6a666bc6 Delay trigger delays other triggers 2012-10-31 12:03:38 +08:00
fullwall
567b2d5e25 Add PlayerAnimation waypoint trigger 2012-10-31 11:51:12 +08:00
fullwall
59a6bd7770 Owner check in Controllable 2012-10-31 10:10:48 +08:00
fullwall
18d9d412c8 Move translator creation to the translate methods 2012-10-31 10:08:34 +08:00
fullwall
9a6bdaa170 Moving the spawn call was ill-advised 2012-10-30 22:47:44 +08:00
fullwall
5f6014d87d Sanity check 2012-10-30 22:40:15 +08:00
fullwall
670711f109 Test 2012-10-30 22:28:19 +08:00
fullwall
67da06d14b Odd. 2012-10-30 22:26:21 +08:00
fullwall
5c6ea45eef Change this back 2012-10-30 22:17:28 +08:00
fullwall
9cd6f510e1 Derp - animate ARM_SWING not HURT 2012-10-30 22:11:12 +08:00
fullwall
f86954ff78 Add build number to version 2012-10-30 21:50:14 +08:00
fullwall
046ab7dd38 Reuse code 2012-10-30 21:31:15 +08:00
fullwall
c5504379e4 Fix 2012-10-30 21:23:36 +08:00
fullwall
579385cb0d Rename methods 2012-10-30 21:14:10 +08:00
fullwall
c873904dfc Explicitly stop metrics, fix stair/slab climbing 2012-10-30 21:11:06 +08:00
fullwall
fdbd6f7afb I have 0.47 problems but stairs work now 2012-10-30 17:49:54 +08:00
fullwall
4ebb4c98b3 Use motY = 0.5 instead of calling bf() 2012-10-30 14:58:35 +08:00
fullwall
3f4a601bb8 Update version 2012-10-30 11:33:55 +08:00
fullwall
2c3d999a00 Reuse code, match more entity types 2012-10-30 11:02:25 +08:00
fullwall
a80bc89044 Fix entity.l being called and use bukkit equivalent, update EntitySense, knockback enchantments get applied 2012-10-30 10:53:05 +08:00
fullwall
71d4752c58 Fix location missing bug... and bats 2012-10-30 08:59:52 +08:00
fullwall
e43a233ade NPC stairclimbing: still not working 2012-10-29 22:45:03 +08:00
fullwall
5f15f0146d Sort 2012-10-29 21:36:27 +08:00
fullwall
b4373ccaa9 Fix walking over slabs 2012-10-29 21:35:38 +08:00
fullwall
f1f5b74f6b Add some escape sequences 2012-10-29 20:54:28 +08:00
fullwall
e9e2c057dc Fix NPC bats, add /npc skeletontype, /npc create now allows creation at another player 2012-10-29 17:26:42 +08:00
aPunch
6ab712f893 Add ability to place skulls on NPCs. 2012-10-28 17:52:31 -05:00
fullwall
df78fbef01 Fix rayTrace call to this.l 2012-10-28 13:18:38 +08:00
fullwall
b83bd96847 Use the persistent field instead of overriding bh 2012-10-28 12:54:18 +08:00
fullwall
61caf6d9ef Update for 1.4 2012-10-28 12:37:37 +08:00
fullwall
85c0a67759 Add ChatTrigger, add PlayerAnimation utility class 2012-10-27 19:43:53 +08:00
fullwall
e898918d6d Trigger conversation is active while the editor is active 2012-10-26 22:00:48 +08:00
fullwall
641b19aa99 Stop the conversation when the editor stops 2012-10-26 21:55:41 +08:00
fullwall
3bdf59c533 Implement WaypointTriggers 2012-10-26 21:49:30 +08:00
fullwall
dd5dd1878c Assuming this works 2012-10-26 17:52:01 +08:00
fullwall
3ff0b651c1 Player NPC swimming 2012-10-26 16:35:23 +08:00
fullwall
0ba4270a40 Use setting more consistently 2012-10-26 16:07:06 +08:00
fullwall
bb36e8ea27 Stuff 2012-10-26 15:28:48 +08:00
fullwall
798c713394 Double quote everything, remove trait data 2012-10-26 14:26:57 +08:00
fullwall
dc8ff67001 . 2012-10-26 13:47:33 +08:00
fullwall
66f3ce1a0e Add pathfinding range message, sort 2012-10-26 12:26:54 +08:00
fullwall
8abfa3b96e Simplify multi-way selection prompt 2012-10-26 12:11:30 +08:00
fullwall
addf9c4a2b Move playerlist handling to CitizensHumanNPC, add /npc playerlist command, make ChunkCoord unique per-world 2012-10-26 11:35:04 +08:00
fullwall
5c6509046e Fix an issue with Gravity 2012-10-24 00:19:31 +08:00
fullwall
14931b32a9 Add an extra trySwim call 2012-10-23 15:18:51 +08:00
fullwall
66c2773616 Trim arguments, waypoint command 2012-10-23 15:14:54 +08:00
fullwall
3c9379d455 Allow NPCs to be created from console 2012-10-22 20:33:07 +08:00
fullwall
d817ef3815 Delete file 2012-10-22 14:54:15 +08:00
fullwall
c81e2c1035 Update website 2012-10-22 14:54:01 +08:00
fullwall
5cbc8b7c15 Add /npc gamemode command 2012-10-21 21:40:45 +08:00
fullwall
02e2232cd4 Fix missing param in translation 2012-10-21 20:34:21 +08:00
fullwall
b3351f5285 Update translation 2012-10-20 20:08:35 +08:00
fullwall
ccd81bac56 Duplicate some code in Messaging.tr temporarily 2012-10-19 16:37:22 +08:00
fullwall
2459726fac Don't require ownership for /npc select 2012-10-18 18:15:04 +08:00
fullwall
b3121305f9 Avoid - character in saving lookclose 2012-10-16 20:09:23 +08:00
fullwall
b096dcfd8b Fix spout compat 2012-10-16 17:50:57 +08:00
fullwall
4696f27825 Fix controllable NPE 2012-10-16 17:25:18 +08:00
fullwall
02d54f43fb Don't try to translate while still initialising 2012-10-16 15:48:43 +08:00
fullwall
a70a308b47 Allow -g flag for setting the controllable to ground, -r flag for clearing 2012-10-15 21:04:15 +08:00
fullwall
5884059528 Derp, fix order 2012-10-15 20:55:54 +08:00
fullwall
8bb958e2d3 Fix * flags 2012-10-15 20:51:48 +08:00
fullwall
5d2c81da84 Fix arg length for /trc 2012-10-15 20:39:57 +08:00
fullwall
c71f226abd Fix bugs 2012-10-15 20:31:22 +08:00
fullwall
c3630c1da3 Implement AttackStrategy 2012-10-15 18:14:27 +08:00
fullwall
db403bbcf0 Add some waypoint triggers 2012-10-15 17:13:34 +08:00
fullwall
c9f054b615 Update 2012-10-15 16:55:38 +08:00
fullwall
996dd07f2c Allow any entity type to be controlled as a flyable npc 2012-10-15 16:55:13 +08:00
fullwall
ea190794da Implement onCopy 2012-10-15 15:17:20 +08:00
fullwall
f642cc2d2c Waypoints use PersistenceLoader now 2012-10-15 14:44:20 +08:00
fullwall
f04bad6d92 Add gravity and slime size traits 2012-10-15 13:45:00 +08:00
fullwall
1bab619840 Forgot to remove this 2012-10-15 13:18:34 +08:00
fullwall
ed627fd0c3 Add selection param 2012-10-15 11:31:40 +08:00
fullwall
daf36ec549 Better economy handling 2012-10-15 10:37:40 +08:00
fullwall
0c81d3dbf5 Peaceful monsters will now brutalise players 2012-10-15 10:02:59 +08:00
fullwall
63bf0b2221 Derp 2012-10-13 12:37:18 +08:00
Jeremy Schroeder
59218ae28c Add Anchors, saveable 'locations' for your NPCs. Usage: /npc anchor (--save [name]|--assume [name]|--remove [name]) (-a) 
Also renamed /npc pose --load to /npc pose --assume
 2012-10-12 21:24:42 -04:00
fullwall
983ef2f1fd Fix locale loading when setting is empty 2012-10-12 22:39:18 +08:00
fullwall
c0f61381b7 Implement fix better 2012-10-12 21:40:38 +08:00
fullwall
042a0b5ba6 Fix 2012-10-12 19:35:11 +08:00
fullwall
7aa56a5ffb Fix /npc select with only 1 argument 2012-10-12 14:25:56 +08:00
fullwall
f8ccd0b4fd Experimental change: implement Bukkit interfaces for NPCs 2012-10-12 12:16:44 +08:00
fullwall
eb64a43bf3 Work around some plugins not extending from CraftEntity 2012-10-12 11:52:48 +08:00
fullwall
4c335887a8 Better flyable NPCs 2012-10-10 21:45:34 +08:00
fullwall
08d2001d37 test 2012-10-10 14:26:41 +08:00
fullwall
f6d0db7bdf Test 2012-10-08 22:07:29 +08:00
fullwall
f83498e5cb Revert "Move highlight logic to StringHelper" 
This reverts commit 1acad881eb.
 2012-10-08 22:05:19 +08:00
fullwall
1acad881eb Move highlight logic to StringHelper 2012-10-08 21:51:29 +08:00
fullwall
0b034e54ec Use Persistence API 2012-10-08 15:11:49 +08:00
fullwall
d442da91fb Call onRemove 2012-10-08 12:37:45 +08:00
fullwall
091ce13cca Fix NPE 2012-10-08 11:30:28 +08:00
fullwall
491f077b4b Add specific help for some commands, default locale is empty to focus on system locale 2012-10-08 10:44:14 +08:00
fullwall
5b380cf96e Translate the last of the strings 2012-10-08 10:16:19 +08:00
fullwall
03bcb9f4cf Make parent folders before saving 2012-10-05 20:15:06 +08:00
fullwall
236b6e52c3 Fix locale selection, unpack resource translations automatically 2012-10-04 18:58:27 +08:00
fullwall
58ee3dfbc2 Test 2012-10-04 18:28:23 +08:00
fullwall
f98d53745e Add messages_de.properties 2012-10-04 18:16:51 +08:00
fullwall
6c7dd30c3b Allow for locale specialisation for possible player-specific translations 2012-10-04 17:28:42 +08:00
fullwall
ae31334a72 Use american spelling 2012-10-04 15:00:41 +08:00
fullwall
72b714c3f6 Nearly all strings translated 2012-10-04 14:58:35 +08:00
fullwall
03cbb6baf9 Translate a few more strings 2012-09-30 23:23:27 +08:00
fullwall
803ce5e483 Remove old file 2012-09-30 23:13:59 +08:00
fullwall
64512b282d Fix wander waypoint provider, stack overflow bug 2012-09-30 23:13:49 +08:00
fullwall
733364443d Translate yet more strings 2012-09-30 22:56:57 +08:00
fullwall
5c0f642842 Implements traits() in requirements 2012-09-30 22:13:19 +08:00
fullwall
ee7ee3c8c8 Add /waypoint provider 2012-09-30 19:36:48 +08:00
fullwall
a8c9531f31 Update metrics, add WaypointCommands, fix templates (which work, mostly) 2012-09-30 19:03:12 +08:00
fullwall
90b79b8d70 More work on i18n - changed Messages to string constants instead of enums, new strings must be translated into the messages_en.properties file 2012-09-30 17:55:51 +08:00
fullwall
f6cc346b26 Implement template#apply (templates may or may not work) 2012-09-30 00:08:47 +08:00
fullwall
5d3239a5b9 Make a start on templates 2012-09-29 23:54:05 +08:00
fullwall
ccacff92ec Changes 2012-09-29 23:07:48 +08:00
Jeremy Schroeder
244f9873f0 Remove old files 2012-09-28 13:36:14 -04:00
Jeremy Schroeder
b9ce5d2f9b Change Positions to Poses. Use /npc pose 2012-09-28 13:29:35 -04:00
Jeremy Schroeder
669da4fc95 Fix small bugs/update to /npc position. Add /npc position --remove [name]. 2012-09-28 12:02:05 -04:00
Jeremy Schroeder
3748ee098f Beef up /npc position. Add --save and --load for storing/recalling positions. Example: /npc positions --save position_1 -a ... continue to use -a for making the NPC assume that position. Using /npc position alone will list positions. Using -a alone will neither save nor load, just assume. 2012-09-28 10:25:00 -04:00
fullwall
a938fd3f07 Allow markers to be right clicked to update editing slot 2012-09-28 18:10:17 +08:00
fullwall
5d80957236 Changes to /npc position 2012-09-28 18:03:17 +08:00
fullwall
da723d47e8 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-09-28 17:56:47 +08:00
fullwall
6053800129 Fix some bugs with waypoints, add waypoint markers 2012-09-28 17:56:16 +08:00
Jeremy Schroeder
e7daa38eef Add '/npc position -a' to have the NPC's head assume the position of the Player's head. 2012-09-27 18:03:04 -04:00
Jeremy Schroeder
2d78bdaad0 Add 2012-09-27 17:59:32 -04:00
fullwall
cf09688a79 Fix some navigation bugs (thanks jrbudda) 2012-09-24 16:40:13 +08:00
fullwall
491f566e2a Revert "Implement new selector" 
This reverts commit 959b8b774f.
 2012-09-23 13:07:30 +08:00
fullwall
959b8b774f Implement new selector 2012-09-22 16:31:53 +08:00
fullwall
547df2487f Change Navigation world when the entity changes world 2012-09-22 16:09:40 +08:00
fullwall
22ace31fbe Fix payment 2012-09-22 13:03:52 +08:00
fullwall
6ce2b9c2d2 Enable subplugins earlier 2012-09-20 08:52:44 +08:00
fullwall
a7e926b44a Fix format specifiers in waypoint editor 2012-09-17 23:06:52 +08:00
fullwall
b90a0f6b45 Allow npcs to be created unspawned with the -u flag 2012-09-17 21:49:28 +08:00
fullwall
f2608e3c8d Fix CITIZENS-186 2012-09-17 18:20:15 +08:00
fullwall
f0de2fbfe5 Fix CITIZENS-190, add more translations 2012-09-17 18:16:27 +08:00
fullwall
fb66286117 Fix CITIZENS-191 2012-09-17 17:54:56 +08:00
fullwall
93d1c35305 Fix jrbuddas reported bugs 2012-09-17 17:18:17 +08:00
fullwall
6b2b11b90d More work on translations 2012-09-16 19:20:01 +08:00
fullwall
0baac5d002 Begin work on translation 2012-09-16 16:47:41 +08:00
fullwall
0c32720fb3 Fix up trait command requirements, add /trait add|remove 2012-09-16 14:35:04 +08:00
fullwall
1394ec9c9a Implement new trait methods 2012-09-16 12:29:08 +08:00
fullwall
d3ae5bcd61 Add setting for removing NPCs from player list (testing it out), --trait is applied after spawn 2012-09-16 12:04:14 +08:00
fullwall
e2b0af6ac1 Changes 2012-09-14 16:20:22 +08:00
fullwall
d7c5c60377 Possible fix for spawning bugs... TODO implement better 2012-09-14 15:21:07 +08:00
fullwall
8823a4b77f Changes 2012-09-14 14:53:25 +08:00