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

2974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
a8101844d5 Merge pull request #487 from takhlaq/develop 
refactor pcb reader
 2019-01-20 22:50:43 +01:00
Tahir Akhlaq
00c7558b1b hopefully builds on linux this time 2019-01-20 21:24:36 +00:00
Tahir Akhlaq
3348cc9c47 clean up some includes in pcb_reader 
- fix deadlock
 2019-01-20 20:56:14 +00:00
Tahir Akhlaq
fb99dfc915 refactored pcb_reader 
- now uses a shitty threadpool which never terminates apparently
- todo: fix indices
 2019-01-20 17:47:39 +00:00
goaaats
b200204ee3 pathing things? 2019-01-20 16:10:48 +01:00
Mordred
46205e9db4 BNpcs will now also initiate combat when being attacked, Death should reset them properly. 2019-01-20 13:36:34 +01:00
Tahir Akhlaq
9aff14b92e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-20 09:56:50 +00:00
Mordred
1d1348e62c Merge pull request #486 from NotAdam/develop 
fix dead bnpcs not dying, add recast
 2019-01-20 10:54:47 +01:00
Tahir Akhlaq
249ed527f3 pcb_reader things because lets use two threads and keep one locked for no reason 2019-01-20 09:53:15 +00:00
NotAdam
06408d5496 link and include recast in pcb_reader 2019-01-20 20:07:32 +11:00
NotAdam
96ee406a5d update recast submodule and include in project 2019-01-20 19:26:36 +11:00
NotAdam
510d2296b8 add recastnavigation submodule 2019-01-20 19:16:12 +11:00
NotAdam
ed63c819bd fix dead mobs following you around and beating you to death 2019-01-20 19:14:35 +11:00
Mordred
2909775875 Merge pull request #484 from itsMaru/develop 
RNGManager PoC
 2019-01-20 00:39:50 +01:00
Mordred
092825c42c Fixed mobs not being killable and spawning will use the correct state 2019-01-20 00:20:35 +01:00
Maru
315a2fdf7a Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 21:20:31 -02:00
Maru
98f2720fa2 RNGManager PoC, fix overuse of static cast 2019-01-19 21:20:23 -02:00
Mordred
6b6c400558 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 22:56:21 +01:00
Mordred
f18dae441b Hate list is now displayed for players 2019-01-19 22:56:07 +01:00
Mordred
0a72529448 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
ab66162291 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
2a7727ec51 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
603604b28d 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
80e25ac2c2 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
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
NotAdam
2743f4483e 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
1c2da46428 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
30c329ee1f 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
Mordred
a230a2ca2a 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
NotAdam
0e138e5e5f 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
63ce4c42be 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
f468949df2 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
Mordred
51242ce5dc Fixed remaining g_log appearances and fmt usage 2019-01-13 13:19:15 +01:00
JeidoUran
a0ddf66e76 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-13 02:41:42 +01:00
Mordred
06e214956c Mobs spawn with randomized rotation and are actually targetable now 2019-01-13 00:51:31 +01:00
Mordred
b0760043c3 Fixed tell, fixed examine, fixed equipping gear, fixed itemlevel 2019-01-12 22:53:16 +01:00
JeidoUran
32681553a9 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-12 14:34:18 +01:00
Mordred
f805eb3485 SightseeingMask fixed in initui 2019-01-12 11:22:30 +01:00