3146 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
collett	03df9ab4d5	some aoe fixes	2020-01-04 21:12:54 +09:00
collett	64f8be4512	vs2019 really wants to add that space.	2020-01-04 19:56:21 +09:00
collett	4623ed535a	Interrupt casting if target died and casting queue.	2020-01-04 19:47:34 +09:00
collett	0cd7bd7f49	Merge remote-tracking branch 'remotes/origin/develop' into develop_c	2020-01-03 23:26:25 +09:00
Adam	6df0dcffe9	Merge pull request #616 from collett8192/event_battle ... Fix event battle.	2020-01-04 01:20:56 +11:00
Adam	633004bf69	Merge pull request #615 from collett8192/aetheryte ... Fix aetheryte.	2020-01-04 01:20:50 +11:00
collett	45f6f9fa7c	Fix event battle.	2020-01-03 22:47:01 +09:00
collett	2308a41a63	Fix aetheryte.	2020-01-03 22:39:45 +09:00
collett	8790e71ff1	Clean up.	2020-01-03 22:36:49 +09:00
collett	8313abf30a	Fix aetheryte.	2020-01-03 22:31:55 +09:00
collett	9b4142f94f	Update gm command opcode.	2020-01-03 17:58:13 +09:00
collett	7385d2291c	Fix copy paste derp.	2020-01-03 17:37:21 +09:00
collett	d1b8fd019e	Merge remote-tracking branch 'remotes/origin/develop' into develop_c	2020-01-03 17:33:53 +09:00
Adam	cfa515f1c9	Merge pull request #614 from karashiiro/develop ... More opcodes, ID PlayerSpawn fields	2020-01-03 13:47:08 +11:00
karashiiro	924c1338d2	merge duplicate keys	2020-01-02 18:38:53 -08:00
karashiiro	913591ec23	Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop	2020-01-02 16:15:53 -08:00