1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Commit graph

484 commits

Author SHA1 Message Date
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
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
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
Tahir Akhlaq
424c52ce7d cleaned up some compiler warnings in pcb_reader
- fixed loading some gimmick entries
2017-10-20 13:34:03 +01:00
ShelbyZ
a73721764f Fixing some type alignments via casting
- static_cast for reasonable values
- at least one stray float
2017-10-19 16:18:16 -07:00
Mordred
922d89d45f Merge pull request #142 from goaaats/master
Initial mounts implementation, nicer debug packet printing
2017-10-19 19:01:08 +02:00
Mordred
a0ddf9659c Merge pull request #141 from takhlaq/pcb
pcb stuff (missing some objects)
2017-10-19 19:00:21 +02:00
Tahir Akhlaq
fbe91234a4 fix linux build for pcb reader 2017-10-19 17:49:08 +01:00
Tahir Akhlaq
9263496d27 fix pcb linux build 2017-10-19 17:26:01 +01:00
Mordred
4284072267 Merge pull request #144 from AcedArmy/master
Added Version and Git Hash to Lobby, Zone Startup Info Banners
2017-10-19 18:25:53 +02:00
Mordred
bb08e99a16 Merge pull request #143 from ShelbyZ/msvc_warnings
signed/unsigned mismatch issues
2017-10-19 18:24:09 +02:00
Tahir Akhlaq
bc89049ada fixed collision dumping
- added saintcoinach's sgb parsing
2017-10-19 16:38:06 +01:00
Biscuit Boy
c54b0e2974 Add Verison and Git Hash to printBanner
Added Version and Git Hash to printBanner in Zone and Lobby Server
2017-10-20 02:23:45 +11:00
Biscuit Boy
a6b70b3c7a Merge pull request #1 from SapphireMordred/master
Update Fork
2017-10-20 02:20:10 +11:00
ShelbyZ
abb2ccdbe4 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
ShelbyZ
4d8f69e165 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into msvc_warnings 2017-10-19 06:36:34 -07:00
Tahir Akhlaq
a90fd345dc 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
06271dd669 fixed issue with missing objects 2017-10-19 09:38:53 +01:00
Tahir Akhlaq
2e13df1934 slightly cleaned up PCB reader, added some exception logging 2017-10-19 09:38:52 +01:00
Tahir Akhlaq
ae1b8a393e cleaned up collision map exporter
- export by object
2017-10-19 09:38:51 +01:00