OpenFusion

OpenPunk/OpenFusion

Fork 0

mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 05:20:05 +00:00

Commit Graph

Select branches

Hide Pull Requests

landlock

lua

lua-more-better

master

patchmap

refactor

win32-x86

#10

#100

#101

#102

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#12

#120

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#135

#137

#138

#139

#14

#140

#141

#142

#143

#144

#15

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#166

#17

#170

#171

#172

#174

#177

#18

#180

#181

#182

#183

#184

#185

#187

#188

#189

#19

#191

#192

#2

#20

#201

#204

#207

#21

#213

#218

#22

#222

#224

#227

#23

#24

#243

#244

#245

#25

#256

#257

#259

#26

#266

#267

#268

#27

#271

#272

#274

#275

#277

#28

#280

#281

#282

#283

#284

#285

#289

#29

#293

#294

#295

#298

#3

#30

#31

#32

#33

#34

#35

#37

#39

#4

#40

#41

#42

#43

#45

#46

#47

#48

#5

#50

#51

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#77

#78

#8

#80

#81

#82

#84

#86

#87

#88

#91

#92

#93

#94

#95

#97

#98

1.0

1.1

1.2

1.2.1

1.3

1.4

1.5

1.5.1

1.5.2

1.6

60be814e16

Merge pull request #42 from dongresource/bugfix CPunch 2020-08-25 17:42:22 -0500
16c11dada0 Fixed a use-after-free and a memory leak. dongresource 2020-08-26 00:09:31 +0200
8ea49c4759 Update ItemManager.cpp JadeShrineMaiden 2020-08-25 20:32:16 +0100
e829d71bb8 Update ItemManager.cpp JadeShrineMaiden 2020-08-25 20:29:46 +0100
260331715f

Merge pull request #40 from dongresource/bugfix CPunch 2020-08-25 13:52:51 -0500
ce7ff49943 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion into master FinnHornhoover 2020-08-25 21:48:09 +0300
b187d4b65f

Merge pull request #37 from dongresource/work1 CPunch 2020-08-25 13:45:59 -0500
3b3ddf08ef Fix github issue #38 dongresource 2020-08-25 20:42:52 +0200
41898bb6b7 Fix a bug where nanos aren't unsummoned when unequipped. dongresource 2020-08-25 20:30:20 +0200
23ebcc8828 Fixed binds in queries kamilprzyb 2020-08-25 20:16:03 +0200
fafe953cdb Merge remote-tracking branch 'upstream/master' JadeShrineMaiden 2020-08-25 19:07:10 +0100
10e6e03125 Taros and Trading JadeShrineMaiden 2020-08-25 18:55:19 +0100
dff710cf61 Enable vehicle spawning. dongresource 2020-08-25 19:43:46 +0200
838a98356b Merge branch 'master' of https://github.com/kamilprzyb/OpenFusion kamilprzyb 2020-08-25 19:43:16 +0200
ec42f01c17 Replaced login error enum with enum class kamilprzyb 2020-08-25 19:42:01 +0200
09b7bd947f Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion into master FinnHornhoover 2020-08-25 20:28:05 +0300
271cd8c9a2

Merge pull request #1 from darkredtitan/master kamilprzyb 2020-08-25 17:34:06 +0200
9c569d53f4

Delete data.db darkredtitan 2020-08-25 17:32:29 +0200
31b1b3b1c0 make player name checking case insensitive darkredtitan 2020-08-25 17:22:27 +0200
bebc538464 added missing break; (for Titan) kamilprzyb 2020-08-25 15:48:41 +0200
edc62dc26e LoginServer checks if name isn't occupied. Names are now unique kamilprzyb 2020-08-25 13:38:09 +0200
37c7311850 Implemented database to work with the login server kamilprzyb 2020-08-25 10:44:17 +0200
f0959fbdd5 Merge remote-tracking branch 'upstream/master' Onii-chan 2020-08-25 06:18:47 +0200
b79bc56b31 Implement NPC spawning. dongresource 2020-08-25 04:28:42 +0200
9aa9b76826 Made the random characters level 36. dongresource 2020-08-25 04:17:47 +0200
113ce0af07 Load the NPC and warp JSON files according to the config file. dongresource 2020-08-25 03:45:04 +0200
6f1a72ca0f Shut Computress up. dongresource 2020-08-25 03:42:52 +0200
d964a83d6d Respawn points work now. dongresource 2020-08-25 03:34:53 +0200
d025b611a1

Merge pull request #35 from dongresource/work1 CPunch 2020-08-24 19:05:24 -0500
2f1358c124 Potential solution for the tutorial problem. dongresource 2020-08-25 01:57:53 +0200
c1b6ae8466 No need to unpack zero-length packet structs. dongresource 2020-08-25 01:08:02 +0200
14bc368073 Dynamically allocate the Player struct in PlayerView. dongresource 2020-08-25 00:02:07 +0200
44f3c6d53a Added MissionManager into the vcxproj Joseph Lee 2020-08-24 18:34:39 -0400
d1e32958ad Merge remote-tracking branch 'upstream/master' Joseph Lee 2020-08-24 18:28:28 -0400
e7fa6b327b Updated Branch Joseph Lee 2020-08-24 18:20:29 -0400
89ba698404 Merge remote-tracking branch 'upstream/master' Joseph Lee 2020-08-24 18:16:55 -0400
c5dacb4958 Removed CRs from .gitignore and an outdated comment in config.ini. dongresource 2020-08-24 19:34:12 +0200
fb993f0c5d Added .vimrc configured for the 4 spaces style. dongresource 2020-08-24 19:28:47 +0200
6d3868349d removed debug output in keepAliveTimer CPunch 2020-08-24 16:12:49 -0500
16bca39dae added simple timer system to CNShardServer CPunch 2020-08-24 16:11:40 -0500
afbf309c7e

Add player revive, vehicle mount/dismount and more (#33) Onii-chan 2020-08-24 23:04:56 +0200
8e70751c40 Updated to commit ff5f396 Joseph Lee 2020-08-24 15:32:37 -0400
394ad16497 Fixed improper enums Onii-chan 2020-08-24 21:02:51 +0200
8970344628 Merge remote-tracking branch 'upstream/master' into Test Onii-chan 2020-08-24 20:39:35 +0200
28ad1a0c25 fix windows support for sockets CPunch 2020-08-24 13:23:28 -0500
07ac441237 Fix Windows networking Raymonf 2020-08-24 14:03:20 -0400
584056544f Merge branch 'master' into Test Onii-chan 2020-08-24 19:09:44 +0200
b1b08d7007 Added iPCState into Player Onii-chan 2020-08-24 19:08:46 +0200
88c51d7168 Updated to Commit ff5f396 Joseph Lee 2020-08-24 11:58:17 -0400
0d597a1b80 Update main.cpp Onii-chan 2020-08-24 17:41:33 +0200
6ef74565fb Fixed indentation Onii-chan 2020-08-24 17:39:38 +0200
d595a6c884

Update README.md Onii-chan 2020-08-24 17:36:27 +0200
ce991a421e Update NanoManager.cpp Onii-chan 2020-08-24 17:33:54 +0200
ec42a5ca1b Update PlayerManager.cpp Onii-chan 2020-08-24 14:51:31 +0200
72140e62f4 Merge branch 'Test' Onii-chan 2020-08-24 14:47:47 +0200
ebe0699e00 add respawn comment Onii-chan 2020-08-24 14:47:13 +0200
54130e0711 Merge remote-tracking branch 'upstream/master' into Test Onii-chan 2020-08-24 14:36:17 +0200
ff5f3966e3

Sanity checks + Starting level changes (#31) JadeShrineMaiden 2020-08-24 09:07:51 +0100
bd4b04649f Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion into master FinnHornhoover 2020-08-24 02:35:28 +0300
270219a633 Sanity Check JadeShrineMaiden 2020-08-23 23:35:21 +0100
ef19523742 Initial Trade Implementation JadeShrineMaiden 2020-08-23 23:32:45 +0100
55add82843

Merge pull request #32 from dongresource/work CPunch 2020-08-23 16:57:58 -0500
4795ad32fa Merge remote-tracking branch 'upstream/master' into Test Onii-chan 2020-08-23 23:48:32 +0200
e99feb03d5 Add verbosity levels. dongresource 2020-08-23 23:09:31 +0200
431448ffb7 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion CPunch 2020-08-23 15:10:00 -0500
8105d0aa88 properly handle socket errors in recieving packets CPunch 2020-08-23 15:09:51 -0500
5215770048 Merge remote-tracking branch 'upstream/master' into Test Onii-chan 2020-08-23 20:57:17 +0200
97b6e79025 Merge remote-tracking branch 'upstream/master' JadeShrineMaiden 2020-08-23 19:20:00 +0100
5a42326f8c Sanity checks + Starting level changes JadeShrineMaiden 2020-08-23 19:19:17 +0100
acf358ef51

Merge pull request #30 from CakeLancelot/clion-gitignore CPunch 2020-08-23 13:03:10 -0500
0a8e96ebc4 Update .gitignore for Clion CakeLancelot 2020-08-23 12:58:08 -0500
756074cc62 Remove redundant initialization in nanoSummonHandler(). dongresource 2020-08-23 19:46:51 +0200
51a8cc8bdf Silence -Wall warnings. dongresource 2020-08-23 19:19:12 +0200
5749f43174 Merge remote-tracking branch 'upstream/master' into Test Onii-chan 2020-08-23 19:15:38 +0200
651ccba932 Replace ifdef guards with #pragma once dongresource 2020-08-23 19:14:54 +0200
6cad7035a5 Merge remote-tracking branch 'upstream/master' Onii-chan 2020-08-23 19:13:40 +0200
0ad96d5093 Merge branch 'Test' of https://github.com/Eperty123/OpenFusion into Test Onii-chan 2020-08-23 19:13:18 +0200
be0f8c283f Implemented mission Onii-chan 2020-08-23 19:13:15 +0200
1281fdaaf0 Add -Wall to Makefile. dongresource 2020-08-23 18:30:23 +0200
561a809f33 load warps into memory in NPCManager::init CPunch 2020-08-23 11:26:25 -0500
0d27412d81 added getNearbyPlayers CPunch 2020-08-23 10:42:37 -0500
1d792a21dd

Npc Warp implementation (#29) Zenpock 2020-08-23 10:32:25 -0500
3a6cf86541

Update README.md Onii-chan 2020-08-23 17:06:46 +0200
043f0c1f6a

Update README.md Onii-chan 2020-08-23 17:01:46 +0200
525d0c0052 Renaming & vehicle mount/dismount Onii-chan 2020-08-23 16:59:04 +0200
6aed006838

Update NPCManager.cpp Zenpock 2020-08-23 08:57:06 -0500
afd9d049d3

Update NPCManager.cpp Zenpock 2020-08-23 08:39:18 -0500
65398307c4 Test: Add enter vehicle Onii-chan 2020-08-23 14:26:07 +0200
213a8385ec Merge branch 'master' into Test Onii-chan 2020-08-23 14:20:54 +0200
214741a180 Update PlayerManager.cpp Onii-chan 2020-08-23 13:40:39 +0200
184d0a1c28 Merge branch 'master' into Test Onii-chan 2020-08-23 13:25:27 +0200
9a1f08a405 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion into master FinnHornhoover 2020-08-23 14:13:23 +0300
cfcf908787 Test: group invite Onii-chan 2020-08-23 12:18:51 +0200
ba1890ff55 Added player revive Onii-chan 2020-08-23 09:25:42 +0200
648bad443b Cleaned up NanoManager Onii-chan 2020-08-23 09:04:38 +0200
e101f790d9 Merge remote-tracking branch 'upstream/master' Onii-chan 2020-08-23 08:45:15 +0200
c88bbbdcfd

Update ChatManager.cpp CPunch 2020-08-22 23:02:19 -0500
377c8ab512

Update ChatManager.cpp CPunch 2020-08-22 22:59:44 -0500
080af35bb2

Merge branch 'master' into master CPunch 2020-08-22 22:54:31 -0500
98e61cdbc7

Update NPCManager.cpp Zenpock 2020-08-22 22:45:24 -0500