1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Commit graph

613 commits

Author SHA1 Message Date
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
Maru
394d682880 Added CONTRIBUTING.md; 2017-10-20 18:38:02 -02: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
Tahir Akhlaq
9ec749a964 exported collision maps correctly now (i think) 2017-10-19 09:38:50 +01:00
Mordred
15d18f29de hopefully fixed issues with pcb 2017-10-19 09:38:49 +01:00
Tahir Akhlaq
44f7dc290f added wavefront obj dump (doesnt work yet) 2017-10-19 09:38:49 +01:00
Tahir Akhlaq
3c24a3ef57 added list.pcb file mapping
- added LGB parser (all credit for LGB to contributor<https://github.com/ufx/SaintCoinach/blob/master/SaintCoinach/Graphics/Lgb/>, lgb.h is simply their work ported to c++)
- todo: correct object placement
2017-10-19 09:38:48 +01:00
Mordred
25b75043c5 More sql updates and conversions 2017-10-18 20:49:37 +02:00
Mordred
d146947be4 Merge pull request #139 from ShelbyZ/msvc_warnings
Potential Truncation - value over signed char
2017-10-18 19:33:57 +02:00
ShelbyZ
cbfee8ff79 Moving to uint8_t 2017-10-18 09:19:05 -07:00
amibu
69e82b80f1 Formatting 2017-10-18 18:08:51 +02:00
amibu
e62b712dce Mount debug command; 2017-10-18 18:06:25 +02:00
amibu
e586a119e0 Cleanup, mount DB saving; 2017-10-18 17:54:17 +02:00
amibu
f289837b00 ActionMount; 2017-10-18 15:49:19 +02:00
Mordred
91ebb344c0 Merge pull request #140 from ShelbyZ/gitignores
Remove CMake/Build Artifacts
2017-10-18 11:24:25 +02:00
ShelbyZ
444a7929a2 Remove CMake/Build Artficats
- vcxproj/sln files created using cmake tool
- idb files made as a result of build
2017-10-17 17:23:01 -07:00
ShelbyZ
4833225459 Potential Truncation - value over signed char
In PacketHandlers.cpp ~line453 - we are trying to insert a hex value
(128) x80 and will cause an underflow to -128.  Suggestion is to move to
unsigned char to capture the intended value.
2017-10-17 17:14:11 -07:00
amibu
3775c7730f Replicating retail packet flow for testing 2017-10-17 23:03:47 +02:00
amibu
951dabb58a Formatting 2017-10-17 22:52:12 +02:00
amibu
4bb0cd0f7b Cleanup 2017-10-17 22:49:33 +02:00
amibu
b0a2eb853a Base for mounts, needs to be in a ActionCast; 2017-10-17 21:31:00 +02:00
amibu
a555f91883 Ported beautiful packet printing from classic 2017-10-17 20:13:01 +02:00
Mordred
a2feaa0890 Merge pull request #138 from goaaats/master
Fix chat opcode + packet struct
2017-10-17 19:21:43 +02:00