3107 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	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
コレット	4c324bf602	Merge branch 'develop' into action	2020-01-06 00:37:57 +09:00
collett	cfd23755fb	combo fix	2020-01-06 00:25:42 +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
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	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
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
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
karashiiro	4a31abc020	CFNotifyPop and CFPreferredRole	2020-01-02 16:15:05 -08:00
Adam	78fb4d5576	Merge pull request #613 from collett8192/social_list_fix ... Fix social list.	2020-01-03 11:14:23 +11:00
Adam	fa7ddf5b6b	Merge pull request #612 from collett8192/add_item_dupe_fix ... Fix item being added more than once.	2020-01-03 11:13:39 +11:00
karashiiro	e94bf44e6a	Merge pull request #1 from SapphireServer/develop ... merge merges	2020-01-02 16:09:30 -08:00
collett	51046f9da0	Fix social list.	2020-01-03 05:24:06 +09:00
collett	cd0f7fbd2b	Fix item being added more than once when there is already a stack of the same item.	2020-01-03 01:24:39 +09:00
Adam	18078e928e	Merge pull request #611 from collett8192/actionlut_fix ... Fix non-existing lut entry being executed.	2020-01-02 20:59:09 +11:00
collett	6fb6ccbda5	Fix non-existing lut entry being executed.	2020-01-02 17:42:48 +09:00
Adam	ff606f7378	Merge pull request #610 from NotAdam/develop ... fixed eventplay opcodes, fixed director opcodes, reordered ipcs.h correctly	2020-01-02 15:24:18 +11:00
NotAdam	9c6e431cf6	more 5.18 opcodes	2020-01-02 15:10:04 +11:00
NotAdam	acacfc5553	fix eventplay opcodes/names	2020-01-02 14:42:58 +11:00
NotAdam	371382dc0a	fix build error	2020-01-02 14:22:36 +11:00
Adam	4951c323b0	Merge pull request #609 from collett8192/opcode_update ... Update 5.18 opcodes and packets.	2020-01-02 14:21:48 +11:00
Adam	f5bf06ed00	Merge branch 'develop' into opcode_update	2020-01-02 14:21:39 +11:00
Adam	4b61b0b712	Merge pull request #608 from Kirrilius/develop ... fix warnings	2020-01-02 13:24:26 +11:00
collett	5a4665af45	Update 5.18 opcodes and packets.	2020-01-01 23:17:13 +09:00
kbasikhin	80e72d316e	fix warnings: ... using static and reinterpret casts instead of old style casts comparing floating point with "==" or "!=" is not correct (Chara.cpp)	2019-12-30 14:00:51 +03:00