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

2393 commits

This branch
This branch
All branches
Author SHA1 Message Date
mordred
64a2facb87 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-24 12:10:48 +01:00
mordred
1acacdbb3c Fixing code for consistency, const correctness, include tree and style. 2019-01-24 12:10:31 +01:00
NotAdam
625bcaebc7 fix pcb_reader compiler warnings 2019-01-24 19:04:37 +11:00
Adam
e6bac9d25e
Merge pull request #501 from goaaats/pathfinding 
Basic pathfinding
 2019-01-24 10:30:28 +11:00
goaaats
8da67dd2c5 Fix logging, Linux 2019-01-23 23:50:31 +01:00
Mordred
25cdda3827 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-23 22:38:11 +01:00
Mordred
2973b27e26 Despawn and respawn dead bnpcs 2019-01-23 22:37:55 +01:00
goaaats
25478e3a1c Spaces 2019-01-23 21:36:26 +01:00
goaaats
258eb1d1ab Style 2019-01-23 21:26:48 +01:00
goaaats
77d64697e9
Merge branch 'develop' into pathfinding 2019-01-23 23:09:02 +01:00
goaaats
116af3409e Uncomment logs 2019-01-23 21:14:17 +01:00
goaaats
1ac495192a Cleanup 2019-01-23 21:10:53 +01:00
Tahir Akhlaq
e540dbca47 more pcb_reader things 2019-01-23 18:47:41 +00:00
goaaats
9423a8576e Add NaviMgr 2019-01-23 19:23:49 +01:00
goaaats
7552c08ae3 Handle steps better 2019-01-23 17:42:09 +01:00
goaaats
09ce04b37e change movement in BNpc 2019-01-23 17:07:40 +01:00
Tahir Akhlaq
2f02b5c850 pcb_reader 
- added eobj parsing (doesnt seem to work?)
- readded ghetto commandline recastdemo export (windows only)
- fixed threadpool legit this time
 2019-01-22 19:43:12 +00:00
goaaats
65e9d57880 it works 2019-01-22 00:41:18 +01:00
goaaats
30f4040774 More pathfinding 2019-01-21 18:25:22 +01:00
Mordred
a953f18e0d
Merge pull request #499 from takhlaq/develop 
pcb_reader:
 2019-01-21 16:55:40 +01:00
Tahir Akhlaq
4bad458849 pcb_reader: 
- purge cache every 1000 files
- fixed issues with threadpool
- attempt at using recast api to generate navmesh (doesnt work)
 2019-01-21 15:23:38 +00:00
goaaats
1927b2b1a4 More pathing 2019-01-21 15:15:28 +01:00
goaaats
8c6c8bc787 More pathing 2019-01-21 14:02:47 +01:00
goaaats
78c0878610 path things 2019-01-21 02:42:47 +01:00
goaaats
d5c53d738d Merge branch 'develop' of github.com:SapphireServer/Sapphire into pathfinding 2019-01-21 02:11:00 +01:00
goaaats
916aa81441 Add path follow code from RecastDemo 2019-01-21 02:08:38 +01:00
Mordred
239a98848e Fixed bnpc movement 2019-01-20 23:49:43 +01:00
Mordred
2ad8672a2a
Merge pull request #487 from takhlaq/develop 
refactor pcb reader
 2019-01-20 22:50:43 +01:00
Tahir Akhlaq
3bbf8fe2aa hopefully builds on linux this time 2019-01-20 21:24:36 +00:00
Tahir Akhlaq
b5ecf60f7a clean up some includes in pcb_reader 
- fix deadlock
 2019-01-20 20:56:14 +00:00
Tahir Akhlaq
59725025e7 refactored pcb_reader 
- now uses a shitty threadpool which never terminates apparently
- todo: fix indices
 2019-01-20 17:47:39 +00:00
goaaats
a29039b164 pathing things? 2019-01-20 16:10:48 +01:00
Mordred
b17ce80ce6 BNpcs will now also initiate combat when being attacked, Death should reset them properly. 2019-01-20 13:36:34 +01:00
Tahir Akhlaq
a4a60ca057 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-20 09:56:50 +00:00
Mordred
61555edd44
Merge pull request #486 from NotAdam/develop 
fix dead bnpcs not dying, add recast
 2019-01-20 10:54:47 +01:00
Tahir Akhlaq
ba6ed64982 pcb_reader things because lets use two threads and keep one locked for no reason 2019-01-20 09:53:15 +00:00
NotAdam
b54ea61cc6 link and include recast in pcb_reader 2019-01-20 20:07:32 +11:00
NotAdam
c12a77ada3 update recast submodule and include in project 2019-01-20 19:26:36 +11:00
NotAdam
9a8a0a751f add recastnavigation submodule 2019-01-20 19:16:12 +11:00
NotAdam
53061e455e fix dead mobs following you around and beating you to death 2019-01-20 19:14:35 +11:00
Mordred
c181e6de23
Merge pull request #484 from itsMaru/develop 
RNGManager PoC
 2019-01-20 00:39:50 +01:00
Mordred
c4d7160bff Fixed mobs not being killable and spawning will use the correct state 2019-01-20 00:20:35 +01:00
Maru
81c190a9dd Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 21:20:31 -02:00
Maru
544538012d RNGManager PoC, fix overuse of static cast 2019-01-19 21:20:23 -02:00
Mordred
9eb208a8b2 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 22:56:21 +01:00
Mordred
d053e39ccb Hate list is now displayed for players 2019-01-19 22:56:07 +01:00
Mordred
f08442d4ad
Merge pull request #483 from itsMaru/develop 
fix high cpu usage
 2019-01-19 20:59:02 +01:00
Maru
7c369a569f fix server [extrem hoch] cpu usage 2019-01-19 17:52:58 -02:00
Maru
061fa6fe21 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-19 17:44:20 -02:00
Mordred
1f7fc49eb8
Merge pull request #482 from NotAdam/develop 
fix bnpcs not despawning
 2019-01-19 20:33:58 +01:00