mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 00:27:44 +00:00
Code Activity
6328 commits 10 branches 14 tags 26 MiB
Commit graph

6328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
d7b54b5b6d PlayerMinimal almost completely ported 2017-10-26 00:13:41 +02:00
Mordred
a8c1741964 PlayerMinimal almost completely ported 2017-10-26 00:13:41 +02:00
Mordred
d73246a4c9 Initial inventory container creation ported 2017-10-25 23:24:47 +02:00
Mordred
00e717491b Initial inventory container creation ported 2017-10-25 23:24:47 +02:00
Mordred Admin
2113e45a5b Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 
Conflicts:
	CMakeLists.txt
	src/servers/Server_Common/Network/PacketDef/Ipcs.h
	src/servers/Server_Zone/Actor/PlayerQuest.cpp
	src/servers/Server_Zone/Actor/PlayerSql.cpp
 2017-10-25 14:49:35 +02:00
Mordred Admin
ec72cf6836 Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 
Conflicts:
	CMakeLists.txt
	src/servers/Server_Common/Network/PacketDef/Ipcs.h
	src/servers/Server_Zone/Actor/PlayerQuest.cpp
	src/servers/Server_Zone/Actor/PlayerSql.cpp
 2017-10-25 14:49:35 +02:00
Mordred
e27b348971 Merge pull request #159 from ShelbyZ/unbork_rest 
Path comparison is causing issues
 2017-10-24 22:59:49 +02:00
Mordred
5c69e98c46 Merge pull request #159 from ShelbyZ/unbork_rest 
Path comparison is causing issues
 2017-10-24 22:59:49 +02:00
Maru
a837bd1db7 Merge 2017-10-24 16:01:04 -02:00
Maru
7b7038bac2 Merge 2017-10-24 16:01:04 -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
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
d5e24c97e5 Merge pull request #157 from ShelbyZ/static_cast_round_2 
More static_cast
 2017-10-24 07:52:43 +02:00
Mordred
64eac677a5 Merge pull request #157 from ShelbyZ/static_cast_round_2 
More static_cast
 2017-10-24 07:52:43 +02:00
Mordred
419df1ea88 new layout for charaquest table 2017-10-24 00:00:22 +02:00
Mordred
6bdcc79ede new layout for charaquest table 2017-10-24 00:00:22 +02:00
Mordred
73286e24ca fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
Mordred
3564964a8a fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
ShelbyZ
3ae890cc78 Fixing linkshellid to uint64_t 
updating methods, internal collection, and sql representation
 2017-10-23 08:33:47 -07:00
ShelbyZ
24f937fd61 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
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
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
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
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
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
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
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
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
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
09d565a854 Merge pull request #154 from ShelbyZ/compiler_flags 
Correctly applying /ZI for debug
 2017-10-22 20:08:01 +02: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
b17098414b Need to disable SAFESEH before /ZI 2017-10-22 10:43:33 -07:00
ShelbyZ
a162a7caea 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
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
c6c3bf4a25 Removing comment 2017-10-22 09:29:22 -07:00
ShelbyZ
e5c1dcc78c 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
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
531d5cf9be _blank creates an empty frame while opening the page in the default web browser 2017-10-22 21:46:55 +11: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
0b5d55abea add server commit history to login page 2017-10-22 21:39:54 +11:00
GokuWeedLord
0429cd9d1c 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
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
f303307fd0 Merge pull request #150 from ShelbyZ/unreferenced 
Remove unreferenced parameters
 2017-10-22 11:01:56 +02:00
Mordred
711243f302 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
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