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

136 commits

Author SHA1 Message Date
Mordred
d7f8b55b08 Appveyor fix 2018-02-14 18:24:59 +01:00
Mordred Admin
c54ebbe53c Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
goaaats
7d3a3b8c66 Fix pcb_reader, quest_parser 2018-02-11 16:50:31 +01:00
Adam
7205e9f82c Merge remote-tracking branch 'upstream/develop' into develop 2018-02-08 23:58:30 +11:00
Adam
89f995376e pcb_reader dumps hierachyId now 
spawning objects has never been more fun!
 2018-02-08 23:28:30 +11:00
Mordred
dae8d74fc3
Merge pull request #246 from GokuWeedLord/develop 
fix windows paths with pcb reader
 2018-02-08 11:40:51 +01:00
Adam
10f6e43148 fix pcb_reader ignoring windows paths in arguments 2018-02-08 20:29:39 +11:00
Mordred
145a421f62
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
bb97e1160b added instancecontent.csv dump to pcb_reader 2018-02-07 22:13:20 +00:00
Adam
b74083c06c update generated exd data 2018-02-07 13:33:02 +11:00
Tahir Akhlaq
38448f6ddd fixed eobj export, added option to dump all instanced zones 2018-02-04 22:54:05 +00:00
Tahir Akhlaq
01ba6ad858 added option to dump all level.exd entries for all instances in pcb_reader 2018-02-04 20:09:55 +00:00
Adam
d196795545 fix exd_struct_gen and teleporting 2018-02-04 01:39:05 +11:00
Mordred
7a23d24336
Merge pull request #234 from goaaats/exd_rework 
zone, api: Removed old EXD reader
 2018-02-01 17:49:35 +01:00
goaaats
c460283ca6 Fix for weather crash 2018-02-01 14:50:51 +01:00
Mordred Admin
d40e375e0c Added type for shared_ptr< exdSheet > 2018-01-31 14:55:51 +01:00
goaaats
8a5d497c21 zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Adam
1ce2ca6d65 update generated exd data and some generator fixes 2018-01-31 01:47:58 +11:00
Adam
bc66801c34 actually commit the fixed json... 2018-01-31 01:37:23 +11:00
Adam
8835c5457a update ex.json and take optional param to exd_struct_gen to dat path 2018-01-31 01:37:08 +11:00
Mordred
2ff4084f4e
Removed extra qualifier 2018-01-30 14:47:27 +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
Mordred
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Tahir Akhlaq
f0b888a4a3 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Tahir Akhlaq
95f486ef19 updated pcb_reader with mordred's eobj/enpc entries 2018-01-24 00:15:46 +00:00
Tahir Akhlaq
7ac18f8f5a fix pcb_reader cmakelists i hope 2018-01-23 17:53:22 +00:00
Tahir Akhlaq
0cac614b96 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
6fd9bb1813 remove EXPORT_SCRIPTOBJECT from generated scripts - unused now 2017-12-28 00:08:20 +11:00
Tahir Akhlaq
85e2ea072d 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
4606e83d15 Another attempt at fixing the build 2017-12-18 14:45:15 +01:00
Tahir Akhlaq
d799f2e3c2 added close to home quest 2017-12-18 12:01:38 +00:00
Mordred Admin
e0f93eaf1c Moved and renamed Server_Common, now just src/common 2017-12-18 12:36:52 +01:00
Tahir Akhlaq
7316660a70 clean up generated script public/private members 2017-12-17 10:56:41 +00:00
Tahir Akhlaq
4372179546 update quest_parser for c++ scripting 
- fixed pcb_reader path
 2017-12-17 09:56:35 +00:00
Tahir Akhlaq
6b39deed6c updated pcb_reader to read territorytype from ffxivexplorer export 2017-12-10 14:46:30 +00:00
Mordred Admin
1e29e66101 Qualifier removed from generated file aswell as from generator itself, once again. 2017-12-01 08:44:21 +01:00
Mordred
a42dbd7b96 Remove the right extra qualifier this time 2017-12-01 00:06:50 +01:00
Mordred
b5500d2f64 wrong change... not supposed to remove qualifier on header 2017-12-01 00:03:24 +01:00
Mordred
791a1dfb7e we sure want linux to build this too 2017-12-01 00:01:19 +01:00
Mordred
6b4cc97f4d Greatly improved exd struct gen and also updated struct test 2017-11-30 23:43:20 +01:00
Mordred
09dc925a06 Fixed beast tribe string index 2017-11-19 00:18:30 +01:00
Maru
e5dd280338 Close generated enum blocks; 2017-11-18 00:55:07 -02:00
Maru
1ea2f86f3c Include int type alias for uint8_t; 2017-11-18 00:45:08 -02:00
Mordred
3395b21dd6 Started using pregenerated common emuns, fixed a mysql field length issue with titlelists 2017-11-18 01:25:55 +01:00
Mordred
d130f00d53 Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 23:20:59 +01:00
Mordred
8d3065ba51
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
396fce8aeb clean up some style issues 2017-11-04 10:04:30 +00:00
Tahir Akhlaq
350f904be2 fix pcb_reader linux build, changed line endings 2017-11-04 08:13:35 +00:00
Tahir Akhlaq
eadec08a97 added STANDALONE compile flag for pcb_reader which doesnt require boost or sapphire dependencies 2017-11-03 20:26:53 +00:00
ShelbyZ
ca5d1d3982 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