a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
855 Commits 4 Branches 2 Tags 50 MiB
Commit Graph

689 Commits

Author SHA1 Message Date
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
Filip Gawin 87997fffd7 Implement the rest of GetXTalkSfx 2019-06-29 14:07:32 +02:00
Filip Gawin 72ab729623 Implement some GetXTalkSfx methods 2019-06-29 14:07:32 +02:00
Filip Gawin 6c0f81f12a fixes for AudioManager::GetPhrase 2019-06-29 14:03:39 +02:00
Filip Gawin d4b566ecb2 AudioManager::GetPhrase 2019-06-29 14:03:39 +02:00
Nikolay Korolev 9b5392d3a1 ProcessPedUpdate 2019-06-29 14:38:37 +03:00
aap c7e33bd8e5 fix 2019-06-29 13:25:47 +02:00
aap 4bce84df4d missed two lines in CCollision 2019-06-29 11:57:47 +02:00
aap 9b689a1e6a Merge branch 'master' of github.com:GTAmodding/re3 2019-06-29 11:09:43 +02:00
aap b2f8c7eb23 miscellaneous, mostly world related 2019-06-29 11:09:33 +02:00
Nikolay Korolev 4c2f74c313 Changed to actual crimes names 2019-06-29 11:50:21 +03:00
aap f2d1ceb043 forgot the actual file... 2019-06-28 23:39:32 +02:00
aap dd3f1f88ac PS2-like MatFX from skygfx 2019-06-28 23:31:23 +02:00
aap 38a7b74b1a island load screen, some more CText 2019-06-28 22:23:55 +02:00
aap 0711bfacd4 fixed CFileMgr, the craziest bug i ever had 2019-06-28 21:24:22 +02:00
aap 48cf8b6629 misc stuff, mostly collision 2019-06-28 19:23:28 +02:00
aap bbb8a21fe1
Merge pull request #67 from gennariarmando/master 
Some Hud.cpp fixes.
 2019-06-28 19:00:44 +02:00
aap 3bc17b39c2
Merge pull request #68 from erorcun/erorcun 
Footsteps
 2019-06-28 19:00:26 +02:00
eray orçunus 7ab2ba9399 Footsteps 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-28 19:19:00 +03:00
_AG 39aefaffa5 Little ops. 2019-06-28 17:11:41 +02:00
_AG 6e0f961bde Some Hud.cpp fixes. 2019-06-28 16:57:14 +02:00
aap 5a93f67c88 CHud cleanup: fixes and cosmetic treatment 2019-06-28 13:28:42 +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 9f07569bd6
Merge pull request #62 from erorcun/erorcun 
Several little mistakes in CPed
 2019-06-27 14:18:54 +02:00
aap f6c767d87c CStreaming almost done 2019-06-27 14:17:42 +02:00
eray orçunus 86ecf6523d Several little mistakes in CPed 
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
 2019-06-27 15:01:55 +03:00
aap d74b8fa952 started filling debug menu 2019-06-27 10:58:51 +02:00
aap ff56b39a27
Merge pull request #61 from gennariarmando/master 
Finished Hud.cpp
 2019-06-27 09:53:55 +02:00
_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