Commit Graph

230 Commits

Author SHA1 Message Date
VegaZ
5e0e0d82f2 Fix target -> player 2018-09-24 20:38:46 +02:00
VegaZ
94ad44537e Merge branch 'develop' into feature/user-backend 2018-09-24 18:41:11 +02:00
xSprite
71e08b5a03 fix radius Commands 2018-09-24 15:06:44 +02:00
xSprite
d11affc30a Fix setskin, aw 2018-09-24 14:57:10 +02:00
xSprite
e3bd609d71 Add some Admin Commands 2018-09-24 14:52:32 +02:00
20b8c4fbfb added commands: a, team, setweather 2018-09-24 05:13:22 +02:00
VegaZ
3c527b5f7a Fix DbContext 2018-09-23 23:13:05 +02:00
Lennart Kampshoff
f162f2323c Continued CEF browser for rank managment 2018-09-23 23:11:22 +02:00
Lennart Kampshoff
d9789b7525 Add faction rank management CEF 2018-09-23 22:30:42 +02:00
Lennart Kampshoff
33ec0887e7 Merged 'develop' into feature 2018-09-23 21:13:00 +02:00
Lennart Kampshoff
73bb9b6fda Add Faction Ranks 2018-09-23 21:10:42 +02:00
VegaZ
a74d080d02 Add UserBankAccount 2018-09-23 21:01:59 +02:00
VegaZ
f231c7214b Initial Commit for user-backend, preparing several systems 2018-09-23 20:24:45 +02:00
Lennart Kampshoff
f91ef8960c Fixed EF error, edit commands, fix faction broadcast 2018-09-23 15:59:40 +02:00
VegaZ
5ed81d4d1e Made small changes for Admin Commands 2018-09-23 15:29:11 +02:00
Lennart Kampshoff
22df6c6a2e Add some Faction commands, Try EF error fix 2018-09-23 13:34:02 +02:00
VegaZ
e455c9efef Merge conflict 2018-09-23 12:17:57 +02:00
VegaZ
1d500a0169 Add Login Security 2018-09-23 12:16:40 +02:00
VegaZ
7e843cca60 Update save.html 2018-09-23 03:27:06 +02:00
VegaZ
38ac64b61e Update login.html 2018-09-23 03:26:39 +02:00
VegaZ
bda09079cd Merge branch 'feature/gui-infobox' into 'develop'
Add LoG-Classics Infobox

See merge request log-gtav/reallife-gamemode!2
2018-09-23 03:21:56 +02:00
VegaZ
2c608abac1 Add LoG-Classics Infobox 2018-09-23 03:20:36 +02:00
Lennart Kampshoff
c35b81629f Add OnResourceStop Event Test 2018-09-23 01:33:33 +02:00
VegaZ
d0e8a8c21f Fix paths 2018-09-22 23:47:41 +02:00
VegaZ
1e1d3350df Fix one wrong path 2018-09-22 23:46:25 +02:00
VegaZ
b2d3986ed2 ... and again, added File-paths 2018-09-22 23:45:21 +02:00
VegaZ
65cadb0f40 Again... 2018-09-22 23:40:11 +02:00
VegaZ
865d5465c1 Fix meta.xml again, optimized LoadManager 2018-09-22 23:38:19 +02:00
Lennart Kampshoff
e40c78a27f Add debug for Faction 2018-09-22 23:34:55 +02:00
VegaZ
4d4fcc8a43 Fix meta.xml 2018-09-22 23:32:17 +02:00
VegaZ
48535a1fd5 Modify meta.xml 2018-09-22 23:29:34 +02:00
VegaZ
aacc696d02 Merge branch 'feature/save-system' into 'develop'
Feature/save system

See merge request log-gtav/reallife-gamemode!1
2018-09-22 23:14:44 +02:00
VegaZ
a51e71a902 Feature/save system 2018-09-22 23:14:44 +02:00
Lennart Kampshoff
eb4b008b6c Merge branch 'develop' into feature/faction-system 2018-09-22 17:29:20 +02:00
Lennart Kampshoff
4b5ce6f7a5 Add debug for Faction problem 2018-09-22 16:58:40 +02:00
Lennart Kampshoff
40471792d1 Continued faction system 2018-09-22 16:48:03 +02:00
Lennart Kampshoff
61e21361b8 Fixed hud display 2018-09-22 15:58:48 +02:00
Lennart Kampshoff
7255f2850f Begin faction system 2018-09-22 00:55:38 +02:00
Lennart Kampshoff
3d7ab55b28 Added one load and one save to db, so that the EF doesnt need to initialize on first load / save 2018-09-22 00:27:14 +02:00
Lennart Kampshoff
12a5ba79ad Add camera position on login 2018-09-22 00:14:38 +02:00
Lennart Kampshoff
24a8c975cf Moved error display from chat to cef, cleaned up css code 2018-09-21 23:14:43 +02:00
VegaZ
ecb227be5c Split Login / Register in seperate files 2018-09-21 16:13:13 +02:00
Lennart Kampshoff
978d9ef295 Removed unneccessary lines 2018-09-20 21:08:47 +02:00
VegaZ
b9b499cce8 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-09-20 20:24:20 +02:00
VegaZ
308c154c3b Merge branch 'feature/login-register-system' into develop 2018-09-20 20:20:54 +02:00
VegaZ
08adf8d752 Finish login-register-system 2018-09-20 20:20:44 +02:00
VegaZ
5bd2fa0522 Almost finish login-register-system 2018-09-20 18:54:30 +02:00
VegaZ
21d597ae5e Modify Login/Register-System (almost working) 2018-09-20 18:35:50 +02:00
VegaZ
3da8e4ec3a Modify Login-Register-System 2018-09-19 21:20:45 +02:00
Lennart Kampshoff
c9b786cf03 Cleaned up code (removed unnneccessary lines / words) 2018-09-19 20:14:49 +02:00