1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 00:47:45 +00:00
Commit graph

218 commits

Author SHA1 Message Date
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
Tahir Akhlaq
e69a5d1cd4 clean up generated script public/private members 2017-12-17 10:56:41 +00:00
Tahir Akhlaq
83f88102f9 update quest_parser for c++ scripting
- fixed pcb_reader path
2017-12-17 09:56:35 +00:00
Tahir Akhlaq
bd00132e43 updated pcb_reader to read territorytype from ffxivexplorer export 2017-12-10 14:46:30 +00:00
Mordred Admin
f8fec2fb5b Qualifier removed from generated file aswell as from generator itself, once again. 2017-12-01 08:44:21 +01:00
Mordred
7c82ae8264 Remove the right extra qualifier this time 2017-12-01 00:06:50 +01:00
Mordred
954b4a9173 wrong change... not supposed to remove qualifier on header 2017-12-01 00:03:24 +01:00
Mordred
35409e1cc7 we sure want linux to build this too 2017-12-01 00:01:19 +01:00
Mordred
e75c392b9f Greatly improved exd struct gen and also updated struct test 2017-11-30 23:43:20 +01:00
Mordred
bf4ba68be4 Fixed beast tribe string index 2017-11-19 00:18:30 +01:00
Maru
a7314f448b Close generated enum blocks; 2017-11-18 00:55:07 -02:00
Maru
7789ad382d Include int type alias for uint8_t; 2017-11-18 00:45:08 -02:00
Mordred
f043049d2b Started using pregenerated common emuns, fixed a mysql field length issue with titlelists 2017-11-18 01:25:55 +01:00
Mordred
692f5fbf2f Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 23:20:59 +01:00
Mordred
3a11e3e8f3 Merge pull request #166 from takhlaq/pcb_standalone
added -DSTANDALONE compile option for pcb_reader for compiling without xivdat/boost deps
2017-11-13 11:03:04 +01:00
Tahir Akhlaq
a20d5f5946 clean up some style issues 2017-11-04 10:04:30 +00:00
Tahir Akhlaq
466a9cc926 fix pcb_reader linux build, changed line endings 2017-11-04 08:13:35 +00:00
Tahir Akhlaq
41579d3c6f added STANDALONE compile flag for pcb_reader which doesnt require boost or sapphire dependencies 2017-11-03 20:26:53 +00:00
ShelbyZ
33da12a8d3 gcc warnings
- uint64_t format errors using <cinttypes> define SCNu64
- sprintf without format string replacing with strcpy (might be better
to move to strncpy or something else)
- use return value of fread(...)
- use return value of system(...)
2017-11-01 22:24:50 -07:00
Mordred Admin
2113e45a5b Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN
Conflicts:
	CMakeLists.txt
	src/servers/Server_Common/Network/PacketDef/Ipcs.h
	src/servers/Server_Zone/Actor/PlayerQuest.cpp
	src/servers/Server_Zone/Actor/PlayerSql.cpp
2017-10-25 14:49:35 +02:00
ShelbyZ
5f38a17663 Addressing unchecked iterator issues with core project
- std::equal can take a 2nd iterator end
- use _SCL_SECURE_NO_WARNINGS for std::copy issues in exd_common_gen
2017-10-22 18:11:00 -07:00
Mordred
98544ba5fb Merge pull request #147 from takhlaq/pcb
fixed map export legit this time
2017-10-21 09:20:37 +02:00
Tahir Akhlaq
d499d53e5a fixed map export legit this time 2017-10-20 22:50:21 +01:00
Mordred
0b25ec89ae Merge pull request #146 from takhlaq/pcb
cleaned up some compiler warnings in pcb_reader
2017-10-20 21:27:59 +02:00
Tahir Akhlaq
c7a2023df4 legit why the fuck are we missing stairs in towers (pcb) 2017-10-20 17:56:01 +01:00
Tahir Akhlaq
b11f5e492f cleaned up some compiler warnings in pcb_reader
- fixed loading some gimmick entries
2017-10-20 13:34:03 +01:00
Mordred
d2d6c05429 Merge pull request #141 from takhlaq/pcb
pcb stuff (missing some objects)
2017-10-19 19:00:21 +02:00
Tahir Akhlaq
4f557340c5 fix linux build for pcb reader 2017-10-19 17:49:08 +01:00
Tahir Akhlaq
3b2b3c7349 fix pcb linux build 2017-10-19 17:26:01 +01:00
Tahir Akhlaq
842199b735 fixed collision dumping
- added saintcoinach's sgb parsing
2017-10-19 16:38:06 +01:00
ShelbyZ
32a9d976f7 signed/unsigned mismatch issues
- Move for...loop int to size_t
- Move int32_t to uint32_t
2017-10-19 07:12:09 -07:00
Tahir Akhlaq
acbc33063a const all the things for readability
- removed .mdl collision loading since game doesnt use it

fixed style issues in pcb_reader
2017-10-19 09:39:05 +01:00
Tahir Akhlaq
7b127e20df fixed issue with missing objects 2017-10-19 09:38:53 +01:00
Tahir Akhlaq
c35795a9f3 slightly cleaned up PCB reader, added some exception logging 2017-10-19 09:38:52 +01:00
Tahir Akhlaq
edd529297c cleaned up collision map exporter
- export by object
2017-10-19 09:38:51 +01:00
Tahir Akhlaq
4e2bcbfa9c exported collision maps correctly now (i think) 2017-10-19 09:38:50 +01:00
Mordred
c7a864335f hopefully fixed issues with pcb 2017-10-19 09:38:49 +01:00