mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-27 23:23:44 +00:00
Code Issues Projects Releases Wiki Activity
2880 commits 3 branches 0 tags 63 MiB
Commit graph

2880 commits

This branch
This branch
All branches
Author SHA1 Message Date
blingu
79c652e115
Ped.h include not needed 2020-05-24 17:48:13 +02:00
Sergeanur
e259bb6609 fixes 2020-05-24 18:43:50 +03:00
blingu
55ece14f42
Update CopPed.cpp 2020-05-24 17:36:37 +02:00
nrb
25d3f948d3 Merge branch 'miami' of https://github.com/blingu/re3 into miami 2020-05-24 17:34:04 +02:00
nrb
d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Sergeanur
e4f136344c Merge remote-tracking branch 'origin/master' into opus 2020-05-24 18:25:53 +03:00
Nikolay Korolev
6235e2140e fixed filename 2020-05-24 17:23:14 +03:00
eray orçunus
14755a4ff4 all my fixes live in exes 2020-05-24 16:41:29 +03:00
aap
3fdd352ca2 CVehicle fixes 2020-05-24 15:14:56 +02:00
Nikolay Korolev
8705562559 how did saving even work in original III? 2020-05-24 15:58:25 +03:00
Nikolay Korolev
8c510a8d5b script fix 2020-05-24 15:00:45 +03:00
Nikolay Korolev
e248cbcc7d say goodbye to your saves 2020-05-24 14:01:01 +03:00
Nikolay Korolev
9c93cc7d6f Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 13:48:41 +03:00
Nikolay Korolev
cda3752838 comments 2020-05-24 13:48:17 +03:00
Nikolay Korolev
e95de89c9a script fix 2020-05-24 12:01:07 +03:00
aap
19a0c8b462
Merge pull request #583 from erorcun/miami 
Menu borders and weapon fixes
 2020-05-24 10:47:17 +02:00
aap
34f5e923ef
Merge pull request #582 from Nick007J/miami 
Set pieces
 2020-05-24 10:44:28 +02:00
eray orçunus
4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
Sergeanur
13a9441d5e Merge branch 'master' into opus 2020-05-24 01:45:10 +03:00
Sergeanur
f92770f74a Optimize ALDeviceList 2020-05-24 01:44:10 +03:00
Sergeanur
0c4ce002f1 Merge branch 'master' into opus 2020-05-24 01:07:03 +03:00
Sergeanur
7d30878418 Fix OAL crash 2020-05-24 01:06:19 +03:00
Sergeanur
3a7651e7ab Cleanup 2020-05-24 00:56:20 +03:00
Sergeanur
bd67db523a Merge branch 'master' into opus 
# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp
 2020-05-24 00:45:45 +03:00
Nikolay Korolev
6a7bd0e330 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 00:19:25 +03:00
Sergeanur
ac208ce02c Even more small audio cleanup 2020-05-23 23:25:14 +03:00
Sergeanur
f2790f610b More audio cleanup 2020-05-23 22:48:50 +03:00
Sergeanur
88b6168f1c Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
 2020-05-23 21:14:16 +03:00
Nikolay Korolev
2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
Nikolay Korolev
607175f02a set pieces 2020-05-23 20:06:52 +03:00
eray orçunus
5276abb0fb Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-23 18:04:52 +03:00
eray orçunus
c3b41d79a2 Cleanup and one needed function 2020-05-23 18:04:33 +03:00
erorcun
530b5ff58d
Merge pull request #581 from erorcun/miami 
Compatibility with VC weapon.dat + new shotguns
 2020-05-23 17:15:12 +03:00
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev
100e59886d
cranes fix 2020-05-23 16:14:39 +03:00
aap
9313bfa155 skeleton typos 2020-05-23 11:34:48 +02:00
aap
e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
Nikolay Korolev
9c6046455e fixed script 2020-05-23 12:17:05 +03:00
aap
df763bdb98
Merge pull request #580 from Nick007J/miami 
script fixes + a bit of CControllerConfigManager
 2020-05-23 01:19:51 +02:00
Nikolay Korolev
7b7b0fb5f2 removed debug 2020-05-23 02:18:16 +03:00
Nikolay Korolev
f8a509ffb3 fixes 2020-05-23 02:17:27 +03:00
Nikolay Korolev
b9115b4429 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 01:43:17 +03:00
Nikolay Korolev
7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
aap
b105403dc7
Merge pull request #578 from aap/miami 
CPhysical
 2020-05-23 00:12:06 +02:00
aap
a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
aap
8fb72afac9
Merge pull request #576 from Nick007J/miami 
new script commands - mostly stubs
 2020-05-22 23:55:29 +02:00
Nikolay Korolev
e18eb0ce01
script fix 2020-05-23 00:50:15 +03:00
Nikolay Korolev
6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
eray orçunus
c993e99e00 Fix linux build 2020-05-22 22:49:54 +03:00
Sergeanur
a9f332f2d9 Possibly fix travis 2020-05-22 21:26:31 +03:00