Commit graph

1305 commits

Author SHA1 Message Date
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
aap
ddc5118eea
Merge pull request #70 from Nick007J/master
Changed to actual crimes names
2019-06-29 10:51:57 +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
eray orçunus
c1600ef586 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-28 20:14:41 +03: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
b5cb82f478 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-28 19:19:37 +03: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
eray orçunus
15da9beff1 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-27 00:24:45 +03:00
aap
990d7f9d19
Merge pull request #48 from Nick007J/master
more replay stuff
2019-06-26 23:14:42 +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
eray orçunus
5b9e8e2ff2 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-26 23:19:41 +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
eray orçunus
ad110a1e9f Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-26 20:30:04 +03:00
aap
a91f40e79d CStreaming streams 2019-06-26 16:49:32 +02:00
eray orçunus
d30875d725 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-06-26 17:27:52 +03: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