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

501 commits

Author SHA1 Message Date
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
Mordred
974a682b8a
Merge pull request #167 from perize/master
Add a struct def of job gauge
2017-11-07 07:56:23 +01:00
Perize
8988ae3cc0 Add a struct def of job gauge 2017-11-06 23:41:04 +09: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
Mordred
9113e6a19d
Merge pull request #164 from ShelbyZ/gcc_warnings
Gcc warnings
2017-11-02 21:13:16 +01: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
ShelbyZ
1592afd664 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into gcc_warnings 2017-11-01 21:45:34 -07:00
Mordred
4710eacb76
Merge pull request #163 from goaaats/master
Set debug working path for generated solutions
2017-10-31 14:12:19 +01:00
goaaats
fe278843c7 Set debug working path for generated solutions 2017-10-31 13:36:03 +01:00
Mordred
c05d665358
Merge pull request #162 from ShelbyZ/last_warnings
Silence unchecked iterators for server_rest
2017-10-31 07:58:04 +01:00
ShelbyZ
e8b25f1562 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
6134b7006c Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings 2017-10-30 16:31:55 -07:00
Mordred
5c69e98c46 Merge pull request #159 from ShelbyZ/unbork_rest
Path comparison is causing issues
2017-10-24 22:59:49 +02:00
ShelbyZ
b202703afb Path comparison is causing issues
- don't be too smart without running through some testing
2017-10-24 10:51:51 -07:00
Mordred
64eac677a5 Merge pull request #157 from ShelbyZ/static_cast_round_2
More static_cast
2017-10-24 07:52:43 +02:00
ShelbyZ
24f937fd61 Fixing linkshellid to uint64_t
updating methods, internal collection, and sql representation
2017-10-23 08:33:47 -07:00
Mordred
86cd16f5c1 Merge pull request #155 from ShelbyZ/unchecked_iters
Addressing unchecked iterator issues with core project
2017-10-23 08:08:28 +02:00
Mordred
792db89718 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
c9a53b5d2b 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
818f617661 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
b15fc7164c 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
d37efcef52 Merge pull request #154 from ShelbyZ/compiler_flags
Correctly applying /ZI for debug
2017-10-22 20:08:01 +02:00
ShelbyZ
a162a7caea Need to disable SAFESEH before /ZI 2017-10-22 10:43:33 -07:00
Mordred
f87ac64fec 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
e5c1dcc78c Removing comment 2017-10-22 09:29:22 -07:00
ShelbyZ
1d511299f8 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
80d623ae95 _blank creates an empty frame while opening the page in the default web browser 2017-10-22 21:46:55 +11:00
GokuWeedLord
0429cd9d1c add server commit history to login page 2017-10-22 21:39:54 +11:00
Mordred
c2223f52b5 Merge pull request #151 from ShelbyZ/compiler_flags
Fix up Flags around Edit and Continue
2017-10-22 11:02:46 +02:00
Mordred
711243f302 Merge pull request #150 from ShelbyZ/unreferenced
Remove unreferenced parameters
2017-10-22 11:01:56 +02:00
ShelbyZ
e50fd76062 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
f8796e1ecc Remove unreferenced parameters
- exceptions had unused parameters
2017-10-21 20:47:50 -07:00
Mordred
b0e7c74dd9 Merge pull request #149 from GokuWeedLord/feature/debugfixes
misc bugfixes and improvements
2017-10-21 16:51:23 +02:00
GokuWeedLord
7707b4a750 !unlock and !help debug commands 2017-10-21 23:41:09 +11:00
GokuWeedLord
8957e1672b compiler warning fix 2017-10-21 23:40:51 +11:00
GokuWeedLord
adc33d8612 fix aetheryte_index being incorrect and causing a server crash 2017-10-21 23:40:36 +11:00
GokuWeedLord
72e8b86239 expose isincombat to scripts - isInCombat doesn't work though 2017-10-21 22:24:04 +11:00
GokuWeedLord
c79affb137 fix a compile warning 2017-10-21 22:23:28 +11:00
GokuWeedLord
ee552440ba ignore files generated by edit and continue 2017-10-21 19:22:05 +11:00
GokuWeedLord
5d9ab6fe48 gm command fix, quest debug output change 2017-10-21 19:21:43 +11:00
Mordred
897cbb07ac Merge pull request #147 from takhlaq/pcb
fixed map export legit this time
2017-10-21 09:20:37 +02:00
Mordred
5ea280409a Merge pull request #148 from GokuWeedLord/master
fix a vs xml linting error
2017-10-21 09:20:25 +02:00
GokuWeedLord
33203148d7 fix a vs xml linting error 2017-10-21 16:41:09 +11:00
Mordred
f93aa5a4d7 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
6789dad0e8 fixed map export legit this time 2017-10-20 22:50:21 +01:00
ShelbyZ
279563b90f Fixing spacing issues for casts 2017-10-20 14:12:24 -07:00
Mordred
7dc192cee2 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
5a023f8436 legit why the fuck are we missing stairs in towers (pcb) 2017-10-20 17:56:01 +01:00