1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 13:47:46 +00:00
Commit graph

626 commits

Author SHA1 Message Date
Robert Baker
9f7aefacc3 Add a more windows-friendly SQL import script. Always runs update.sql last. 2017-11-27 09:53:20 -08:00
Mordred
c65658e47b renamed type in actors to ObjKind as thats what it is called internally, also less ambugious to modelType which i also added an enum for 2017-11-26 01:12:26 +01:00
Mordred
86cb3ace56 Merge pull request #185 from ayyaruq/fix/faster-travis
Update Travis config for faster builds
2017-11-25 22:23:23 +01:00
Mordred
7ed3ee6f80 Merge pull request #184 from ayyaruq/bugfix/183-hardcoded-chaiscripts-path
Fix #183 hardcoded Chai scripts path
2017-11-25 22:22:23 +01:00
Mordred
162e0046a1 Merge pull request #179 from GokuWeedLord/fix/charupdatetime
fix UPDATE_DATE in charainfo not being updated
2017-11-25 22:21:46 +01:00
Ay'yaruq Dotharl
d309f60d69 Update Travis config for hopefully builds
Remove unnecessary dependencies and add a cache for the build files.
Additionally limit Git clone depth and use build matrices properly.
The CMake package dependency was removed since Travis comes with 3.2
and the installer only brings in 3.5, while the current minimum is 2.6.

Add support for mtime_cache, a small Ruby gem for hashing file mtime
and automatically updating unchanged files so that CMake knows which
cached build files are still valid since Git doesn't track mtime.
2017-11-26 03:41:27 +11:00
Ay'yaruq Dotharl
12a0c75cbd Fix #183 hardcoded Chai scripts path 2017-11-26 00:38:33 +11:00
Mordred
d10ce7504a Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' 2017-11-25 00:24:30 +01:00
GokuWeedLord
3cae806ac3 fix invalid sql 2017-11-23 01:30:35 +11:00
GokuWeedLord
b0219953ca add sql triggers to update UPDATE_DATE 2017-11-22 22:29:40 +11:00
GokuWeedLord
be43ad6233 Revert "fix UPDATE_DATE in charainfo not being updated"
This reverts commit 06e6e45a31.
2017-11-22 22:23:11 +11:00
GokuWeedLord
06e6e45a31 fix UPDATE_DATE in charainfo not being updated 2017-11-22 21:34:36 +11:00
Mordred
2619e34fe0 Merge pull request #177 from perize/SQL_REWRITE_OWN
Add a perform handler
2017-11-22 08:22:59 +01:00
Perize
01060e20c9 Fix typo 2017-11-22 10:13:49 +09:00
Mordred
9825ab9e9f Simplification of packet templates 2017-11-21 18:43:09 +01:00
Mordred
0cdb94f371 Updated submodule 2017-11-21 18:05:27 +01:00
Mordred
a13f3bcafe Merge pull request #176 from takhlaq/patch-1
updated readme discord link
2017-11-21 17:47:29 +01:00
Mordred
7aee3d416b Merge pull request #175 from GokuWeedLord/feature/mounts
fix mounting & mount persistance
2017-11-21 17:47:19 +01:00
Mordred
0a1cf371bf Merge pull request #174 from itsMaru/others
Reorganize math classes; Fix crash on spawning actor; Style;
2017-11-21 17:46:55 +01:00
Perize
70668727df Merge remote-tracking branch 'upstream/SQL_REWRITE_OWN' into SQL_REWRITE_OWN 2017-11-22 00:34:03 +09:00
Perize
9af1ac1b5e Add a perform handler 2017-11-22 00:29:42 +09:00
Tahir Akhlaq
d84279b26a updated readme discord link 2017-11-21 09:23:11 +00:00
Maru
1f03257806 Fix build 2017-11-21 06:08:23 -02:00
Maru
148f335068 Update libraries 2017-11-21 05:30:25 -02:00
GokuWeedLord
21cc47e510 fix mounting & mount persistance 2017-11-21 17:39:10 +11:00
Maru
8ee1dc9751 Reorganize math classes; Fix crash on spawning actor; Style; 2017-11-21 03:19:08 -02:00
Mordred
bd7c2e8b37 Sql Keepalive in server zone 2017-11-20 23:24:50 +01:00
Maru
600c49cc04 Merge branch 'master' of https://github.com/itsMaru/Sapphire 2017-11-20 18:03:25 -02:00
Maru
c7b74d04fa Lib 2017-11-20 18:03:12 -02:00
Mordred
ccf51b909e Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-11-19 22:43:36 +01:00
Mordred
bcb07e6b26 using instead of typedef where possible 2017-11-19 22:43:26 +01:00
Mordred
5223b06d32 Merge pull request #170 from GokuWeedLord/master
remove unused charadetail table, fix titlelist being incorrect size
2017-11-19 00:26:07 +01:00
Mordred
bf4ba68be4 Fixed beast tribe string index 2017-11-19 00:18:30 +01:00
Mordred
ff46c9e1b0 Merge pull request #172 from ayyaruq/fix/mysql-includes
Fix CMake MySQL module to be more nix-friendly
2017-11-19 00:17:01 +01:00
GokuWeedLord
7161de22ac Merge remote-tracking branch 'upstream/master' 2017-11-19 00:39:33 +11:00
Ay'yaruq Dotharl
626c784f5a Fix CMake MySQL module to be more nix-friendly 2017-11-18 22:50:00 +11:00
Mordred
5e0b7e1731 Merge pull request #171 from itsMaru/sql_fix
Fix generated enum build break; Remove Mono as dependency from README;
2017-11-18 08:27:41 +01:00
Maru
7fcb2180b5 Static cast class (consider ClassJob type for m_class); 2017-11-18 01:22:49 -02:00
Maru
2ce35039db Remove Mono dependency off README; 2017-11-18 00:59:01 -02:00
Maru
a7314f448b Close generated enum blocks; 2017-11-18 00:55:07 -02:00
Maru
7789ad382d Include int type alias for uint8_t; 2017-11-18 00:45:08 -02:00
GokuWeedLord
847c86665f lets try again... 2017-11-18 12:31:52 +11:00
GokuWeedLord
74d266e8d6 Merge remote-tracking branch 'upstream/master' 2017-11-18 12:31:12 +11:00
GokuWeedLord
b1822df6d3 Revert "remove unused charadetail table, fix titlelist being incorrect size in charainfo"
This reverts commit 5625272c08.
2017-11-18 12:31:02 +11:00
GokuWeedLord
5625272c08 remove unused charadetail table, fix titlelist being incorrect size in charainfo 2017-11-18 12:26:13 +11:00
Mordred
f043049d2b Started using pregenerated common emuns, fixed a mysql field length issue with titlelists 2017-11-18 01:25:55 +01:00
Mordred
f080a6f9f4 Updated sql files 2017-11-18 00:09:26 +01:00
Mordred
f67571eb46 Merge pull request #168 from takhlaq/SQL_REWRITE_OWN
fix server_zone headers appearing as external deps in visual studio
2017-11-17 23:40:45 +01:00
Tahir Akhlaq
83660598b1 fix server_zone headers appearing as external deps in visual studio 2017-11-17 18:12:35 +00:00
Mordred
692f5fbf2f Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 23:20:59 +01:00