3521 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
collett	29106a2de7	Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2	2020-03-02 05:37:15 +09:00
Adam	d04a11e9ee	Merge pull request #647 from NotAdam/develop ... replace service locator	2020-03-01 13:15:03 +11:00
NotAdam	6a3dfc684a	fix windows build	2020-03-01 12:16:01 +11:00
NotAdam	5ccbaea266	fix quest_parser to use new service locator	2020-03-01 11:58:26 +11:00
NotAdam	472c41cda6	fix lobby gameconnection	2020-03-01 11:58:26 +11:00
NotAdam	41e6d73ff3	move to new service locator	2020-03-01 11:58:26 +11:00
NotAdam	64828a4c8a	start of new service locator impl	2020-03-01 11:58:25 +11:00
Adam	97dbbf0fc1	Merge pull request #646 from Sophira/more-quest-parser-updates ... quest_parser: Fix case for constants	2020-03-01 11:24:46 +11:00
Sophie Hamilton	def639e218	quest_parser: Fix case for constants ... The generated onBNpcKill and onEObjHit functions were using the wrong case for the constants they used. Ensure that they use the same case as the declared constants, and reduce duplicate code. Also, fix a typo in the onEObjHit function prototype which was causing generated scripts to not compile properly, and revert the incorrect addition (by me in an earlier commit) of "override".	2020-02-29 17:33:55 +00:00
Adam	47d9df8ae2	Merge pull request #645 from Sophira/quest-parser-update ... quest_parser template update	2020-02-29 22:01:20 +11:00
Sophie Hamilton	2167b8db1a	quest_parser template update ... Use correct method of determining actor, use callback variables instead of inline functions within scenes, and use the correct namespace.	2020-02-29 10:32:35 +00:00
collett	dcce6c6c8a	Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2	2020-02-29 17:29:55 +09:00
Adam	f0a00576a2	Merge pull request #644 from collett8192/exp_fix ... Should not gain any exp past max level.	2020-02-29 18:56:28 +11:00
Adam	b92d259d89	Merge pull request #643 from collett8192/5.2_fix_part_6 ... Solve the mystery of second quest not showing in gridania or limsa.	2020-02-29 18:55:43 +11:00
collett	474ae240dc	Should not gain any exp past max level.	2020-02-27 00:59:28 +09:00
collett	7de4c2b148	do it better	2020-02-27 00:57:48 +09:00
collett	fcb9410a37	unlock flying for now	2020-02-27 00:45:14 +09:00
collett	c46c5d09e3	Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2	2020-02-27 00:04:53 +09:00
collett	cea200a519	should not gain any exp past max level	2020-02-26 19:08:11 +09:00
collett	628c1e20f5	opcode	2020-02-26 18:00:57 +09:00
collett	eb7b76ca2c	Solve the mystery of second quest now showing in gridania or limsa.	2020-02-26 08:12:29 +09:00
collett	e6017eb802	Solve the mystery of second quest now showing in gridania or limsa.	2020-02-26 08:10:42 +09:00
collett	7b386f759d	Merge branch '5.2_fix_part_5' into develop_5.2	2020-02-25 18:54:01 +09:00
NotAdam	614ef5fccd	fix windows build	2020-02-25 15:55:37 +11:00
Adam	df45bebff7	Merge pull request #642 from Sophira/fix-deletecharacter ... Update deleteCharacter, remove charainfofriendlist	2020-02-25 12:52:08 +11:00
Adam	8780559537	Merge pull request #641 from collett8192/5.2_fix_part_5 ... Fix mount.	2020-02-25 12:11:54 +11:00
collett	266cb61ee6	opcode	2020-02-25 02:17:50 +09:00
collett	0be738d990	fix mount	2020-02-25 02:15:16 +09:00
collett	ca86308caa	fix mount	2020-02-25 02:12:32 +09:00
collett	7bceecbecd	some testing stuff	2020-02-25 01:36:51 +09:00
Sophie Hamilton	f023ef119e	Update deleteCharacter, remove charainfofriendlist ... Not all data was deleted when deleting a character, making it impossible to play a new character with the same name. Add in delete commands for the additional tables and remove the reference to the (non-existent) charainfofriendlist table.	2020-02-24 16:17:09 +00:00
NotAdam	c1b11a312b	fix excel structures, been a while	2020-02-24 23:04:52 +11:00
collett	5e55de5b31	opcode	2020-02-24 20:40:46 +09:00
collett	514a27b41f	Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2	2020-02-24 20:03:29 +09:00
Adam	2b5773a3ab	Merge pull request #640 from collett8192/5.2_fix_part_4 ... More fixes on action related enums.	2020-02-24 22:00:46 +11:00
collett	420dac5d16	More fixes on action related enums.	2020-02-24 19:24:29 +09:00
collett	c497dcdb3e	StatusNoEffect also shifted and add proper comment for these.	2020-02-24 19:13:45 +09:00
Adam	05e6f868cc	Merge pull request #639 from collett8192/5.2_fix_part_3 ... Inventory fix and more opcode update.	2020-02-24 21:13:38 +11:00
collett	ad759503b4	it's not gone u stupid	2020-02-24 19:05:25 +09:00
collett	c8c29f0a3a	model equip	2020-02-24 18:57:08 +09:00
collett	38683a9fa2	model equip	2020-02-24 18:56:39 +09:00
collett	50755efe87	fix offset comment	2020-02-24 18:31:15 +09:00
collett	0d8b406a77	Inventory fix and more opcode update.	2020-02-24 18:23:43 +09:00
collett	6dc03653cf	Inventory fix.	2020-02-24 18:17:58 +09:00
collett	28b2d1558c	opcode update for newly created characters	2020-02-24 17:41:09 +09:00
collett	25c961baa4	Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2	2020-02-20 19:26:40 +09:00
Adam	7823230f61	Merge pull request #638 from collett8192/5.2_fix_part_2 ... Fix combo indicator and more opcode updates.	2020-02-20 21:21:26 +11:00
collett	97a1a854dc	Fix combo indicator and more opcode updates.	2020-02-20 18:32:22 +09:00
collett	3e67a17dab	Fix combo indicator and more opcode updates.	2020-02-20 18:31:05 +09:00
collett	eec26b4dd1	Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2	2020-02-20 17:04:57 +09:00