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

501 commits

Author SHA1 Message Date
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
Mordred
558be56490 Merge pull request #167 from perize/master
Add a struct def of job gauge
2017-11-07 07:56:23 +01:00
Perize
ddbdf5a409 Add a struct def of job gauge 2017-11-06 23:41:04 +09: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
Mordred
90f8019f2b Merge pull request #164 from ShelbyZ/gcc_warnings
Gcc warnings
2017-11-02 21:13:16 +01: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
ShelbyZ
9fd4155121 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into gcc_warnings 2017-11-01 21:45:34 -07:00
Mordred
b8441c009f Merge pull request #163 from goaaats/master
Set debug working path for generated solutions
2017-10-31 14:12:19 +01:00
goaaats
c23860a61d Set debug working path for generated solutions 2017-10-31 13:36:03 +01:00
Mordred
c6acf51957 Merge pull request #162 from ShelbyZ/last_warnings
Silence unchecked iterators for server_rest
2017-10-31 07:58:04 +01:00
ShelbyZ
9aeda0dadc Silence unchecked iterators for server_rest
- couldnt't find a better way to find the subpath or a root
- can't pass other iter length or it fails to view them as main and
subdir
2017-10-30 19:11:54 -07:00
ShelbyZ
9c13feb9c5 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings 2017-10-30 16:31:55 -07:00
Mordred
e27b348971 Merge pull request #159 from ShelbyZ/unbork_rest
Path comparison is causing issues
2017-10-24 22:59:49 +02:00
ShelbyZ
5c1015fc2a Path comparison is causing issues
- don't be too smart without running through some testing
2017-10-24 10:51:51 -07:00
Mordred
d5e24c97e5 Merge pull request #157 from ShelbyZ/static_cast_round_2
More static_cast
2017-10-24 07:52:43 +02:00
ShelbyZ
3ae890cc78 Fixing linkshellid to uint64_t
updating methods, internal collection, and sql representation
2017-10-23 08:33:47 -07:00
Mordred
ca2691d45c Merge pull request #155 from ShelbyZ/unchecked_iters
Addressing unchecked iterator issues with core project
2017-10-23 08:08:28 +02:00
Mordred
ff832b298a Merge pull request #156 from ShelbyZ/upgrade_item_quantity_bitness
Quantity treated as uint32_t at packet level
2017-10-23 08:08:07 +02:00
ShelbyZ
05e5221f2e More static_cast
- expand some types
- gnarly std::pair issue with short to int8_t
- getLinkshellById now uses uint32_t
2017-10-22 20:51:25 -07:00
ShelbyZ
6ed2a850c7 Quantity treated as uint32_t at packet level
- move tryAddItem/AddItem to uint32_t from uint16_t
2017-10-22 18:53:58 -07: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
09d565a854 Merge pull request #154 from ShelbyZ/compiler_flags
Correctly applying /ZI for debug
2017-10-22 20:08:01 +02:00
ShelbyZ
b17098414b Need to disable SAFESEH before /ZI 2017-10-22 10:43:33 -07:00
Mordred
4d2c890aba Merge pull request #152 from GokuWeedLord/feature/launcherchanges
add commit history to launcher and fix issue causing blank frames to open
2017-10-22 18:40:33 +02:00
ShelbyZ
c6c3bf4a25 Removing comment 2017-10-22 09:29:22 -07:00
ShelbyZ
08366ae11c Correctly applying /ZI for debug
- /ZI is not a link flag
- /ZI is not settable via CMAKE_CXX_FLAGS
- /Zi is default unless add_defitions(/ZI)
2017-10-22 09:28:19 -07:00
GokuWeedLord
531d5cf9be _blank creates an empty frame while opening the page in the default web browser 2017-10-22 21:46:55 +11:00
GokuWeedLord
0b5d55abea add server commit history to login page 2017-10-22 21:39:54 +11:00
Mordred
876e6045df Merge pull request #151 from ShelbyZ/compiler_flags
Fix up Flags around Edit and Continue
2017-10-22 11:02:46 +02:00
Mordred
f303307fd0 Merge pull request #150 from ShelbyZ/unreferenced
Remove unreferenced parameters
2017-10-22 11:01:56 +02:00
ShelbyZ
9065b4ccea Fix up Flags around Edit and Continue
- remove /SAFESEH:NO
- apply /INCREMENTAL /ZI (debug only)
- remove sprinkling of /INCREMENTAL /ZI
2017-10-21 22:09:03 -07:00
ShelbyZ
35906f3af3 Remove unreferenced parameters
- exceptions had unused parameters
2017-10-21 20:47:50 -07:00
Mordred
013a875a8d Merge pull request #149 from GokuWeedLord/feature/debugfixes
misc bugfixes and improvements
2017-10-21 16:51:23 +02:00
GokuWeedLord
7db9ea07d6 !unlock and !help debug commands 2017-10-21 23:41:09 +11:00
GokuWeedLord
bebde300f1 compiler warning fix 2017-10-21 23:40:51 +11:00
GokuWeedLord
a36282a7fa fix aetheryte_index being incorrect and causing a server crash 2017-10-21 23:40:36 +11:00
GokuWeedLord
471b5d7220 expose isincombat to scripts - isInCombat doesn't work though 2017-10-21 22:24:04 +11:00
GokuWeedLord
bb42a771eb fix a compile warning 2017-10-21 22:23:28 +11:00
GokuWeedLord
2f1e351d54 ignore files generated by edit and continue 2017-10-21 19:22:05 +11:00
GokuWeedLord
cd1b51f23f gm command fix, quest debug output change 2017-10-21 19:21:43 +11:00
Mordred
98544ba5fb Merge pull request #147 from takhlaq/pcb
fixed map export legit this time
2017-10-21 09:20:37 +02:00
Mordred
3dbee9beed Merge pull request #148 from GokuWeedLord/master
fix a vs xml linting error
2017-10-21 09:20:25 +02:00
GokuWeedLord
d1a636c6cc fix a vs xml linting error 2017-10-21 16:41:09 +11:00
Mordred
0fa116219a Merge pull request #145 from ShelbyZ/static_casting_warnings
Fixing some type alignments via casting
2017-10-20 23:57:59 +02:00
Tahir Akhlaq
d499d53e5a fixed map export legit this time 2017-10-20 22:50:21 +01:00
ShelbyZ
54548e1928 Fixing spacing issues for casts 2017-10-20 14:12:24 -07: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