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

867 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
Sergeanur 3e25726697 Fixed crash when aboarding train 2019-10-08 02:19:44 +03:00
Sergeanur 9fa799522e Fixing typo for cursor coords 2019-10-07 15:33:21 +03:00
Sergeanur 1df8e7976f Aspect ratio fix for player skin menu 2019-10-07 15:08:39 +03:00
Sergeanur 568bdcfd74 CHud::Draw - removed render states, readded hud toogle with second controller 2019-10-07 15:06:30 +03:00
Sergeanur 577189c1f2 Corona streaks fix 2019-10-07 01:59:38 +03:00
eray orçunus c9d92a7d1b Little fix 2019-10-07 01:13:18 +03:00
eray orçunus d5d1c7ec5f Peds 2019-10-07 00:39:25 +03:00
Sergeanur 32c5723b91 Radio shadow fix, RAMPAGE!! message fix 2019-10-06 21:31:34 +03:00
Sergeanur dfe7edfad7 CGarages::PrintMessages drawing fixes 2019-10-06 17:33:07 +03:00
Sergeanur dd602eb4a4 Fixing ColPoints again 2019-10-06 15:49:01 +03:00
Sergeanur 5b49c972a0 CHud: timer and damage fixes 2019-10-06 15:45:53 +03:00
Sergeanur 90aa16b9b0 Possible fix for wheel bug 2019-10-06 15:42:48 +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 fe2ae13c80 Fixed player blip heading when looking left/right/behind 2019-10-06 02:42:22 +03:00
Sergeanur 96eee4f10f Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFile 2019-10-06 02:41:35 +03:00
Sergeanur dd99edd339 Fixed a bunch of calculation mistakes in CHud 2019-10-05 22:26:29 +03:00
erorcun c7d3b302f5
Merge pull request #225 from erorcun/erorcun 
Fixes
 2019-10-05 21:54:39 +03:00
eray orçunus 42fbe50739 Fixes 2019-10-05 21:50:02 +03:00
aap c06f139530
Merge pull request #223 from Sergeanur/fix/WideCorona 
Corona widescreen fix
 2019-10-05 17:17:29 +02:00
Sergeanur 365f9e9caf Triangular radar blips 2019-10-05 17:32:01 +03:00
eray orçunus aa4e7ad5eb CDarkel, walkaround fix 2019-10-05 17:06:01 +03:00
Sergeanur cc621ba099 Corona widescreen fix 2019-10-05 16:04:27 +03:00
Sergeanur cf0edb3eb7 Fix warnings 2019-10-04 02:18:23 +03:00
eray orçunus 54f36ad960 Fix radar 2019-10-04 01:19:07 +03:00
Sergeanur 5e1538a275 Fixed disappearing ammo count 2019-10-04 00:49:11 +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
Sergeanur 6bed421ce8 No dw 2019-10-03 13:31:31 +03:00
Sergeanur 5b119ca78d Added missed config.h 2019-10-03 13:21:00 +03:00
Sergeanur 095b8b1e74 CMoneyMessages 2019-10-03 13:16:28 +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
eray orçunus d0addb8bf5 Mostly fix 2019-10-01 23:33:00 +03:00
erorcun e363a7983e
Merge pull request #214 from erorcun/erorcun 
Moar peds
 2019-10-01 20:15:16 +03:00
Sergeanur 9149367f86 Fix CPickup 2019-10-01 19:53:25 +03:00
eray orçunus c03efd0aa1 Moar peds 2019-10-01 19:16:36 +03:00
Sergeanur 90f085c1ca zero check 2019-09-28 22:07:05 +03:00
Sergeanur 5854016ec5 PlayerSkin 2019-09-28 21:49:41 +03:00
Sergeanur b13c4de6a4 Added CUTSCENEDIRSIZE to Config enum and CUTSCENENAMESIZE macro 2019-09-28 18:16:52 +03:00
Sergeanur ef65ad81ce Added f for floats, removed checks for delete 2019-09-28 18:01:05 +03:00
Sergeanur 45ead4d0bf Refactoring 2019-09-28 17:31:14 +03:00
Sergeanur 6362ceeff3 Full CCutsceneMgr 2019-09-28 17:03:00 +03:00
eray orçunus 0c385195d8 Peds, ProcessObjective and fixes 2019-09-27 00:01:50 +03:00
eray orçunus 3cb0a62ee6 Peds 2019-09-20 22:40:33 +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 3e71c15b33 Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-09-12 19:15:13 +03:00
Nikolay Korolev 4041159855
fixed launch in space bug 2019-09-12 19:13:32 +03:00
aap dec134c881
Merge pull request #205 from erorcun/erorcun 
Little cleanup
 2019-09-12 14:39:47 +02:00
eray orçunus 643f8e14a0 Little cleanup 2019-09-12 15:35:05 +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
eray orçunus 0f028edae9 Fix and cancellable car enter 2019-09-05 23:07:37 +03:00
eray orçunus e232b664be CPed::ProcessControl and some cleanup 2019-09-03 23:05:17 +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 16624e174b Merge remote-tracking branch 'upstream/master' 2019-08-25 16:48:13 +03:00
Nikolay Korolev 64cef333c8 more CCarCtrl 2019-08-25 16:47:22 +03:00
eray orçunus e5df72a1e9 Peds 2019-08-23 01:53:53 +03:00
aap ed9ab6c55f
Merge pull request #195 from erorcun/erorcun 
AnimViewer messages, Particle fix, Peds
 2019-08-17 21:24:26 +02:00
eray orçunus 39223901bf AnimViewer messages, Particle fix, Peds 2019-08-17 22:21:10 +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 cf8b27c453 Little CPed fixes & Peddebug 2019-08-16 19:25:02 +03:00
eray orçunus 82dc813ab3 AnimViewer fixes 2019-08-15 18:59:09 +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
eray orçunus e5d089db88 More peds 2019-08-13 01:30:31 +03:00
eray orçunus 2c24f55333 Ped variables fix 2019-08-12 00:35:32 +03:00
Nikolay Korolev 1497dbaa8d
appveyor fix 2019-08-11 23:43:11 +03:00
aap b7471489fa
Merge pull request #186 from Nick007J/master 
more CCarCtrl
 2019-08-11 22:15:31 +02:00
eray orçunus be1c7b0761 P.e.d.s. and fixes 2019-08-11 20:31:36 +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
eray orçunus 2fc69a0aa5 CPed part 218 2019-08-05 16:07:10 +03:00
aap a3e3527a3b implemented CHeli 2019-08-04 00:31:00 +02:00
Nikolay Korolev 45a8295029 Merge remote-tracking branch 'upstream/master' 2019-08-03 21:43:34 +03:00
Nikolay Korolev d3ddfd8e40 fixed collision 2019-08-03 21:43:07 +03:00
eray orçunus ca52dea51b A fix and a function made me notice it 2019-08-03 20:14:45 +03:00
Nikolay Korolev 537f0dfc16 fixed heading calculation 2019-08-03 18:51:19 +03:00
Fire-Head 7ed494906a sampman cosmetic fix 2019-08-03 18:15:31 +03:00
Nikolay Korolev a3bdaccafb Merge remote-tracking branch 'upstream/master' 2019-08-03 16:02:09 +03:00
Nikolay Korolev ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
aap a890a8a3b4
Merge pull request #178 from Fire-Head/master 
sampman done
 2019-08-02 23:09:37 +02:00
Fire-Head 73e2a4b035 Merge branch 'master' of github.com:Fire-Head/re3 2019-08-02 23:23:05 +03:00
Fire-Head fe958ec34e fix 2019-08-02 23:22:49 +03:00
Fire-Head 6ba2b05443 sampman done 2019-08-02 23:20:12 +03:00
aap 6f05ed0c23 some CPed cleanup 2019-08-02 15:00:55 +02:00
eray orçunus 875cdd845d The Peds 2019-08-02 01:30:40 +03:00
aap 78c15c4828 implemented CPlane 2019-07-31 23:57:18 +02:00
aap 5f6b235301 implemented CTrain 2019-07-31 14:33:27 +02:00
Fire-Head 1ec6979b8b restore original shadows fading 2019-07-29 20:05:06 +03:00
eray orçunus 72822c20d8 Peds and fixes 2019-07-29 15:01:44 +03:00
eray orçunus 994dce6bc4 Address fix 2019-07-28 21:01:55 +03:00
eray orçunus 8102ace7b6 Peds, mainly audio 2019-07-28 20:39:39 +03:00
Nikolay Korolev aac7acd785 ped chat fix 2019-07-28 19:51:13 +03:00
Nikolay Korolev f7c93fc15c Merge remote-tracking branch 'upstream/master' 2019-07-28 15:52:39 +03:00
Nikolay Korolev 6fa6837baa fixed phones 2019-07-28 15:49:42 +03:00
aap 7da8184b37 Merge branch 'master' of github.com:GTAmodding/re3 2019-07-28 13:14:18 +02:00
aap 6ff921c160 CAutomobile::PreRender; whole class finished 2019-07-28 13:14:08 +02:00
Nikolay Korolev 6dfb2ca79e fix debug message 2019-07-28 13:38:25 +03:00
Nikolay Korolev 128d31746d fixed wanted 2019-07-28 13:35:24 +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
aap 8de701dd70 renamed flag to R* name 2019-07-27 13:02:49 +02:00
aap 0aaaab3622 CAutomobile::Render; moved some math code into .cpp 2019-07-27 11:53:51 +02:00
aap e340400875 fixed CAutomobile bug 2019-07-26 20:11:11 +02:00
aap e200eb1a2f CAutomobile effect stuff 2019-07-26 18:48:14 +02:00
Nikolay Korolev efdd44cd68 fixed bridge 2019-07-26 18:01:56 +03:00
Nikolay Korolev 4658ebfdc2 fixed wanted 2019-07-26 17:29:28 +03:00
aap 9a50a59a3c CAutomobile::FireTruckControl and HydraulicControl 2019-07-26 14:27:13 +02:00
Nikolay Korolev dae2d30d8f fight fix 2019-07-26 13:39:56 +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 3bb607f9cb implemented CAutomobile::TankControl 2019-07-25 16:33:37 +02:00
aap 60364f11da fixed dinput 2019-07-25 12:38:25 +02:00
aap ecf03d0f54 Merge branch 'master' of github.com:GTAmodding/re3 2019-07-24 23:06:58 +02:00
aap 93d55bd029 fixed buoyancy; implemented CAutomobile::ProcessBuoyancy 2019-07-24 23:06:48 +02:00
Fire_Head b79f77634d
Merge branch 'master' into master 2019-07-24 20:59:16 +03:00
Fire-Head 0c0e564019 update 2019-07-24 20:30:09 +03:00
Fire-Head b4ecb3e3da shadows done 2019-07-24 19:55:43 +03:00
aap ae69aaf5ce implemented cBuoyancy 2019-07-23 22:55:23 +02:00
aap e9cafe340a bit more CAutomobile 2019-07-23 16:39:30 +02:00
Filip Gawin b00a92b20a Try to fix rpg bug 2019-07-21 21:17:00 +02:00
Filip Gawin 6cf4a6af6c Fix setting sampleIndex 2019-07-21 12:45:47 +02:00
eray orçunus 936acedcf0 CPed continues, including some fixes 2019-07-21 00:32:16 +03:00
Nikolay Korolev b0f3ecdb63 fix door issue 2019-07-20 23:12:12 +03:00
Nikolay Korolev a951996943 added CPool<cAudioScriptObject, cAudioScriptObject> 2019-07-20 18:00:57 +03:00
aap 2d986b79d2
Merge pull request #153 from ThirteenAG/master 
premake and appveyor update
 2019-07-20 15:31:09 +02:00
Nikolay Korolev ef831a491e fixed script issues 2019-07-20 16:30:11 +03:00
Nikolay Korolev be8e29e4e2 Merge remote-tracking branch 'upstream/master' 2019-07-20 16:19:33 +03:00
Nikolay Korolev 60e5b8a8a9 fixed replay 2019-07-20 16:18:56 +03:00
ThirteenAG a8dfcc25c7 premake and appveyor update 2019-07-20 16:13:16 +03:00
aap b62634ea64 one more fix 2019-07-20 14:48:29 +02:00
aap c6c3ffa01c Merge branch 'master' of github.com:GTAmodding/re3 2019-07-20 14:48:17 +02:00
aap 60045ec6cd couple of fixes 2019-07-20 14:39:38 +02:00
Nikolay Korolev 52718385db fix crash 2019-07-20 13:56:27 +03:00
aap 29d7b983d7
Merge pull request #149 from ShFil119/audio4 
Audio4
 2019-07-20 12:35:24 +02:00
Filip Gawin e003f7ffba fixes for #142 2019-07-19 23:35:21 +02:00
Nikolay Korolev fe03ba825a fixed references leak 2019-07-19 22:45:58 +03:00
Filip Gawin 40b3ff31bb More audio script 2019-07-19 16:25:16 +02:00
Filip Gawin 88a6d67494 more audio process 2019-07-19 16:23:03 +02:00
Filip Gawin 113abec6fa ProcessActiveQueues 2019-07-19 16:23:03 +02:00
Filip Gawin a04d8f24be ComputeDopplerEffectedFrequency 2019-07-19 16:22:46 +02:00
aap 2c647ef228 fixed dodo bug 2019-07-19 14:36:45 +02:00
aap 0ad39c020c implemented col line rendering 2019-07-19 13:58:19 +02:00
aap 59145cea83 CAutomobile ctor, car spawner, fixes 2019-07-19 11:57:12 +02:00
aap 26502ee30a *cough* 2019-07-19 10:51:42 +02:00
aap f63c614d6a fixed eventlist bug 2019-07-19 10:09:08 +02:00
aap 9a7ce75c03 CAutomobile damage 2019-07-18 21:41:20 +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
eray orçunus d0fd14cb1a Wanted changes in PlayerPed/PedModelInfo 
And some typos
 2019-07-18 16:12:46 +03: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
guard3 94fb33b60c Fluff 2019-07-17 22:44:22 +03:00
Nikolay Korolev 06ba7ef468 dodo crash fix 2019-07-17 16:18:33 +03:00
aap 0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00
Nikolay Korolev 682e3f5984 fix fix 2019-07-17 13:24:55 +03: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 03fc85bfe0 fixed merge 2019-07-16 18:41:30 +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 68d850087c Merge remote-tracking branch 'upstream/master' 2019-07-14 20:33:41 +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
aap 424487854b started making frontend accurate to game 2019-07-14 12:46:36 +02:00
Nikolay Korolev be110db5c4 Merge remote-tracking branch 'upstream/master' 2019-07-14 12:49:27 +03:00
Nikolay Korolev 41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00
aap c6afa42f9b
Merge pull request #131 from gennariarmando/master 
Frontend fixes.
 2019-07-14 10:22:52 +02:00
Nikolay Korolev 51c71fffeb fixed policeDontCare 2019-07-13 19:12:51 +03:00
aap 980b6ed4d2 little change to aspect ratio defines 2019-07-12 18:28:40 +02:00
aap 60711154ba more CWanted; added CEventList 2019-07-12 18:01:22 +02:00
_AG 7ba5f6a13a Frontend fixes. 
Fix #125 #119 #105 #98 #54.
 2019-07-11 23:43:37 +02:00
aap 0548476ba6 CAutomobile::ProcessControlInputs 2019-07-11 12:48:49 +02:00
Fire_Head aa449b6fe1
Merge branch 'master' into master 2019-07-11 03:48:36 +03:00
Fire-Head d8dd649617 fixfixfix 2019-07-11 03:44:54 +03:00
Fire-Head 3225fe3b92 Merge branch 'master' of github.com:Fire-Head/re3 
# Conflicts:
#	src/render/WaterLevel.cpp
#	src/render/WaterLevel.h
 2019-07-11 03:40:15 +03:00
Fire-Head 565f36f4e3 waterupd 2019-07-11 03:39:20 +03:00
Fire-Head b902abd984 water fix 2019-07-11 03:37:57 +03:00
Fire-Head aed8218ef1 WaterLevel done 2019-07-11 03:33:28 +03:00
Fire-Head a644c4e9ce WaterLevel done 2019-07-11 03:22:01 +03:00
aap f35b053684
Merge pull request #129 from erorcun/erorcun 
Fix CPhone crash, more functions
 2019-07-10 23:10:10 +02:00
aap f1951acd6e tried to fix CMenuManager::Process but still issues 2019-07-10 22:57:19 +02:00
eray orçunus 4f333d44a0 Fix CPhone crash, more functions 2019-07-10 23:18:22 +03:00
aap 90e093cd47 and of course the last commit didnt fix everything 2019-07-10 17:34:11 +02: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 d360229b5b fixed some stuff in frontend, badly broke others; disabled reversed frontend for the moment 2019-07-10 13:42:48 +02:00
aap 0d3cdcc01c
Merge pull request #127 from gennariarmando/master 
More frontend inputs.
 2019-07-10 11:08:31 +02:00
aap 50cc7c7932
Merge pull request #126 from Nick007J/master 
RunningScript part 1
 2019-07-10 11:06:27 +02:00
aap 1aeb34f547 CVehicle::ProcessWheel 2019-07-10 11:05:49 +02:00
_AG 5b04393bb4 More frontend inputs. 2019-07-10 10:03:06 +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 b26e83fc6e Merge branch 'master' of github.com:GTAmodding/re3 2019-07-08 22:55:57 +02:00
aap 313004e1b0
Merge pull request #123 from erorcun/erorcun 
One driver owns all the cars fix
 2019-07-08 22:55:27 +02:00
eray orçunus 69ee4acc97 One driver owns all the cars fix 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-08 23:03:50 +03: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 6d96b6d046
Merge pull request #120 from ShFil119/audio4 
More AudioManager
 2019-07-07 19:07:25 +02: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
Filip Gawin 567937a8cd Fix reverse warn and air brakes 2019-07-07 17:49:33 +02:00
Filip Gawin d6944ec570 cAudioManager::Initialise 2019-07-07 17:48:32 +02:00
Filip Gawin 9062f958a4 cleanup AudioManager 2019-07-07 17:48:32 +02:00
_AG 0c34fb1bb2 blah 2019-07-07 15:26:59 +02: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
eray orçunus ee8e16376b Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-07 01:39:58 +03:00
eray orçunus 0eb8a5d53e General fixes 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-07 01:35:45 +03: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 2b592605ab misc classes finished 2019-07-06 12:27:21 +02: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 9d13ab28a8
Merge branch 'master' into audio3 2019-07-05 14:34:41 +02:00
aap 396b43cbd4 implemented some CVehicle functions 2019-07-05 14:23:39 +02:00
aap d62c616545 fixed rand (thanks nick) 2019-07-04 23:10:04 +02:00
_AG 9fed0c040c Darkel/Wanted update. 2019-07-04 22:33:19 +02:00
Filip Gawin e3fcb686cc More AudioManager 2019-07-04 22:20:05 +02:00
eray orçunus e22db39097 Little fixes 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-04 16:30:24 +03:00
eray orçunus cc56292bc5 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-04 05:00:33 +03:00
eray orçunus d4ea6912f5 Even more CPed 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-04 04:59:29 +03:00
Filip Gawin d6957aaa57 RandomDisplacement 2019-07-04 01:02:00 +02:00
Filip Gawin 0ec77e8329 RequireDigitalHandle 2019-07-04 01:02:00 +02:00
Filip Gawin 9357e5cc83 ReleaseDigitalHandle 2019-07-04 01:02:00 +02:00
Filip Gawin e589589538 PlayerJustGotInCar 2019-07-04 01:02:00 +02:00
Filip Gawin 8cd2a19c4e CreateEntity 2019-07-04 01:02:00 +02:00
Filip Gawin de4252ace8 Introduce totalAudioEntities 2019-07-04 01:02:00 +02:00
Filip Gawin 198a92555c SetEntityStatus 2019-07-04 01:02:00 +02:00
Filip Gawin 9df4bc2029 PreTerminateGameSpecificShutdown 2019-07-04 01:02:00 +02:00
Filip Gawin 1abd694107 DestroyEntity 2019-07-04 01:02:00 +02:00
Filip Gawin bd23f2c425 PostTerminateGameSpecificShutdown 2019-07-04 01:02:00 +02:00
Filip Gawin 404d9bedd2 SetDynamicAcousticModelingStatus 2019-07-04 01:02:00 +02:00
Filip Gawin 7488f094e2 IsAudioInitialised 2019-07-04 01:02:00 +02:00
Filip Gawin c6256aab4f GenerateIntegerRandomNumberTable 2019-07-04 01:02:00 +02:00
Nikolay Korolev 835b7cac22 Fixed type of m_ItemToFlash 2019-07-04 01:23:19 +03:00
Nikolay Korolev 7fae683316 Script stuff + bug fixes 2019-07-04 01:16:24 +03:00
_AG 69b5c9f1e0 Update Frontend. 2019-07-03 17:30:26 +02:00
aap 936a8e8351 fixed boat rendering 2019-07-03 14:06:26 +02:00
aap 738bde1c15
Merge pull request #89 from ShFil119/test 
Check if address is used twice in InjectHook
 2019-07-03 13:43:40 +02:00
aap ecf29b7769 fixed car colour texture bug 2019-07-03 13:36:25 +02:00
aap 25865e68c4 cleaned up to be closer to original game 2019-07-03 13:13:55 +02:00
aap e8215cf560
Revert "Implemented frontend inputs." 2019-07-02 22:05:11 +02:00
Filip Gawin 34e8fffcb4 Fix address of IsPedHeadAbovePos 2019-07-02 21:38:31 +02:00
Filip Gawin b6a70ecb31 Check if address is used twice 2019-07-02 21:38:26 +02:00
_AG 5afa330e7d Removed macros from Pad.cpp: 
- Turned them in functions.
 2019-07-02 21:28:57 +02:00
_AG 6c693e3bbf Implemented frontend inputs. 
Fixed #66 and few other stuff.
 2019-07-02 14:36:40 +02:00
eray orçunus 27838ae0b2 Kangaroo cheat and bug fixes 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-02 06:01:26 +03:00
eray orçunus 8b36718c0a CPed fixes 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-07-01 19:29:21 +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 66d83c6470
Merge pull request #80 from ShFil119/special 
Implement GetSpecialCharacterTalkSfx
 2019-06-30 21:18:38 +02:00
aap af2e764d81 finished CEntity 2019-06-30 21:06:55 +02:00
Filip Gawin 321c7e4af7 Implement GetSpecialCharacterTalkSfx 2019-06-30 19:06:41 +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
aap d12db35a9f fix 2019-06-29 18:36:31 +02:00
aap 8946a20983 fix hud render states; bug in coronas 2019-06-29 17:54:09 +02:00
aap d711af4757
Merge pull request #71 from ShFil119/audio2 
Implement GetSomeoneTalkSfx methods of AudioManager
 2019-06-29 17:18:56 +02:00
Nikolay Korolev 14e0aae1bd fix 2019-06-29 18:07:57 +03:00
Nikolay Korolev e0488a7980 fix 2019-06-29 18:06:15 +03:00
Nikolay Korolev 01c04f3963 Fixed merge 2019-06-29 18:05:23 +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