3007 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
collett	c779a70827	Fix shop packet	2020-01-08 18:25:55 +09:00
collett	1ee74064b0	crit & dh	2020-01-07 19:08:13 +09:00
collett	ee4a785767	update some comments	2020-01-06 19:50:56 +09:00
collett	8d980737f8	Merge remote-tracking branch 'remotes/origin/develop' into develop_c	2020-01-06 19:47:43 +09:00
Adam	76f666a1a3	Merge pull request #623 from collett8192/script_effect ... Allow action scripts to add effect.	2020-01-06 21:44:36 +11:00
collett	c696cb2c80	Allow action scripts to add effect.	2020-01-06 19:25:01 +09:00
collett	feec126341	Merge remote-tracking branch 'remotes/origin/develop' into develop_c	2020-01-06 19:20:10 +09:00
NotAdam	204ff7ec84	fix linux build	2020-01-06 20:23:03 +11:00
NotAdam	3de42fc670	action_parse can take an exd path as a launch arg now	2020-01-06 20:23:03 +11:00
Adam	c8ecd0ef68	Merge pull request #620 from collett8192/action ... Action system updates.	2020-01-06 20:23:14 +11:00
collett	a69becdde9	fix	2020-01-06 17:57:53 +09:00
collett	3e9ad1fc3e	Merge branch 'action' into develop_c	2020-01-06 17:53:02 +09:00
collett	05480df1d9	no need to return the list	2020-01-06 17:52:45 +09:00
collett	4e11690a45	Fix skill animation for other players.	2020-01-06 04:31:09 +09:00
collett	01f681d1c3	Fix skill animation for other players.	2020-01-06 04:29:45 +09:00
コレット	4c324bf602	Merge branch 'develop' into action	2020-01-06 00:37:57 +09:00
collett	0414a3075d	Merge branch 'action' into develop_c	2020-01-06 00:26:25 +09:00
collett	cfd23755fb	combo fix	2020-01-06 00:25:42 +09:00
collett	64d64e7428	Merge branch 'action' into develop_c	2020-01-06 00:05:47 +09:00
collett	37177006fa	Allow action scripts to add effect.	2020-01-05 23:57:42 +09:00
collett	54e565e83d	opcode	2020-01-05 22:47:21 +09:00
collett	9bfbf76ec9	Make vs2019 happy.	2020-01-05 22:22:17 +09:00
collett	20f282755f	Merge remote-tracking branch 'remotes/origin/develop' into develop_c	2020-01-05 21:45:47 +09:00
collett	4f0533bb0d	local var rename	2020-01-05 21:31:54 +09:00
collett	fc07ec09b2	more clean up	2020-01-05 20:54:49 +09:00
collett	a27098390b	Minor tweaks and code clean up.	2020-01-05 20:49:50 +09:00
Adam	89450e30c6	Merge pull request #622 from SapphireServer/exit_poprange ... use lgbs to handle zonelines/aetherytes/discovery instead of db table	2020-01-05 21:03:43 +11:00
NotAdam	cb0c93dc6d	opcode fixes	2020-01-05 20:52:51 +11:00
NotAdam	f7d953bd5e	fix InstanceObjectCache crashing if expansion is not installed	2020-01-05 20:36:52 +11:00
NotAdam	2824c30342	Merge branch 'develop' into exit_poprange	2020-01-05 20:06:31 +11:00
Adam	5d436df9fc	Merge pull request #621 from collett8192/stats_calc ... Fix base stats calc.	2020-01-05 19:50:17 +11:00
collett	1ae1bcd54d	Fix base stats calc. ... Better max hp.	2020-01-05 17:41:38 +09:00
collett	08283ebcc5	oops	2020-01-05 17:26:49 +09:00
collett	9cd17b3caa	Action system updates.	2020-01-05 17:09:27 +09:00
collett	681b38a2a5	globalSequence	2020-01-05 16:44:45 +09:00
collett	b4a9f29d96	So you can hit more than 32 targets with aoe.	2020-01-05 08:39:54 +09:00
collett	4e4ecba9d5	fix caster sequence.	2020-01-05 08:16:33 +09:00
collett	721d3b40dd	Merge remote-tracking branch 'remotes/origin/develop' into develop_c	2020-01-05 08:08:18 +09:00
Adam	3090de3b20	Merge pull request #619 from collett8192/inventory_fixes ... Inventory fixes.	2020-01-05 09:24:51 +11:00
Adam	6f9c299a04	Merge pull request #618 from collett8192/quest_reward ... Fix quest reward choice.	2020-01-05 09:24:40 +11:00
Adam	9439a02c0b	Merge pull request #617 from collett8192/abandon_quest ... Move quest finish packet to where it belongs to so we can abandon que…	2020-01-05 09:24:32 +11:00
collett	bab1d384c2	Inventory fixes.	2020-01-05 06:20:50 +09:00
collett	642369a3d1	remove that dumb sh!t	2020-01-05 06:14:05 +09:00
collett	72ea61393d	this is what's really going on about that get item sound thing.	2020-01-05 06:11:20 +09:00
collett	dea1224226	Play the sound effect when getting new items.	2020-01-05 05:50:16 +09:00
collett	a588adca8c	Fix quest reward choice. ... Quest scripts need to call player.giveQuestRewards( getId(), result.param3 ) for it to work.	2020-01-05 05:25:35 +09:00
collett	7f4184bfbc	Move quest finish packet to where it belongs to so we can abandon quests.	2020-01-05 05:19:05 +09:00
collett	df9fb7ebf4	Better fix for abandon quest.	2020-01-05 05:14:38 +09:00
collett	7545ad0934	Some status fixes.	2020-01-05 04:44:41 +09:00
collett	84a868aae8	More aoe stuff.	2020-01-05 01:04:30 +09:00