a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-18 08:37:46 +00:00
Code Issues Projects Releases Wiki Activity
4133 commits 4 branches 2 tags 50 MiB
Commit graph

1063 commits

Author SHA1 Message Date
Sergeanur 101192dd32 Added read/write template functions for save data, small Load/Save arguments unification 2019-10-08 23:07:11 +03:00
Sergeanur 69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
eray orçunus d5d1c7ec5f Peds 2019-10-07 00:39:25 +03:00
Sergeanur dfe7edfad7 CGarages::PrintMessages drawing fixes 2019-10-06 17:33:07 +03:00
Nikolay Korolev e10f5ee6a3 merge 2019-10-06 14:26:50 +03:00
Nikolay Korolev 26f7691031 car AI 2019-10-06 14:25:13 +03:00
Sergeanur 96eee4f10f Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFile 2019-10-06 02:41:35 +03:00
eray orçunus aa4e7ad5eb CDarkel, walkaround fix 2019-10-05 17:06:01 +03:00
Sergeanur cf0edb3eb7 Fix warnings 2019-10-04 02:18:23 +03:00
Sergeanur 47e6cbe65e Fix formatting mistakes 2019-10-03 23:38:21 +03:00
Sergeanur 999765aadd Fixed some formatting 2019-10-03 23:34:02 +03:00
Sergeanur 679f7bbcfa Checks rewritten 2019-10-03 23:32:31 +03:00
Sergeanur 2cf94348f5 Drop w's 2019-10-03 22:51:38 +03:00
Sergeanur 72e12f6aae CPickups 2019-10-03 22:37:13 +03:00
aap 0346d44626
Merge pull request #218 from erorcun/erorcun 
Fixes & peds
 2019-10-03 10:19:57 +02:00
eray orçunus 0ee5a46f71 Fixes & peds 2019-10-03 04:02:02 +03:00
Sergeanur bd6e109441 Fix typo in CCarCtrl::WeaveThroughPedsSectorList 2019-10-03 02:39:23 +03:00
Sergeanur 9149367f86 Fix CPickup 2019-10-01 19:53:25 +03:00
eray orçunus 0c385195d8 Peds, ProcessObjective and fixes 2019-09-27 00:01:50 +03:00
eray orçunus 0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
Nikolay Korolev 7234e6e698 CAutoPilot and CCurves 2019-09-15 13:29:38 +03:00
Nikolay Korolev 368ce0d4e5 CCarCtrl 2019-09-15 02:28:07 +03:00
Nikolay Korolev 67701df91f fix debug 2019-09-14 21:06:10 +03:00
Nikolay Korolev fbe09534d9 fix typo 2019-09-14 20:58:09 +03:00
Nikolay Korolev 84186e7b0f Merge branch 'carctrl_dev' 2019-09-14 20:54:56 +03:00
Nikolay Korolev 57f24ad533 more CCarCtrl 2019-09-14 20:53:04 +03:00
eray orçunus 88f0ef75e8 P.e.d.s. 2019-09-14 02:24:53 +03:00
Nikolay Korolev 571e65db4f Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-09-12 13:12:22 +03:00
Nikolay Korolev a3aea359b2 DragCarToPoint 2019-09-12 13:11:13 +03:00
aap 4299e307d6
Merge pull request #204 from erorcun/erorcun 
World and Peds
 2019-09-12 10:08:15 +02:00
eray orçunus 14c7c1d7ca World and Peds 2019-09-12 03:46:15 +03:00
Nikolay Korolev 426efa9ecb make ATTEMPTS_TO_FIND_NEXT_NODE a define 2019-09-11 22:12:43 +03:00
Nikolay Korolev 05b01c5ff5 ccarctrl 2019-09-11 21:42:34 +03:00
Nikolay Korolev c86c9b3118 Merge remote-tracking branch 'upstream/master' 2019-09-11 17:52:07 +03:00
Nikolay Korolev 448d5a8857 ccarctrl 2019-09-11 17:51:40 +03:00
eray orçunus 24d9773ae0 Peds 2019-09-07 01:27:07 +03:00
Nikolay Korolev b2236d8951 More CCarCtrl 2019-09-02 19:04:09 +03:00
Nikolay Korolev 3c0bbb10f3 CCarCtrl Weave stuff done 2019-09-01 20:38:35 +03:00
Nikolay Korolev cd30a76dc5 CCarCtrl stuff 2019-09-01 17:02:23 +03:00
Filip Gawin 5a36d46692 Audio fixes 2019-08-27 23:45:27 +02:00
Filip Gawin 01ac2929cd Cleanup 2019-08-27 22:29:23 +02:00
Filip Gawin 2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
Filip Gawin 458fc63f01 Cleanup 2019-08-27 21:14:28 +02:00
Filip Gawin af5bd951ae More audio ped 2019-08-27 21:13:17 +02:00
Nikolay Korolev 64cef333c8 more CCarCtrl 2019-08-25 16:47:22 +03:00
Nikolay Korolev 13233ccaed merge 2019-08-17 15:46:19 +03:00
Nikolay Korolev c16849d4a2 more CCarCtrl 2019-08-17 15:44:25 +03:00
eray orçunus 8f18f84836 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-08-15 17:54:49 +03:00
eray orçunus 5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
Fire-Head 437a817505 fix 2019-08-15 05:27:38 +03:00
Fire_Head 6909fa283a
Merge branch 'master' into master 2019-08-15 05:06:52 +03:00
Fire-Head 6093d855b0 CParticleObject done, cDMAudio done 2019-08-15 04:43:00 +03:00
Nikolay Korolev 291f73e3c7 pathetic errors 2019-08-14 22:35:02 +03:00
Nikolay Korolev 1497dbaa8d
appveyor fix 2019-08-11 23:43:11 +03:00
Nikolay Korolev 14b945ba08 more CCarCtrl 2019-08-11 20:11:54 +03:00
Nikolay Korolev 6a7fdadeaa Merge remote-tracking branch 'upstream/master' 2019-08-10 10:44:39 +03:00
Nikolay Korolev 0303955de3 More CCarCtrl 2019-08-10 10:44:19 +03:00
aap 0bd681abc5 finished CPathFind 2019-08-09 19:42:18 +02:00
eray orçunus 2ba54983a2 Peds 2019-08-08 14:46:49 +03:00
Nikolay Korolev c2a7c448ba Minor fixes 2019-08-07 00:42:38 +03:00
Nikolay Korolev 4ae4bc94c6 CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
Nikolay Korolev 20d1381a0f
fixed COMMAND_ADD_BLIP_FOR_COORD_OLD 2019-08-06 00:13:01 +03:00
Nikolay Korolev 537f0dfc16 fixed heading calculation 2019-08-03 18:51:19 +03:00
Nikolay Korolev ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
eray orçunus 875cdd845d The Peds 2019-08-02 01:30:40 +03:00
Nikolay Korolev 6fa6837baa fixed phones 2019-07-28 15:49:42 +03:00
Nikolay Korolev 6dfb2ca79e fix debug message 2019-07-28 13:38:25 +03:00
Nikolay Korolev 6ff6305be9 fixed cargen load 2019-07-28 12:57:25 +03:00
Nikolay Korolev d62225968b Merge remote-tracking branch 'upstream/master' 2019-07-27 21:28:42 +03:00
Nikolay Korolev 345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
Nikolay Korolev fc5fc602ba
fixed intro skip 2019-07-27 20:44:22 +03:00
Nikolay Korolev fe53007919 fixed remote 2019-07-26 10:44:56 +03:00
aap 8804aafc6a
Merge branch 'master' into master 2019-07-26 01:34:32 +02:00
eray orçunus 8fd63e5ca6 Ped & fixes, including peds dive into danger fix 2019-07-25 23:37:50 +03:00
Nikolay Korolev 5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
aap e9cafe340a bit more CAutomobile 2019-07-23 16:39:30 +02:00
eray orçunus 936acedcf0 CPed continues, including some fixes 2019-07-21 00:32:16 +03:00
Nikolay Korolev ef831a491e fixed script issues 2019-07-20 16:30:11 +03:00
Nikolay Korolev 60e5b8a8a9 fixed replay 2019-07-20 16:18:56 +03:00
Filip Gawin a04d8f24be ComputeDopplerEffectedFrequency 2019-07-19 16:22:46 +02:00
aap fd01f9b25c CAutomobile::ProcessControl done 2019-07-18 15:41:09 +02:00
aap 82be466013
Merge pull request #147 from erorcun/erorcun 
The Peds, mainly dying/injuring
 2019-07-18 15:19:34 +02:00
Nikolay Korolev 0f160d110f fixed car AI bug 2019-07-18 13:23:50 +03:00
eray orçunus 993944c05c Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-18 05:28:06 +03:00
eray orçunus 59671fab03 The Peds, mainly dying/injuring 
There is also some reorganization
 2019-07-18 05:27:29 +03:00
aap ba242bcf58 more CAutomobile::ProcessControl 2019-07-17 23:58:06 +02:00
guard3 dbe205ad08 Fixed Bridge 2019-07-17 23:05:11 +03:00
aap 0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00
Nikolay Korolev a9a62a8641 script fix, bomb fix, flying components fix 2019-07-17 13:24:04 +03:00
aap 36f3a517f9 more fixes; started CAutomobile::ProcessControl 2019-07-16 19:48:50 +02:00
aap 9477aca836
Merge branch 'master' into erorcun 2019-07-16 18:31:18 +02:00
Nikolay Korolev 2d9ba5bb9a fix 2019-07-15 18:13:49 +03:00
eray orçunus 2c138b2b77 Phone, World, Ped 2019-07-15 15:11:40 +03:00
Nikolay Korolev a6ca999ed4 test 2019-07-15 12:21:24 +03:00
Nikolay Korolev 5d90821a8e fix 2019-07-15 12:11:49 +03:00
Nikolay Korolev 4bfd316c4c fixed arithmetics 2019-07-14 22:59:00 +03:00
Nikolay Korolev e16562aa6d fixed cops 2019-07-14 15:00:36 +03:00
Nikolay Korolev b77a9ce955 RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes) 2019-07-14 14:49:27 +03:00
Nikolay Korolev 41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00
aap 60711154ba more CWanted; added CEventList 2019-07-12 18:01:22 +02:00
aap f35b053684
Merge pull request #129 from erorcun/erorcun 
Fix CPhone crash, more functions
 2019-07-10 23:10:10 +02:00
eray orçunus 4f333d44a0 Fix CPhone crash, more functions 2019-07-10 23:18:22 +03:00
aap 4a36d64f15 added wrappers around math functions 2019-07-10 17:18:26 +02:00
eray orçunus 2ef5e4cd66 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-10 15:56:56 +03:00
eray orçunus 86681c6f18 Phone start, ped spinning and cop car fix, and some love to CPed 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-10 15:56:29 +03:00
aap b14be6697b fixed COMMAND_IS_PLAYER_IN_AREA_3D 2019-07-10 14:00:10 +02:00
aap 50cc7c7932
Merge pull request #126 from Nick007J/master 
RunningScript part 1
 2019-07-10 11:06:27 +02:00
aap 702cd00765 more CVehicle 2019-07-09 23:49:44 +02:00
Nikolay Korolev 7174dffebc fix 2019-07-10 00:01:02 +03:00
Nikolay Korolev ca4c7d9a4b sync with upstream 2019-07-09 23:39:29 +03:00
Nikolay Korolev 11ae1b06ae RunningScript: 1/12 2019-07-09 23:38:05 +03:00
aap a65dd41da7 yet more CAutomobile 2019-07-09 18:50:35 +02:00
aap 74fcbc8c0a more CAutomobile 2019-07-09 09:57:44 +02:00
aap 192fb45098 Merge branch 'master' of github.com:GTAmodding/re3 2019-07-08 21:38:11 +02:00
aap a2cecd4e97
Merge pull request #122 from Nick007J/master 
More script stuff
 2019-07-08 21:38:06 +02:00
aap 2ae112fdf6 more CAutomobile 2019-07-08 21:37:47 +02:00
aap edf5ac2626 little changes; one more function of CAutomobile 2019-07-08 17:07:34 +02:00
aap 12af85ca3d cleaned up patching of virtual functions; started CAutomobile 2019-07-08 08:46:42 +02:00
Nikolay Korolev b1d1d6f701 Added script commands 2019-07-08 00:32:54 +03:00
Nikolay Korolev 4f3d17a81c More script 2019-07-08 00:05:24 +03:00
Nikolay Korolev 4c86469cc9 Merge remote-tracking branch 'upstream/master' 2019-07-07 22:28:51 +03:00
aap 6ec421fe7b
Merge pull request #111 from gennariarmando/master 
Darkel/Wanted update.
 2019-07-07 21:09:40 +02:00
_AG 439f371fc3 Darkel is bored. 2019-07-07 20:59:49 +02:00
Nikolay Korolev a4e6930bb6 More scripts 2019-07-07 20:57:00 +03:00
aap 62eaf12891
Merge pull request #121 from Nick007J/master 
IntoTheScripts!
 2019-07-07 19:04:59 +02:00
aap c1f3ce8cce implemented CDoor 2019-07-07 18:36:55 +02:00
Nikolay Korolev ee0494b2d8 IntoTheScripts! 2019-07-07 19:00:02 +03:00
_AG d1c6a6aaa6 Merge branch 'master' of https://github.com/gtamodding/re3 2019-07-07 15:16:54 +02:00
aap 53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00
aap 219a65b81a finished CPhysical 2019-07-07 11:13:12 +02:00
aap 533f265f55 made code use TimeStepIn(Milli)Seconds; purged unnecessary inlines 2019-07-07 10:16:16 +02:00
aap b515ce4730
Merge pull request #114 from Nick007J/master 
Added CUpsideDownCarCheck and CStuckCarCheck
 2019-07-07 09:45:07 +02:00
_AG 0ac6d0515e
Merge branch 'master' into master 2019-07-07 09:21:44 +02:00
_AG 29767c1964 Lil update. 2019-07-07 09:13:14 +02:00
aap 00461224a9 some work on vehicles 2019-07-06 19:44:00 +02:00
Nikolay Korolev b1500fbe03 Added CUpsideDownCarCheck and CStuckCarCheck 2019-07-06 18:06:08 +03:00
aap 2d08696190
Merge pull request #113 from erorcun/erorcun 
CPed
 2019-07-06 00:58:07 +02:00
eray orçunus 769c2812ff Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 
Conflicts:
	src/entities/Ped.h
	src/entities/Vehicle.h
 2019-07-06 01:52:14 +03:00
guard3 88ce335afc CBridge 2019-07-06 01:51:32 +03:00
eray orçunus 0e7a471b82 CPed... 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-06 01:44:49 +03:00
aap 49d97f0033 finished CDamageManager 2019-07-05 22:20:28 +02:00
aap 396b43cbd4 implemented some CVehicle functions 2019-07-05 14:23:39 +02:00
_AG 9fed0c040c Darkel/Wanted update. 2019-07-04 22:33:19 +02:00
Nikolay Korolev 7fae683316 Script stuff + bug fixes 2019-07-04 01:16:24 +03:00
eray orçunus 3dec4a0423 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-01 02:48:31 +03:00
eray orçunus ce28a6d298 More CPed 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-01 02:48:09 +03:00
Nikolay Korolev be808bed53 Merge remote-tracking branch 'upstream/master' 2019-07-01 00:18:10 +03:00
Nikolay Korolev 02c7cbc75f Completed CReplay 2019-07-01 00:15:34 +03:00
aap c661485ef7 little cleanup 2019-06-30 22:55:48 +02:00
Nikolay Korolev 3a763cc6e7 Changed CReplay::Display slightly 2019-06-30 23:49:32 +03:00
Nikolay Korolev 4e09f9ee39 Added camera funcs to Replay 2019-06-30 23:29:53 +03:00
aap af2e764d81 finished CEntity 2019-06-30 21:06:55 +02:00
Nikolay Korolev 69918d4145 More replay functions, also removed pool iteration error 2019-06-30 19:22:44 +03:00
Nikolay Korolev 7c6b291860 Merge remote-tracking branch 'upstream/master' 2019-06-30 16:21:58 +03:00
Nikolay Korolev 90bcb888e8 Reactivated Store(Restore)StuffIn(From)Mem, fixed bugs 2019-06-30 16:20:11 +03:00
aap 9b5a7cd4bb
Merge pull request #78 from ShFil119/cleanup 
Cleanup project a bit
 2019-06-30 13:37:52 +02:00
Nikolay Korolev e2bd3573b4 PlayBackThisFrameInterpolation and all it required... 2019-06-30 13:59:55 +03:00
Filip Gawin 2115faec38 Cleanup project a bit 2019-06-30 12:56:50 +02:00
Nikolay Korolev b2b750bc90 ProcessCarUpdate 2019-06-29 23:15:55 +03:00
Nikolay Korolev 647db5cf34 CReplay::PlaybackThisFrame + fixes 2019-06-29 21:38:47 +03:00
Nikolay Korolev 1d620f4b67 Merged with upstream 2019-06-29 18:05:16 +03:00
Nikolay Korolev ad76379eba more replay stuff, bug fix 2019-06-29 18:01:43 +03:00
Nikolay Korolev 62cfcd5b27 RetrievePedAnimation 2019-06-29 15:19:31 +03:00
Nikolay Korolev 9b5392d3a1 ProcessPedUpdate 2019-06-29 14:38:37 +03:00
aap b2f8c7eb23 miscellaneous, mostly world related 2019-06-29 11:09:33 +02:00
aap 48cf8b6629 misc stuff, mostly collision 2019-06-28 19:23:28 +02:00
aap 847720aeae CStreaming DONE 2019-06-28 12:34:02 +02:00
aap 6f4e01f078
Merge pull request #59 from Nick007J/master 
Added Gangs
 2019-06-28 09:49:47 +02:00
Nikolay Korolev 1c7fee4b9f Changed save/load in CGang 2019-06-27 23:45:06 +03:00
aap d74b8fa952 started filling debug menu 2019-06-27 10:58:51 +02: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
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 f5e31a4564 fixed PedType 2019-06-26 11:12:00 +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
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
Nikolay Korolev a87f3188e9 CReplay::StorePedAnimation 2019-06-23 13:58:14 +03:00
Nikolay Korolev 98cc8a434c StorePedUpdate 2019-06-23 01:34:11 +03:00
Nikolay Korolev 4f9eff19b2 attempt to fix build error 2019-06-22 22:23:26 +03:00
Nikolay Korolev 057938fc6f fixed types 2019-06-22 21:42:26 +03:00
Nikolay Korolev 4e07396076 tabify 2019-06-22 21:35:23 +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
_AG f3c331ece6 Code clean up. 2019-06-20 15:18:19 +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 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 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
aap 3b64bd1b4a finished CFileLoader, except a crash! 2019-06-18 09:50:26 +02:00
aap b5fba778c4 first part of CFileLoader 2019-06-17 22:40:15 +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
aap 0add48abf5 got rid of upper case types 2019-06-17 00:23:19 +02:00
_AG 92cc1cf3af New updates for Hud.cpp and more. 2019-06-15 01:34:36 +02:00
Filip Gawin d08912e905
Fix value of CReplay mode 2019-06-13 14:27:29 +02: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 01babd43b1 little cleanup 2019-06-12 13:46:02 +02:00
Filip Gawin ecd70a5f17 RE more stuff from COnscreenTimer 2019-06-12 01:23:49 +02:00
aap 188aab4196 implemented some higher level functions; added lots of stubs; switched top and bottom in CRect 2019-05-30 21:24:47 +02:00
aap 0a36d49d2c clean up 2019-05-30 00:47:33 +02:00
aap 9e496100b7 more work on CPhysical 2019-05-18 12:39:39 +02:00