Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix clearring & deletes autofac & npgsql for the moment #32

Merged
merged 33 commits into from
May 3, 2020
Merged

fix clearring & deletes autofac & npgsql for the moment #32

merged 33 commits into from
May 3, 2020

Conversation

bernatvadell
Copy link
Contributor

No description provided.

@intribvadell
[feature] wings shape & emblem shape
2fb8313
@intribvadell
[feature] Rebirth column
bba548c
@intribvadell
fix load MonMagicEx26
602480e
@intribvadell
Merge branch 'wings' into rebirth_ranking
fa03152
@intribvadell
fix slots wings in inspect dialog
e23ec3f
@intribvadell
Merge branch 'wings' into rebirth_ranking
1f2db23
@intribvadell
inspectdialog fix wings icon
9d46c92
@intribvadell
Merge branch 'wings'
c3e5c37 
# Conflicts:
#	Client/Scenes/Views/InspectDialog.cs
@intribvadell
Merge branch 'rebirth_ranking'
c811ab6
@intribvadell
Upgrade target framework for all projects to 4.6.1
beee50a
@intribvadell
Sentry integration on client
b71d6aa
@intribvadell
Capture exceptions
7a162d9
@intribvadell
[feature] new command rebirth for admin
8933608
@intribvadell
fix equip wings on press right click over item
6d9ed84
@intribvadell
register autofac
3116700
@intribvadell
convert server and library in net core
5eaa6da
@intribvadell
Merge branch 'suprcode_master'
a727f08 
# Conflicts:
#	Client/Program.cs
#	Server/App.config
#	Server/Properties/Settings.Designer.cs
@intribvadell
fix clearring invisibility for monsters
5574800
@intribvadell
add system messages for married teleport
e21ce36
@intribvadell
csproj
a895166
@intribvadell
csproj
d28dde6 
(cherry picked from commit a895166)
@intribvadell
initialize session
8b4605a
@intribvadell
session initialize client
4cab644
@intribvadell
initialize session
dcc4948 
(cherry picked from commit 8b4605a)
@intribvadell
session initialize client
f742fe1 
(cherry picked from commit 4cab644)
@intribvadell
show criticals errors on log message when start server
20499b6
@intribvadell
restore load system
4bc58cf
@intribvadell
Merge branch 'bugfix/marriage-teleport'
eed318a
@intribvadell
clean wrong commit repository, i've other branch with this...
9047eb5
@intribvadell
[client] fix load session
a20e835
@intribvadell
[server] fix load users db
9bcdde1
@intribvadell
[server] fixed clearring effect
6b6f7bb
@intribvadell
Merge branch 'suprcode_master'
5acbaf2 
# Conflicts:
#	LibraryCore/MirDB/DBCollection.cs
#	LibraryCore/MirDB/DBMapping.cs
#	LibraryCore/MirDB/Session.cs
#	Server/Program.cs
#	Server/SMain.cs
#	ServerLibrary/Envir/Config.cs
#	ServerLibrary/Envir/SEnvir.cs
@Suprcode Suprcode merged commit 782e6c8 into Suprcode:master May 3, 2020
@bernatvadell bernatvadell mentioned this pull request May 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bernatvadell @Suprcode @intribvadell