1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 01:07:47 +00:00
Commit graph

6210 commits

Author SHA1 Message Date
Mordred
7d00d5cb40 Merge pull request #186 from reiichi001/master
Add a more windows-friendly SQL import script
2017-11-27 19:51:50 +01:00
Mordred
ce9b8579a1
Merge pull request #186 from reiichi001/master
Add a more windows-friendly SQL import script
2017-11-27 19:51:50 +01:00
Robert Baker
9f7aefacc3 Add a more windows-friendly SQL import script. Always runs update.sql last. 2017-11-27 09:53:20 -08:00
Robert Baker
7352a24a07 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
4c71428dc2 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
329e27a6e9
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
a12d293b92
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
Mordred
0bc24c0070
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
0cfe37703c
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
Ay'yaruq Dotharl
9e900520a6
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
Mordred
e4ffaedf1f Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' 2017-11-25 00:24:30 +01:00
Maru
b0fef08c45 Use generated ItemUICategory; Check if field for item is valid; 2017-11-24 18:13:42 -02:00
Maru
7a2f83afb2 Use generated ItemUICategory; Check if field for item is valid; 2017-11-24 18:13:42 -02:00
Maru
e7f3df940d Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' 2017-11-24 17:11:02 -02:00
Maru
add49a250b Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' 2017-11-24 17:11:02 -02:00
GokuWeedLord
3cae806ac3 fix invalid sql 2017-11-23 01:30:35 +11:00
GokuWeedLord
6f28586a72 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
f12f48eff1 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
492b584091 Revert "fix UPDATE_DATE in charainfo not being updated"
This reverts commit 564256385c.
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
GokuWeedLord
564256385c 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
Mordred
c418b5e528
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
Perize
8bac927099 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
cfc8373f5d 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
e034b46167 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
7b8ce3777b
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
526be370d3
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
Mordred
4224f78242
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
6574369e58 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
Perize
f72a61d934 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
Tahir Akhlaq
4a5b47d26b
updated readme discord link 2017-11-21 09:23:11 +00:00