Commit graph

3310 commits

Author SHA1 Message Date
aap
8c70c2a136 changes to librw layer, GLES now runtime choice 2020-11-18 10:32:18 +01:00
aap
448c56647f
Merge pull request #821 from aap/miami
CPed review part2
2020-11-18 10:04:12 +01:00
erorcun
1d600c640a
Merge pull request #816 from erorcun/miami
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 01:45:28 +03:00
erorcun
c6f53d25b0 Frontend: Stats, Map, Audio inputs, Radio selector 2020-11-18 00:33:45 +03:00
Sergeanur
e71da86a5c pragma twice 2020-11-16 15:05:29 +02:00
Sergeanur
cdd30f4da5 Move ColStore to collision 2020-11-16 12:49:23 +02:00
Nikolay Korolev
15b7126243 small fix of fix 2020-11-16 12:28:20 +03:00
Nikolay Korolev
0ac621588e small fix 2020-11-16 12:22:55 +03:00
aap
b82b79fa11 CPed review part2; and reverting some stylistic changes 2020-11-16 09:57:33 +01:00
aap
acdf602505 change gl caps.dat constants 2020-11-16 09:48:38 +01:00
aap
6804ad62c6 little fix to ps2 CPad 2020-11-16 09:48:15 +01:00
aap
8a8f2d4e5b
Merge pull request #815 from aap/miami
CPed review part 1
2020-11-16 09:45:47 +01:00
Sergeanur
9bb8ebaa10 Make collision code placement more like original (+ small fixes)
# Conflicts:
#	premake5.lua
#	src/CMakeLists.txt
#	src/collision/Collision.cpp
#	src/core/Collision.h
2020-11-16 00:36:54 +02:00
Nikolay Korolev
26c6908d25 car AI revision 2020-11-14 14:21:56 +03:00
Nikolay Korolev
6682e56f71 small fix 2020-11-13 17:53:03 +03:00
Nikolay Korolev
3048a77a05 fix 2020-11-13 16:02:06 +03:00
aap
257f45c3c3 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-13 13:14:56 +01:00
aap
8ab0d25b4a CPed review, part 1 2020-11-13 13:14:22 +01:00
Nikolay Korolev
a3f24d1bbf Merge remote-tracking branch 'upstream/miami' into miami 2020-11-13 13:20:07 +03:00
Nikolay Korolev
2e915780aa some fixes 2020-11-13 13:19:54 +03:00
aap
3d46f2a3af fixed bike collision damage 2020-11-12 20:05:02 +01:00
erorcun
4f8029ad7c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-11-12 17:37:04 +03:00
erorcun
b67ed1988f Peds: Remove redundant lines 2020-11-12 17:36:41 +03:00
Nikolay Korolev
55c9a81922 fixed zone bug 2020-11-12 17:32:16 +03:00
aap
90b624a3e0
Merge pull request #812 from Nick007J/miami
CWorld done + top gear fix
2020-11-12 11:40:19 +01:00
aap
0115b0827b fix wrong blend mode (original bug) 2020-11-11 19:10:22 +01:00
aap
79432dce20 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-11-11 14:42:12 +01:00
aap
ff44f29616 ped fix for new renderer 2020-11-11 14:42:02 +01:00
Nikolay
a76c6b2307 damn 2020-11-11 13:40:11 +03:00
Nikolay
984708dfd3
damn 2020-11-11 13:36:10 +03:00
Nikolay
a8b5303207
Update src/control/Pickups.cpp
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
2020-11-11 13:19:21 +03:00
Nikolay Korolev
35874b5fd2 fix 2020-11-11 12:27:40 +03:00
Nikolay Korolev
a67d4c70d7 Merge remote-tracking branch 'upstream/miami' into miami 2020-11-11 12:22:57 +03:00
Nikolay Korolev
be92957328 fixed top gear 2020-11-11 12:21:30 +03:00
aap
48d0653331 urgh, merge and changes to RW layer in one commit. 2020-11-11 09:38:33 +01:00
Nikolay Korolev
612a6dd06c Merge remote-tracking branch 'upstream/miami' into miami 2020-11-11 00:08:54 +03:00
Nikolay Korolev
ef2089cafb CWorld done 2020-11-11 00:08:32 +03:00
Sergeanur
5c64dba65a
Merge pull request #771 from theR4K/miamiDev
more audio for god of audio
2020-11-10 22:32:12 +02:00
aap
e87cd7077e
Merge pull request #811 from majesticCoding/miami
CGlass indices fix
2020-11-10 15:28:52 +01:00
majestic
cf6a9a8341 CGlass indices fix 2020-11-09 06:18:49 -08:00
Sergeanur
51e7f44433 Pickup fix 2020-11-08 22:40:05 +02:00
Sergeanur
23d294fef5 Possibly fix pickup money text 2020-11-08 21:59:13 +02:00
Roman Masanin
fb2173c396 to make Serge and _R4K_ happy 2020-11-08 22:33:30 +03:00
Roman Masanin
363a2c6098 marked stupied code(dotProduct and AudioEvents) 2020-11-08 22:26:14 +03:00
Roman Masanin
0853a47a3f returned bad code, becouse no one knows what to do with it 2020-11-08 21:23:29 +03:00
erorcun
fe5d0c9cdf Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-08 20:49:47 +03:00
Roman Masanin
95bd5b073a pointers into referencies! 2020-11-08 20:31:24 +03:00
Roman Masanin
a553ac8716 fix for merge fix 2020-11-08 17:49:10 +03:00
Roman Masanin
f8cc86c227 fix merge 2020-11-08 16:23:20 +03:00
Roman Masanin
23d23f6462 merge upstream 2020-11-08 16:23:05 +03:00