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

6109 commits

Author SHA1 Message Date
Mordred
897cbb07ac 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
Mordred
5ea280409a 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
GokuWeedLord
33203148d7 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
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
d499d53e5a fixed map export legit this time 2017-10-20 22:50:21 +01:00
Tahir Akhlaq
6789dad0e8 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
ShelbyZ
279563b90f Fixing spacing issues for casts 2017-10-20 14:12:24 -07:00
Maru
1c3c9ccd41 Added CONTRIBUTING.md; 2017-10-20 18:38:02 -02:00
Maru
394d682880 Added CONTRIBUTING.md; 2017-10-20 18:38:02 -02: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
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
c7a2023df4 legit why the fuck are we missing stairs in towers (pcb) 2017-10-20 17:56:01 +01: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
b11f5e492f cleaned up some compiler warnings in pcb_reader
- fixed loading some gimmick entries
2017-10-20 13:34:03 +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
3b42b1df9b Fixing some type alignments via casting
- static_cast for reasonable values
- at least one stray float
2017-10-19 16:18:16 -07: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
9df21f92eb Merge pull request #142 from goaaats/master
Initial mounts implementation, nicer debug packet printing
2017-10-19 19:01:08 +02: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
d2d6c05429 Merge pull request #141 from takhlaq/pcb
pcb stuff (missing some objects)
2017-10-19 19:00:21 +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
4f557340c5 fix linux build for pcb reader 2017-10-19 17:49:08 +01:00
Tahir Akhlaq
fbe91234a4 fix linux build for pcb reader 2017-10-19 17:49:08 +01:00
Tahir Akhlaq
3b2b3c7349 fix pcb linux build 2017-10-19 17:26:01 +01:00
Tahir Akhlaq
9263496d27 fix pcb linux build 2017-10-19 17:26:01 +01:00
Mordred
834a8b3271 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
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
238e1da08e Merge pull request #143 from ShelbyZ/msvc_warnings
signed/unsigned mismatch issues
2017-10-19 18:24:09 +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
842199b735 fixed collision dumping
- added saintcoinach's sgb parsing
2017-10-19 16:38:06 +01:00
Tahir Akhlaq
bc89049ada fixed collision dumping
- added saintcoinach's sgb parsing
2017-10-19 16:38:06 +01:00
Biscuit Boy
4a8883a0fa 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
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
fdee1811e1 Merge pull request #1 from SapphireMordred/master
Update Fork
2017-10-20 02:20:10 +11:00
Biscuit Boy
a6b70b3c7a Merge pull request #1 from SapphireMordred/master
Update Fork
2017-10-20 02:20:10 +11:00
ShelbyZ
32a9d976f7 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
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
72ebf7542e Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into msvc_warnings 2017-10-19 06:36:34 -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
acbc33063a 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
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
7b127e20df fixed issue with missing objects 2017-10-19 09:38:53 +01:00
Tahir Akhlaq
06271dd669 fixed issue with missing objects 2017-10-19 09:38:53 +01:00
Tahir Akhlaq
c35795a9f3 slightly cleaned up PCB reader, added some exception logging 2017-10-19 09:38:52 +01:00
Tahir Akhlaq
2e13df1934 slightly cleaned up PCB reader, added some exception logging 2017-10-19 09:38:52 +01:00
Tahir Akhlaq
edd529297c cleaned up collision map exporter
- export by object
2017-10-19 09:38:51 +01:00