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

6451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
f08442d4ad
Merge pull request #483 from itsMaru/develop 
fix high cpu usage
 2019-01-19 20:59:02 +01:00
Maru
2e5a9d3567 fix server [extrem hoch] cpu usage 2019-01-19 17:52:58 -02:00
Maru
7c369a569f fix server [extrem hoch] cpu usage 2019-01-19 17:52:58 -02:00
Maru
ab66162291 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 17:44:20 -02:00
Maru
061fa6fe21 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 17:44:20 -02:00
Mordred
a3652d4dbe Merge pull request #482 from NotAdam/develop 
fix bnpcs not despawning
 2019-01-19 20:33:58 +01:00
Mordred
1f7fc49eb8
Merge pull request #482 from NotAdam/develop 
fix bnpcs not despawning
 2019-01-19 20:33:58 +01:00
Mordred
2a7727ec51 Fixed initial actorids for zones 2019-01-19 10:37:18 +01:00
Mordred
99012106c4 Fixed initial actorids for zones 2019-01-19 10:37:18 +01:00
NotAdam
9712f94d00 cleanup spawn slot handling for bnpcs 2019-01-19 19:28:12 +11:00
NotAdam
4df44a88c8 cleanup spawn slot handling for bnpcs 2019-01-19 19:28:12 +11:00
NotAdam
603604b28d fix bnpcs not despawning, stop passive mobs from aggroing the player 2019-01-19 17:50:33 +11:00
NotAdam
cac23f2fd5 fix bnpcs not despawning, stop passive mobs from aggroing the player 2019-01-19 17:50:33 +11:00
Mordred
4db227c5db Merge pull request #481 from takhlaq/develop 
navmesh generation in pcb_reader
 2019-01-19 01:18:35 +01:00
Mordred
362a7d3e17
Merge pull request #481 from takhlaq/develop 
navmesh generation in pcb_reader
 2019-01-19 01:18:35 +01:00
Mordred
80e25ac2c2 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 01:15:23 +01:00
Mordred
1a6e844783 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 01:15:23 +01:00
Mordred
83a8fc4456 Cleaned up bnppc code, fixed effect packet 2019-01-19 01:15:17 +01:00
Mordred
38acccea57 Cleaned up bnppc code, fixed effect packet 2019-01-19 01:15:17 +01:00
Tahir Akhlaq
bb5224bcd6 navmesh generation in pcb_reader 
- requires RecastDemo built from https://github.com/takhlaq/recastnavigation/tree/garbage
- copy recastdemo.exe, sdl.dll, sdl2.dll into same directory as pcb_reader exe
 2019-01-18 18:32:48 +00:00
Tahir Akhlaq
7659c1be1b navmesh generation in pcb_reader 
- requires RecastDemo built from https://github.com/takhlaq/recastnavigation/tree/garbage
- copy recastdemo.exe, sdl.dll, sdl2.dll into same directory as pcb_reader exe
 2019-01-18 18:32:48 +00:00
NotAdam
2743f4483e remove utf8 bom from inserts.sql 2019-01-18 20:05:45 +11:00
NotAdam
0685b7c84f remove utf8 bom from inserts.sql 2019-01-18 20:05:45 +11:00
Mordred
79daa7ac56 Make sure to reinit DB -> Various small fixes and refactors 2019-01-17 23:54:47 +01:00
Mordred
77c4403a2c Make sure to reinit DB -> Various small fixes and refactors 2019-01-17 23:54:47 +01:00
Mordred
1c2da46428 Merge pull request #480 from NotAdam/develop 
fix dismount, fix some debug msg formatting
 2019-01-15 12:13:42 +01:00
Mordred
dd0610bdcc
Merge pull request #480 from NotAdam/develop 
fix dismount, fix some debug msg formatting
 2019-01-15 12:13:42 +01:00
NotAdam
3793b16b36 potentially fix shifted dutyrecorder actorcontrols 2019-01-15 20:10:35 +11:00
NotAdam
4ed379d4aa potentially fix shifted dutyrecorder actorcontrols 2019-01-15 20:10:35 +11:00
NotAdam
30c329ee1f fix dismount actrl 2019-01-15 19:13:36 +11:00
NotAdam
82bcea0419 fix dismount actrl 2019-01-15 19:13:36 +11:00
NotAdam
efab738660 fix some event debug message formatting 2019-01-15 18:20:21 +11:00
NotAdam
6196d0a526 fix some event debug message formatting 2019-01-15 18:20:21 +11:00
Mordred
a230a2ca2a Cleaned up some zoning code. Secondly, alot more bnpcs will spawn now 2019-01-14 22:29:52 +01:00
Mordred
328b8bf14d Cleaned up some zoning code. Secondly, alot more bnpcs will spawn now 2019-01-14 22:29:52 +01:00
Mordred
8bc9b8d4a4 Merge pull request #479 from NotAdam/develop 
more housing fixes
 2019-01-14 14:01:06 +01:00
Mordred
d5d6584e2a
Merge pull request #479 from NotAdam/develop 
more housing fixes
 2019-01-14 14:01:06 +01:00
NotAdam
0e138e5e5f Move housingmgr to u8s for inv slots instead of u16s 2019-01-14 21:37:32 +11:00
NotAdam
f81746654c Move housingmgr to u8s for inv slots instead of u16s 2019-01-14 21:37:32 +11:00
NotAdam
339f74b62f fix doxygen missing documentation after project restructure 2019-01-14 21:32:18 +11:00
NotAdam
fca98c3cd2 fix doxygen missing documentation after project restructure 2019-01-14 21:32:18 +11:00
NotAdam
63ce4c42be fix placing interior housing items 2019-01-14 20:05:27 +11:00
NotAdam
289b01dbda fix placing interior housing items 2019-01-14 20:05:27 +11:00
Mordred
b41ac00875 Merge remote-tracking branch 'origin/develop' 2019-01-13 17:45:32 +01:00
Mordred
c63c58353a Merge remote-tracking branch 'origin/develop' 2019-01-13 17:45:32 +01:00
Mordred
f468949df2 Temporary fix for resetting directors. Eventually zoning needs to be streamlined 2019-01-13 17:32:43 +01:00
Mordred
b5ceae58fb Temporary fix for resetting directors. Eventually zoning needs to be streamlined 2019-01-13 17:32:43 +01:00
JeidoUran
8f1a7dd368 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 16:04:26 +01:00
JeidoUran
4ac7340554 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 16:04:26 +01:00
Mordred
51242ce5dc Fixed remaining g_log appearances and fmt usage 2019-01-13 13:19:15 +01:00