Commit Graph

3540 Commits

Author SHA1 Message Date
VegaZ
48535a1fd5 Modify meta.xml 2018-09-22 23:29:34 +02:00
VegaZ
c08a998d97 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
cecece0ea2 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
VegaZ
425bb9ec27 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
hydrant
4d733b48c1 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
hydrant
e6669373ba 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
hydrant
0034f29b18 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
hydrant
e67b571aa0 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
hydrant
bac110258d 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
hydrant
e36116aae4 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
hydrant
65761df653 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
hydrant
d06fd928ac 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
VegaZ
0b5680ac1a 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
hydrant
4ac5480685 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
93205b4999 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
961cacf6a9 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
8a5daf483f 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
7452fc4993 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
db9fd60384 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
VegaZ
6843462525 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
hydrant
f4f4b897f0 Cleaned up code (removed unnneccessary lines / words) 2018-09-19 20:14:49 +02:00
Lennart Kampshoff
989fa856c2 Fixed Spawn class namespace 2018-09-19 20:03:44 +02:00
hydrant
969537c655 Fixed Spawn class namespace 2018-09-19 20:03:44 +02:00
Lennart Kampshoff
4a790518e2 Emptied Server/Managers/.gitkeep 2018-09-19 19:59:11 +02:00
hydrant
a75ba4cc39 Emptied Server/Managers/.gitkeep 2018-09-19 19:59:11 +02:00
VegaZ
9ec0a30988 Add unfinished Login-System 2018-09-19 19:53:31 +02:00
VegaZ
cfcaf98139 Add unfinished Login-System 2018-09-19 19:53:31 +02:00
a775a9e7bb Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-09-19 17:13:21 +02:00
15932a4b31 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-09-19 17:13:21 +02:00
VegaZ
baf2e4c50d Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-09-19 15:57:40 +02:00
VegaZ
b5d1fb50b0 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-09-19 15:57:40 +02:00