a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 15:10:01 +00:00
Code Issues Projects Releases Wiki Activity
4367 commits 4 branches 2 tags 50 MiB
Commit graph

4367 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Korolev fa2eb24ba2 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-28 01:08:18 +03:00
Nikolay Korolev 433baf5f3c fix 2021-01-28 01:08:06 +03:00
aap 70c1f0640d add missing ferry vehicle desc 2021-01-26 19:24:22 +01:00
Sergeanur 0862c79b21 Merge branch 'miami' into lcs 
* miami:
  Fix anim id in replay
 2021-01-26 19:39:54 +02:00
Sergeanur 2d2625bf75 Fix anim id in replay 2021-01-26 19:39:05 +02:00
Sergeanur fb64bb314c
Merge pull request #992 from ForeverL95/ForeverL95-patch-1 
Add spanish translation for new strings
 2021-01-25 22:50:52 +02:00
ForeverL95 bc5f3abd3c
closer to the source text... 2021-01-25 14:46:54 -03:00
ForeverL95 1934bedde2
go back to the source... 
New fixes, trying to respect the source format.
Some improvisations, especially at the controls.
 2021-01-25 14:45:29 -03:00
Sergeanur cea8ad4b85 Fix check 2021-01-25 19:40:19 +02:00
Sergeanur 129d7333be Fix function dupe 2021-01-25 19:38:13 +02:00
Sergeanur 9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
Sergeanur c21e5f5e79 Move CRunningScript 2021-01-25 19:33:02 +02:00
Sergeanur c5ff13abca Update OpenAL 2021-01-25 18:50:27 +02:00
erorcun 202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
withmorten 9d4053419b
Merge pull request #977 from withmorten/miami-cw 
make building with Codewarrior 7 possible
 2021-01-25 14:06:53 +01:00
aap 785bd8ebcc proper ini fix 2021-01-25 13:02:00 +01:00
aap a4c5b87b90 more bletcherous stuff 2021-01-25 10:45:38 +01:00
aap fef87b9219 fix some breakage 2021-01-25 10:43:12 +01:00
aap 4f591aa87a ini fixes 2021-01-25 10:30:57 +01:00
aap d6544933aa
Merge pull request #984 from aap/lcs 
modelinfos
 2021-01-25 10:30:34 +01:00
ForeverL95 a01a9e5943
A necessary step back, again. 2021-01-25 01:44:06 -03:00
ForeverL95 ed4edb93e7
A necessary step back. 
I changed some text strings that I had modified, to a format more similar to the original.
 2021-01-25 01:43:26 -03:00
ForeverL95 8869f4ca4d
spanish gxt fixed 
Fixes and order in the file.
 2021-01-25 00:08:52 -03:00
ForeverL95 b137dba5db
a better txt work 
The same TXT file that I uploaded, but better ordered, so that it can work better.
 2021-01-25 00:06:28 -03:00
ForeverL95 ed2b985245
Add spanish translation for new strings. 
I have added missing text strings, mainly in the menu.
And I made some modifications to some translated strings.
 2021-01-24 20:06:13 -03:00
ForeverL95 d7e38b378e
Add spanish translation for new strings. 2021-01-24 19:59:23 -03:00
aap 453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
shfil 1ab96abb91 Add cmake option for sanitizers 2021-01-24 21:36:13 +01:00
shfil 513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
Sergeanur 0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
 2021-01-24 22:22:16 +02:00
Sergeanur c1f0fe1da6
Merge pull request #987 from Sergeanur/lcsHud 
Partial hud
 2021-01-24 22:19:31 +02:00
erorcun 071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
aap a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
Sergeanur e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
aap 1bee2caf5c CClumpModelInfo 2021-01-24 15:28:26 +01:00
aap 9361aeb8eb CTimeModelInfo and CWeaponModelInfo 2021-01-24 14:06:16 +01:00
aap 8cbae5d62a CSimpleModelInfo 2021-01-24 13:47:33 +01:00
shfil d68ec362dd
Fix CCollision::DistToLine 2021-01-24 12:36:43 +01:00
shfil ca1de3cd17
Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
aap c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
Nikolay Korolev 8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
Nikolay Korolev c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +03:00
Nikolay Korolev 4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00
Nikolay Korolev de32fbe75e another backport 2021-01-23 23:16:38 +03:00
Nikolay Korolev 4abebbe3b2 use ARRAY_SIZE 2021-01-23 23:12:25 +03:00
aap 4269e613a3
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch 
Fix plane / ccbb cheat flight pitch
 2021-01-23 21:06:33 +01:00
Sergeanur 2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00