1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 03:10:00 +00:00
Commit graph

614 commits

Author SHA1 Message Date
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
Fire-Head 3317217ed8 CameraCreate/CameraDestroy/CameraSize done 2019-06-12 20:05:06 +03:00
aap ec0b8b5730 implemented CTimeCycle 2019-06-12 16:52:26 +02:00
aap 83cc43eeff added NodeName plugin 2019-06-12 14:35:15 +02:00
aap 01babd43b1 little cleanup 2019-06-12 13:46:02 +02:00
aap 71059e6a59 updated README 2019-06-12 12:55:35 +02:00
Fire_Head 047ecaf171
Merge pull request #5 from GTAmodding/master
debugmenu fix
2019-06-12 13:40:59 +03:00
aap 58cb42ca24 fixed debugmenu 2019-06-12 12:34:22 +02:00
aap be1a24439b
Merge pull request #11 from Fire-Head/master
win.c cosmetic updates
2019-06-12 12:18:53 +02:00
Fire_Head ea7d5d93b0
Merge pull request #4 from GTAmodding/master
upd
2019-06-12 12:58:11 +03:00
aap a375709eeb
Merge pull request #9 from ShFil119/COnscreenTimer
COnscreenTimer and COnscreenTimerEntry
2019-06-12 11:18:11 +02:00
Filip Gawin bcf44d361d Add NUMONSCREENTIMERENTRIES in config.h 2019-06-12 11:08:56 +02:00
aap 6f0c57d228 animation fixes 2019-06-12 10:50:23 +02:00
Filip Gawin ecd70a5f17 RE more stuff from COnscreenTimer 2019-06-12 01:23:49 +02:00