a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 17:00:01 +00:00
Code Issues Projects Releases Wiki Activity
352 commits 4 branches 2 tags 50 MiB
Commit graph

288 commits

Author SHA1 Message Date
_AG 677821d6cc Finished Hud.cpp 2019-06-27 09:49:08 +02:00
aap 62b6788dc5
Merge pull request #60 from erorcun/erorcun 
Fix 3 bugs
 2019-06-27 09:46:41 +02:00
aap f6443ea108
Merge pull request #57 from gennariarmando/master 
Update Wanted.cpp
 2019-06-27 09:45:59 +02:00
_AG 1ac4173446 Reverted Pad.cpp to previous state. 2019-06-27 07:42:59 +02:00
eray orçunus 54975cc97b Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-27 06:31:01 +03:00
eray orçunus b8862cf59c Fix 3 bugs 
* Footsteps doesn't play while sprinting
* Player doesn't kick ped in ground at first time
* Looking around with numpad is problematic

Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-27 06:30:29 +03:00
Nikolay Korolev 969d4ac48d fixed newline 2019-06-27 01:33:46 +03:00
Nikolay Korolev c9b9d614de Merge remote-tracking branch 'upstream/master' 2019-06-27 01:32:31 +03:00
Nikolay Korolev 0d45f2fc23 Added Gangs 2019-06-27 01:30:59 +03:00
aap 0053201ea0 yet more CStreaming 2019-06-27 00:12:58 +02:00
_AG 69ac8bcd7a Update Wanted.cpp 
Fix #36.
 2019-06-26 23:32:08 +02:00
Nikolay Korolev a45675d4db fixed autobuild 2019-06-26 23:50:22 +03:00
Nikolay Korolev fa132bb773 Fixed merge errors 2019-06-26 23:47:23 +03:00
Nikolay Korolev 08b053a568 Merge with upstream 2019-06-26 23:34:14 +03:00
aap 50cce3e586 bla 2019-06-26 21:46:55 +02:00
aap d9b3c82c5e some more CStreaming + fixes by erorcun 2019-06-26 21:33:58 +02:00
aap a91f40e79d CStreaming streams 2019-06-26 16:49:32 +02:00
aap b19e1d369c fixed bug in CPed 2019-06-26 11:35:34 +02:00
aap f9e7e9c3c3
Merge pull request #51 from gennariarmando/master 
Better organization for Frontend.cpp
 2019-06-26 11:20:35 +02:00
aap 8510792256 CPed cleanup 2019-06-26 11:19:56 +02:00
aap 5350574b6d
Merge pull request #50 from erorcun/erorcun 
Fix car animations & M16 bug
 2019-06-26 11:13:43 +02:00
aap f5e31a4564 fixed PedType 2019-06-26 11:12:00 +02:00
_AG dd1b563720 Little fix #52. 2019-06-25 20:54:48 +02:00
_AG 28509e216f Better organization for Frontend.cpp 2019-06-25 14:26:41 +02:00
eray orçunus e9fd2a93e0 Fix car animations & M16 bug 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-25 14:33:24 +03:00
aap 628b9a8b54 Frontend clean up 2019-06-25 08:54:41 +02:00
_AG e765dfe90a Initial commit for Frontend. 
Bug fixes:
fix #40, fix #39, fix #38, fix #37, fix #21.
Code organization and cleanup...
 2019-06-25 02:36:26 +02:00
Nikolay Korolev cc731f4732 More replay stuff 2019-06-25 01:42:23 +03:00
aap f07f411629
Merge pull request #43 from erorcun/erorcun 
CPed, CVehicle, mostly entering/exiting car
 2019-06-24 23:11:56 +02:00
eray orçunus 1e09bf9c30 CPed, CVehicle, mostly entering/exiting car 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-25 00:01:40 +03:00
aap 3b43c09578 replaced some ctors; made PreRender call game function 2019-06-24 22:06:14 +02:00
aap 0b384356f9 fixed bug in CPlaceable 2019-06-24 20:01:15 +02:00
aap db2e2575c8 more CStreaming 2019-06-24 18:44:23 +02:00
aap 4d84d94166 more Radar code 2019-06-23 19:59:58 +02:00
aap a5ba538968 some Radar and Hud cleanup; fix in Physical 2019-06-23 13:11:41 +02:00
Nikolay Korolev a87f3188e9 CReplay::StorePedAnimation 2019-06-23 13:58:14 +03:00
Nikolay Korolev 3dd57c445e Merge remote-tracking branch 'upstream/master' 2019-06-23 10:43:16 +03:00
aap 047fa20f28 fixed key binding, head shots, freezes 2019-06-23 01:01:21 +02:00
Nikolay Korolev 98cc8a434c StorePedUpdate 2019-06-23 01:34:11 +03:00
_AG 0126bef9a1
Fixed little bug in Radar.cpp. 2019-06-22 21:59:10 +02:00
aap 6c7df4487e
Merge pull request #29 from erorcun/erorcun 
Shotgun fix, CPed, CWeaponInfo
 2019-06-22 21:31:38 +02:00
aap 69dd259b70
Merge pull request #30 from gennariarmando/master 
More CRadar stuff.
 2019-06-22 21:30:43 +02:00
aap 7a77f995b2
Merge pull request #32 from Nick007J/master 
Added replay functions
 2019-06-22 21:29:14 +02:00
Nikolay Korolev 4f9eff19b2 attempt to fix build error 2019-06-22 22:23:26 +03:00
Nikolay Korolev 3b4cf4f418 fixed tab 2019-06-22 21:43:56 +03:00
Nikolay Korolev 057938fc6f fixed types 2019-06-22 21:42:26 +03:00
Nikolay Korolev 49523b1c03 fix 2019-06-22 21:38:12 +03:00
Nikolay Korolev 4e07396076 tabify 2019-06-22 21:35:23 +03:00
Nikolay Korolev 666ee73ac8 Fixed types in BulletTrace.h 2019-06-22 21:28:42 +03:00
Nikolay Korolev 145338a2eb Fixed types in Pickup.h 2019-06-22 21:26:46 +03:00
Nikolay Korolev 96619e239a Added newlines at end of file 2019-06-22 21:25:14 +03:00
Nikolay Korolev 8b47a5b9f4 First commit of replay system 2019-06-22 21:17:25 +03:00
eray orçunus 36a085204e Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-22 15:01:52 +03:00
_AG beea41d465 More CRadar stuff. 2019-06-22 11:42:27 +02:00
aap ad885bb54f bla 2019-06-22 03:03:18 +02:00
eray orçunus 5ee579daa2 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-22 03:56:46 +03:00
eray orçunus 0a7120b622 Shotgun fix, CPed, CWeaponInfo 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-22 03:34:21 +03:00
aap a7aa475cbf
Merge pull request #28 from gennariarmando/master 
Update Radar.cpp
 2019-06-21 17:44:46 +02:00
aap 66462d348b more CStreaming; fixed CFileLoader 2019-06-21 17:28:55 +02:00
_AG 074dd9486c Clean up 2019-06-21 11:27:54 +02:00
aap 3271467976
Merge pull request #26 from erorcun/eray 
Big CPed update
 2019-06-21 11:15:08 +02:00
aap a9bcd1b7c5 added some World defines 2019-06-21 11:11:29 +02:00
eray orçunus 817f8b0e3f Fix throwable weapons 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-21 00:44:06 +03:00
eray orçunus 4a3138f384 Merge branch 'master' of git://github.com/GTAmodding/re3 into eray 2019-06-21 00:42:57 +03:00
_AG 11ba688c98 Update Radar.cpp 2019-06-20 21:34:48 +02:00
eray orçunus 7cfff963f7 Big CPed update 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-20 17:31:14 +03:00
_AG f3c331ece6 Code clean up. 2019-06-20 15:18:19 +02:00
aap 922c73eeee started CStreaming 2019-06-20 14:49:16 +02:00
_AG 30d52079a4 Fix bug in templates.h, again. 2019-06-20 11:26:43 +02:00
_AG ef8e9e7f1b Update Radar.cpp 2019-06-20 11:21:27 +02:00
_AG 2ce7bcc405 Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h. 2019-06-20 02:32:36 +02:00
aap f4146d39a2 finally finished CVehicleModelInfo 2019-06-20 01:07:57 +02:00
aap f1b255e69f typo in visibility plugins 2019-06-20 00:36:11 +02:00
aap 2fcdf6fa21 implemented cHandlingDataMgr 2019-06-20 00:12:12 +02:00
aap 12f009e708 implemented cHandlingDataMgr 2019-06-19 23:56:27 +02:00
aap 2ec11b000d implemented CObjectData 2019-06-19 18:35:51 +02:00
aap 864f719b1e implemented CPedStats 2019-06-19 16:55:01 +02:00
aap ea73d7a284 finished CPedType 2019-06-19 15:28:13 +02:00
aap f88f711ddd some CPed flags named from SA 2019-06-19 14:20:50 +02:00
aap 78e33785ec cleanup on CPed and CPedType 2019-06-19 14:06:13 +02:00
eray orçunus c9f6e7bf83 CPed merge fixes 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-18 23:01:03 +03:00
eray orçunus 886db44936 Merge branch 'master' of git://github.com/GTAmodding/re3 2019-06-18 15:34:35 +03:00
eray orçunus 4ed6e86db1 CPed fixes 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-18 15:34:27 +03:00
aap d5beaee746 silly mistake in CFileLoader 2019-06-18 11:29:48 +02:00
aap 3b64bd1b4a finished CFileLoader, except a crash! 2019-06-18 09:50:26 +02:00
aap ad12240586 fixed anim bug 2019-06-17 23:31:00 +02:00
aap 50122c2d0f forgot main.h 2019-06-17 22:54:02 +02:00
aap dc230df8b1
Merge pull request #24 from gennariarmando/master 
Fixed health icon.
 2019-06-17 22:42:11 +02:00
aap e524a1a326 Merge branch 'master' of github.com:GTAmodding/re3 2019-06-17 22:40:31 +02:00
aap b5fba778c4 first part of CFileLoader 2019-06-17 22:40:15 +02:00
_AG f83c7392cc Merge branch 'master' of https://github.com/gennariarmando/re3 2019-06-17 21:06:49 +02:00
_AG 6f0fb7cd36 Fixed health icon. 2019-06-17 21:06:41 +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
_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 93223b2bac some more cleanup 2019-06-16 23:12:14 +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
Filip Gawin d08912e905
Fix value of CReplay mode 2019-06-13 14:27:29 +02:00
aap f407c9829f finished some classes 2019-06-13 12:25:55 +02:00
aap b4afb591a7 implemented GTA stream read functions 2019-06-13 11:57:43 +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 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 58cb42ca24 fixed debugmenu 2019-06-12 12:34:22 +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
Fire_Head 0f402c97ea
Merge pull request #3 from GTAmodding/master 
merge
 2019-06-12 01:57:49 +03:00
Filip Gawin c95f1ce2ce Add GetTranslatedName to CZone 2019-06-11 18:23:09 +02:00
Fire-Head 87655bc1cf tmp 2019-06-11 12:30:53 +03:00
aap e7ed4d0096 added animation system (with skin support for now) 2019-06-11 08:59:28 +02:00
aap a600fa9976 Merge branch 'master' of github.com:GTAmodding/re3 2019-06-11 08:58:14 +02:00
Fire-Head e952d3e624 VK_LEFT fix 2019-06-05 23:25:13 +03:00
Fire-Head 4fc80e7b73 win.cpp/skeleton.cpp done 2019-06-05 22:28:54 +03:00
Fire-Head 2a6349e200 input done, fixed cheats input 2019-06-05 22:18:06 +03:00
aap 498a903d0c added CDirectory 2019-06-03 05:27:07 +02:00
Fire-Head 0c495cb188 added NO_MOVIES 2019-06-03 01:25:46 +03:00
Fire_Head aa1163ccb2
Merge pull request #2 from GTAmodding/master 
upd
 2019-06-03 00:56:56 +03:00
Fire-Head 31f349d9c2 gamestates fixed, mpeg now working 2019-06-03 00:42:51 +03:00
aap f5706a4641 added CPhysical flags from Nick 2019-06-02 19:33:41 +02:00