mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-05 18:27:47 +00:00
Code Activity
1583 commits 10 branches 14 tags 26 MiB
Commit graph

41 commits

Author SHA1 Message Date
Mordred
3848091148 Mostly fixed for 4.4 2018-09-18 22:45:48 +02:00
Mordred
9624d08b4c Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
Mordred
e745bd0329 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
Mordred
eb5a567730 Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
NotAdam
78cd199ec8 minor refactoring 2018-07-22 23:32:16 +10:00
NotAdam
8c870d2f5d somewhat working gilshops 2018-07-22 23:20:22 +10:00
Mordred
35f56177c6 Update EventHelper.cpp 2018-07-17 16:11:09 +02:00
Dantestyle
8e14dd3806 more EventHelper on chat, I like them 2018-07-12 01:39:16 +02:00
Mordred Admin
9d620d160c Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Action/EventAction.cpp
	src/servers/sapphire_zone/Actor/Chara.cpp
	src/servers/sapphire_zone/Actor/EventObject.cpp
	src/servers/sapphire_zone/Actor/Player.cpp
	src/servers/sapphire_zone/Actor/PlayerInventory.cpp
	src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
	src/servers/sapphire_zone/Zone/Zone.cpp
 2018-07-03 15:01:13 +02:00
Mordred
e9c9eaa53a Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
f2c2087d7b Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
d34598d295 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Adam
6304e097e4 eventPlay -> playScene, added playSceneChain 2018-03-20 22:08:25 +11:00
Mordred
14c57be9b4 Is this what you want from me linux?! 2018-03-20 09:51:59 +01:00
Mordred
4c77868d1c Simplified scripts a bit, a bit easier on the eyes 2018-03-20 00:05:54 +01:00
Adam
f74c96a5d4 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Mordred
24399e31e4 WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred Admin
c2165e5f33 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
0833bdd76c Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Adam
841e292e9b director sequence/branch setters & debug command 2018-02-28 22:25:18 +11:00
Mordred
8504ee7e12 Simplified syntax for eobj registering, added test script for thousand maws 2018-02-25 01:23:40 +01:00
Mordred
c6c2210471 Added onEnterTerritory for IC, also changed the way IC is called 2018-02-24 15:19:32 +01:00
Mordred Admin
df61b53d1a Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Mordred
0cb304083d More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
0d75ba0096 Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
95efd65e0f Fully fixed initui and quests 2018-02-03 01:51:46 +01:00
Mordred
62a14e05d1 Changed more timer usages to 64bit, changed getQuestInfo exd to grab correct field for name 2018-02-02 17:37:51 +01:00
goaaats
c0b3d3605b zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Adam
b3cda8ebe6 goat can finish this 2018-01-31 02:06:11 +11:00
Mordred
d9da17cd35 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00
Mordred
04f5823c4b Removed author comment, we have git anyways. 2018-01-28 11:40:12 +01:00
Mordred
a104b5a928 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
147ff80f86 Beginning of splitting eventhandlers, pulling logic out of scriptmanager 2018-01-14 23:54:26 +01:00
Mordred Admin
6d6c71d6af Removed redundancy in EventHandler type declarations 2018-01-10 10:47:47 +01:00
Mordred
0f16ad4812 Another approach at event improvements 2018-01-09 23:50:54 +01:00
Mordred
b26236c99b another event rewrite approach 2018-01-09 23:44:02 +01:00
Tahir Akhlaq
9a931baf39 Merge branch 'native_scripting' of https://github.com/SapphireMordred/Sapphire into native_scripting 
# Conflicts:
#	scripts/native/CMakeLists.txt
#	src/tools/quest_parser/main.cpp
 2017-12-20 13:23:49 +00:00
Mordred Admin
2382f72184 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00