Commit Graph

1627 Commits

Author SHA1 Message Date
_AG
6f0fb7cd36 Fixed health icon. 2019-06-17 21:06:41 +02:00
_AG
aac6085262
Merge pull request #1 from GTAmodding/master 2019-06-17 21:05:59 +02:00
aap
900f3d9783
Merge pull request #23 from Fire-Head/master
CdSteam, RwFreeAlign/RwMallocAlign
2019-06-17 15:39:57 +02:00
Fire-Head
617eb6951a CdStream RwFreeAlign/RwMallocAlign 2019-06-17 16:32:38 +03:00
eray orçunus
e45689373d CPed::Avoid and needed changes
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-17 15:20:15 +03:00
Fire_Head
0bb8bf9d15
Merge pull request #8 from GTAmodding/master
upd
2019-06-17 13:37:59 +03:00
aap
fcc6a8bc55
Merge pull request #20 from gennariarmando/master
Update HUD stuff, bug and format fixes.
2019-06-17 07:29:52 +02:00
_AG
f299e9ebd5 Update HUD stuff, bug and format fixes.
Added environment variables to premake5.lua.
Update README.md
2019-06-17 02:11:30 +02:00
Fire_Head
d92c9085da
fixed rebind bug 2019-06-17 02:32:34 +03:00
aap
0add48abf5 got rid of upper case types 2019-06-17 00:23:19 +02:00
aap
e8c5f7da52 updated guidelines 2019-06-16 23:33:20 +02:00
aap
93223b2bac some more cleanup 2019-06-16 23:12:14 +02:00
aap
c417dfa1c3
Merge pull request #16 from erorcun/master
Some CPed functions
2019-06-16 22:36:18 +02:00
eray orçunus
18cdf53723 Delete duplicate enum
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-16 23:26:39 +03:00
eray orçunus
beb6f0d4c7 Merge branch 'master' of git://github.com/GTAmodding/re3
Conflicts:
	src/entities/Ped.h
	src/entities/PlayerPed.h
2019-06-16 22:44:05 +03:00
aap
71ac32cbd7 fix the cleanup... 2019-06-16 21:41:58 +02:00
eray orçunus
c1bd90c7dd CPed fixes and needed functions for further commits
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-16 22:00:09 +03:00
aap
2a207af49a some cleanup 2019-06-16 19:06:01 +02:00
aap
bb526541a9
Merge pull request #17 from gennariarmando/master
New updates for Hud.cpp and more.
2019-06-16 18:14:48 +02:00
_AG
4c385edd0c Changes for the pull request. 2019-06-16 18:05:22 +02:00
_AG
b83a0d469a Updates Draw.cpp, MusicManager.cpp. 2019-06-16 00:24:13 +02:00
eray orçunus
2f4fc5aaf0 More CPed functions and minor fixes
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-15 18:53:25 +03:00
aap
1d177a5d8e Merge branch 'master' of github.com:GTAmodding/re3 2019-06-15 11:41:39 +02:00
aap
25605045bc silly mistake in txd store 2019-06-15 11:41:27 +02:00
_AG
92cc1cf3af New updates for Hud.cpp and more. 2019-06-15 01:34:36 +02:00
eray orçunus
8db50cea6c Fix duplicate code for PedNode
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-14 17:14:22 +03:00
erorcun
ed69be36cc Some CPed functions
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-14 17:04:29 +03:00
aap
8b55b8b144
Merge pull request #15 from ShFil119/patch-1
Fix value of CReplay mode
2019-06-13 21:53:42 +02:00
Filip Gawin
d08912e905
Fix value of CReplay mode 2019-06-13 14:27:29 +02:00
aap
54837368c3
Merge pull request #14 from ShFil119/patch-1
Fix typo in link to appveyor's account
2019-06-13 14:02:47 +02:00
Filip Gawin
e476c52aa3
Fix typo in link to appveyor's account 2019-06-13 13:58:34 +02:00
aap
3ee0879f6c
Merge pull request #13 from ShFil119/CIdebug
CI add build in debug mode
2019-06-13 13:45:36 +02:00
aap
f407c9829f finished some classes 2019-06-13 12:25:55 +02:00
Filip Gawin
8eea89d3b1 CI add debug mode 2019-06-13 12:11:50 +02:00
Fire_Head
b9b4159035
Merge pull request #7 from GTAmodding/master
merge updates
2019-06-13 13:10:42 +03:00
aap
b4afb591a7 implemented GTA stream read functions 2019-06-13 11:57:43 +02:00
aap
12697a8553
Merge pull request #12 from Fire-Head/master
Pad done
2019-06-13 10:02:52 +02:00
Fire_Head
91b8de1d3a
Update Pad.cpp 2019-06-13 03:58:29 +03:00
Fire_Head
601115e56a
Update CutsceneMgr.h 2019-06-13 03:51:51 +03:00
Fire_Head
9689def6a5
Merge branch 'master' into master 2019-06-13 03:47:13 +03:00
Fire_Head
35ea1765e2
Update Replay.h 2019-06-13 03:43:57 +03:00
Fire-Head
06e48c7059 Merge branch 'master' of github.com:Fire-Head/re3
# Conflicts:
#	src/control/Replay.h
2019-06-13 03:40:46 +03:00
Fire-Head
75bca8e31e CPad done 2019-06-13 03:35:26 +03:00
aap
e9e62660fb silly mistake 2019-06-13 01:18:38 +02:00
aap
3472a614ae fixed CFileMgr somewhat; still issues when loading saves 2019-06-13 01:12:37 +02:00
aap
9703ef9b59 implemented CutsceneObject; little fixes 2019-06-12 21:17:02 +02:00
aap
a9517c01af implemented CCutsceneHead and dependencies 2019-06-12 20:11:17 +02:00
Fire_Head
38730080a2
Merge pull request #6 from GTAmodding/master
merge updates
2019-06-12 20:20:13 +03:00
Fire_Head
cb5ec27747
Merge branch 'master' into master 2019-06-12 20:18:24 +03:00
Fire-Head
292fd5ad24 CameraCreate cosmetic fix 2019-06-12 20:08:04 +03:00