1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Commit graph

53 commits

Author SHA1 Message Date
Mordred
855ae3e961 Instance join cutscene will no longer mess up the player, removed wrong field from event start, cotire server_zone only when using linux 2018-03-12 23:51:17 +01:00
Mordred Admin
250b1aef79 More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred
83cb17610c WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred Admin
6ed1b274a3 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:24:25 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Adam
dcd0d6b0cd remove double eventStart call 2018-03-06 13:34:02 +11:00
Mordred
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Mordred
22402651e9 Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Adam
0de9fb05cf better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Maru
52468262f3 More style stuff; 2018-03-02 08:25:48 -03:00
Maru
a61aef2c1e Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred Admin
083a3aa239 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Adam
8a3ed93fbc redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Adam
b6cfa339d6 more opcodes 2018-02-25 15:16:42 +11:00
Mordred
e548e148e5 Simplified syntax for eobj registering, added test script for thousand maws 2018-02-25 01:23:40 +01:00
Mordred
67c2cb7971 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
692ca9d56e More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
6e5737f401 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00
Mordred
9a4e7533c6 Renaming classes in preperation of actor rework 2018-02-20 22:46:44 +01:00
Mordred
ba511a23e2 Revert "Changeing base access type of actors to gameobject"
This reverts commit 7d916f7
2018-02-19 22:00:32 +01:00
Mordred
7d916f7d86 Changeing base access type of actors to gameobject 2018-02-18 23:48:51 +01:00
Mordred
237d3cc7a6 Added Waymarks trigger to enum, fixed initial array sizes for new chars 2018-02-18 02:05:25 +01:00
Mordred
883916aa48 More cleanup of actionhandler 2018-02-18 01:50:20 +01:00
Mordred
1f37416202 Actionhandler cleaned up a bit 2018-02-17 01:20:40 +01:00
Mordred
b8cbdf3fa5 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +01:00
Mordred
ddb4247588 More zone refactoring, general style fixes 2018-02-14 21:11:23 +01:00
Mordred Admin
c54ebbe53c Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
cee84cd9ff In range containers no longer declared publicly 2018-02-11 22:57:00 +01:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Adam
7528db3b83 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred
4e1c82c2be More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
78606873ae Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
21a39a09eb Disabled betweenarea state flags until we fix it 2018-02-04 18:53:19 +01:00
Adam
46ce423466 cf spawns instances and zones you into them 2018-02-05 01:55:10 +11:00
Mordred
ebf78a71ac Fully fixed initui and quests 2018-02-03 01:51:46 +01:00
goaaats
8a5d497c21 zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Mordred Admin
0fc7d293ec Merge remote-tracking branch 'origin/event_rewrite'
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
2018-01-30 07:53:15 +01:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
20ee459e26 instance zoning and returning implemented
instancecontent uses instancecontent class instead of zone too
2018-01-29 13:05:33 +11:00
Adam
d54f366712 gm teri accepts instance id 2018-01-29 00:40:34 +11:00
Adam
ea47861f33 base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
725ca11c60 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite"
This reverts commit 4e2319130f, reversing
changes made to 695fea7812.
2018-01-28 11:16:34 +01:00
Adam
fb06cd4930 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
Adam
2ea7f776ba shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Mordred
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Biscuit Boy
1895accd5e Added GM1 Back since its needed 2018-01-20 02:04:38 +11:00
Biscuit Boy
7c90e133f8 Fixed GM Call
GM Call was placed in GM1 instead of GM2 for some reason /shrug
2018-01-20 01:56:00 +11:00
Mordred
8890296639 More event simplification 2018-01-18 21:49:12 +01:00
Mordred
e7f7cc947f More cleanup of event / script handlers 2018-01-16 02:16:48 +01:00