mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-07 11:17:46 +00:00
Code Activity
2671 commits 10 branches 14 tags 26 MiB
Commit graph

204 commits

Author SHA1 Message Date
Maru
a52b6803fd Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
0a6164fc03 Merge pull request #299 from goaaats/4-3-exdfixes 
Use generated EXD data for quest_parse
 2018-05-27 16:35:48 +02:00
goaaats
00858a5f69 Fixed bad include 2018-05-25 14:27:54 +02:00
goaaats
069a5fc9e0 Use generated EXD data for quest_parse 2018-05-25 14:16:39 +02:00
goaaats
507bb99125 Merge branch 'master' into 4-3-exdfixes 2018-05-22 20:19:35 +02:00
goaaats
3b0a5c9226 Update ex.json(needs testing) 2018-05-22 20:15:46 +02:00
goaaats
2c901c12ec exd_struct_gen: Fix fields starting with numbers, fix fields that are cpp keywords 2018-05-22 20:15:30 +02:00
Mordred
052ea5f1d2 Zone-Server should now start up fine again 2018-05-22 17:42:50 +02:00
Tahir Akhlaq
b19f6baf0b attempt to fix build 2018-03-22 22:56:14 +00:00
Mordred
349fa1d788 Added discovery parser 2018-03-22 23:01:55 +01:00
Mordred
4c77868d1c Simplified scripts a bit, a bit easier on the eyes 2018-03-20 00:05:54 +01:00
Adam
aa1c76602b fix some retarded clion refactoring 2018-03-13 19:26:28 +11:00
Adam
bdd438e589 proper event plays upon entering sastasha 2018-03-13 17:57:52 +11:00
Mordred Admin
c2165e5f33 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Adam
9dcb271a63 use subfolders for instancecontenttype and export eobj rotation 2018-03-04 17:49:18 +11:00
Mordred
7659521233 Instance parser updated to map sgb content to EObjects 2018-03-04 00:16:44 +01:00
Mordred
e15c34a74d Added instance script dumper 2018-02-26 23:50:50 +01:00
Mordred
6b801474b7 Build fix... 2018-02-14 19:17:10 +01:00
Mordred
d832efdbc1 Appveyor fix 2018-02-14 18:24:59 +01:00
Mordred Admin
df61b53d1a Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
goaaats
15345d36d2 Fix pcb_reader, quest_parser 2018-02-11 16:50:31 +01:00
Adam
4ccc2cfc26 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-08 23:58:30 +11:00
Adam
06bf24a606 pcb_reader dumps hierachyId now 
spawning objects has never been more fun!
 2018-02-08 23:28:30 +11:00
Mordred
cf6d997405 Merge pull request #246 from GokuWeedLord/develop 
fix windows paths with pcb reader
 2018-02-08 11:40:51 +01:00
Adam
2347568293 fix pcb_reader ignoring windows paths in arguments 2018-02-08 20:29:39 +11:00
Mordred
aa9ca62e6b Merge pull request #245 from takhlaq/pcb_reader 
added instancecontent.csv dump to pcb_reader
 2018-02-08 07:53:25 +01:00
Tahir Akhlaq
6a32729540 added instancecontent.csv dump to pcb_reader 2018-02-07 22:13:20 +00:00
Adam
609a92fd49 update generated exd data 2018-02-07 13:33:02 +11:00
Tahir Akhlaq
f09a5e0c27 fixed eobj export, added option to dump all instanced zones 2018-02-04 22:54:05 +00:00
Tahir Akhlaq
1b1672a541 added option to dump all level.exd entries for all instances in pcb_reader 2018-02-04 20:09:55 +00:00
Adam
0ee68c1b1e fix exd_struct_gen and teleporting 2018-02-04 01:39:05 +11:00
Mordred
ebbe99805e Merge pull request #234 from goaaats/exd_rework 
zone, api: Removed old EXD reader
 2018-02-01 17:49:35 +01:00
goaaats
3eb0ad0c86 Fix for weather crash 2018-02-01 14:50:51 +01:00
Mordred Admin
0e052e84c6 Added type for shared_ptr< exdSheet > 2018-01-31 14:55:51 +01:00
goaaats
c0b3d3605b zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Adam
3606ea6ef6 update generated exd data and some generator fixes 2018-01-31 01:47:58 +11:00
Adam
d6bf277183 actually commit the fixed json... 2018-01-31 01:37:23 +11:00
Adam
3d8e56ede4 update ex.json and take optional param to exd_struct_gen to dat path 2018-01-31 01:37:08 +11:00
Mordred
6bbe0385cd Removed extra qualifier 2018-01-30 14:47:27 +01:00
Mordred Admin
2a6c505f9f Merge remote-tracking branch 'origin/event_rewrite' 
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
 2018-01-30 07:53:15 +01:00
Mordred
aabcdf6e74 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Tahir Akhlaq
d575c63152 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Tahir Akhlaq
b63b4eb612 updated pcb_reader with mordred's eobj/enpc entries 2018-01-24 00:15:46 +00:00
Tahir Akhlaq
e01710c2c3 fix pcb_reader cmakelists i hope 2018-01-23 17:53:22 +00:00
Tahir Akhlaq
6d591a004f reenabled pcb_reader build, removed dumb requirement of territorytype extraction on xivdat build for pcb_reader 2018-01-23 13:13:35 +00:00
Adam
86818e14ed remove EXPORT_SCRIPTOBJECT from generated scripts - unused now 2017-12-28 00:08:20 +11: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
e4d7b01fff Another attempt at fixing the build 2017-12-18 14:45:15 +01:00
Tahir Akhlaq
3396bbbc7b added close to home quest 2017-12-18 12:01:38 +00:00
Mordred Admin
764b73b11c Moved and renamed Server_Common, now just src/common 2017-12-18 12:36:52 +01:00