Commit graph

2910 commits

Author SHA1 Message Date
Nikolay Korolev
ff0e039599 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 12:44:40 +03:00
aap
9d16df5aa8
Merge pull request #562 from Xinerki/miami
Load VC frontend textures and use some
2020-05-19 10:41:17 +02:00
Xinerki
00ee82aba6 Zone and Vehicle text slant 2020-05-19 11:36:08 +03:00
aap
62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
Xinerki
d425358181 Load VC frontend textures and use some 2020-05-19 10:07:15 +03:00
Nikolay Korolev
a27fc8d9d9 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 01:49:51 +03:00
Nikolay Korolev
6510b15704 script revision 2020-05-19 01:49:09 +03:00
Nikolay Korolev
c47292b518
script fix 2020-05-19 00:10:45 +03:00
aap
abd230dcdd some less certainly fps fixes 2020-05-18 22:52:35 +02:00
aap
a8f4f74a76 only one sunbathe anim group 2020-05-18 22:25:06 +02:00
Nikolay Korolev
746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
shfil
3cda88ea20
Merge pull request #560 from GTAmodding/ShFil119-patch-1
Fix string assignment (aldlist.cpp)
2020-05-18 21:19:42 +02:00
shfil
6bf79120dc
Fix string assignment (aldlist.cpp) 2020-05-18 21:08:01 +02:00
shfil
37e462b9eb
Merge pull request #559 from ShFil119/travis
Add basic linux build on travis
2020-05-18 19:55:28 +02:00
Filip Gawin
b55ba13586 Add basic linux build on travis 2020-05-18 19:43:02 +02:00
Sergeanur
e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
aap
b05e6632be
Merge pull request #556 from Fire-Head/master
nullsampman
2020-05-18 17:08:32 +02:00
aap
2588e69849 some less certainly fps fixes 2020-05-18 16:55:38 +02:00
aap
68f1c03a85 fixes for braking and cloud rotation at high fps 2020-05-18 16:43:40 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
aap
2d4861454c
Merge pull request #557 from Nick007J/miami
script and script stubs
2020-05-18 13:08:24 +02:00
aap
8f9ce275c8
Merge pull request #558 from Sergeanur/VC/text
CText
2020-05-18 13:07:59 +02:00
Sergeanur
af22bb1495 CText 2020-05-18 01:28:40 +03:00
Nikolay Korolev
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
eray orçunus
f71cfdf8ef Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-18 00:27:36 +03:00
eray orçunus
96151ec0f0 TransformToNode crash fix? 2020-05-18 00:27:04 +03:00
Nikolay Korolev
ad8a8913d9 a few more stubs 2020-05-18 00:20:26 +03:00
Nikolay Korolev
fd2948f045 sync with upstream 2020-05-17 23:32:32 +03:00
Nikolay Korolev
39931a5284 some more script stubs 2020-05-17 23:31:16 +03:00
aap
d4a429d986 little cleanup on radar 2020-05-17 22:24:23 +02:00
aap
13903d7c46 radar sprites 2020-05-17 22:21:39 +02:00
eray orçunus
7bd6c70318 just in case 2020-05-17 22:17:43 +03:00
Nikolay Korolev
d5d2f6a822 sync with upstream 2020-05-17 21:48:21 +03:00
Nikolay Korolev
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
aap
8a7210cad1
Merge pull request #555 from erorcun/miami
Weapon fixes and thingies
2020-05-17 20:20:14 +02:00
Fire-Head
91fbfc1d23 nullsampman 2020-05-17 21:13:25 +03:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap
a0703fd9e1 loading screens 2020-05-17 19:45:21 +02:00
aap
3f2bdc096d some HUD colors 2020-05-17 15:57:59 +02:00
aap
4ab49780b5 collect HUD colors at top of file 2020-05-17 15:33:44 +02:00
aap
405a6fcbef Merge branch 'master' of github.com:GTAmodding/re3 2020-05-17 15:16:27 +02:00
aap
964acba083 fix head/hand atomics 2020-05-17 15:16:12 +02:00
aap
72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
Sergeanur
37480fb617 Fix compilation errors 2020-05-17 00:33:52 +03:00
Sergeanur
77f97ad2ad Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/audio/AudioManager.cpp
2020-05-16 23:58:44 +03:00
Sergeanur
ad0b99231e Remove magic consts from ms_aAnimAssocDefinitions 2020-05-16 23:54:44 +03:00
Nikolay Korolev
5c8888d2ed Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 23:09:34 +03:00
Nikolay Korolev
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Sergeanur
4ff0697b4d More small audio fixes 2020-05-16 21:00:27 +03:00