Nikolay Korolev
2343e69ce5
Merge branch 'lcs-dev' into lcs
2021-01-31 23:34:41 +03:00
Nikolay Korolev
251b2aaeb8
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-01-31 23:34:38 +03:00
Nikolay Korolev
48926fcade
multiplayer stuff
2021-01-31 23:34:19 +03:00
shfil
bb47f3a8e4
fix realloc
2021-01-31 15:02:15 +01:00
Nikolay Korolev
3677749935
Merge branch 'lcs-dev' into lcs
2021-01-31 01:38:48 +03:00
Nikolay Korolev
75a20216d9
sync
2021-01-31 01:38:43 +03:00
Nikolay Korolev
07a5cc6544
garages
2021-01-31 01:38:00 +03:00
Nikolay Korolev
01d4312251
Merge branch 'lcs' into lcs-dev
2021-01-30 20:27:26 +03:00
Nikolay Korolev
2c29ab5542
fix
2021-01-30 20:27:02 +03:00
Nikolay Korolev
c3c2a4269d
stuff
2021-01-30 20:23:30 +03:00
Nikolay Korolev
a0c5d75f83
fixed bike bomb
2021-01-30 14:55:00 +03:00
Sergeanur
d69b73eaa8
Merge pull request #998 from IlDucci/lcs
...
Updating Spanish.txt FOLLOWING the existing strings on master and mia…
2021-01-30 05:19:40 +02:00
Nikolay Korolev
4270180b8b
fix
2021-01-29 00:05:57 +03:00
Nikolay Korolev
2d5f087041
fix
2021-01-28 23:25:59 +03:00
Nikolay Korolev
9fc0ec0bf4
I hate ATanOfXY pt 2
2021-01-28 02:41:21 +03:00
Nikolay Korolev
3f8e258055
fix
2021-01-28 01:50:10 +03:00
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
Nikolay Korolev
9b1db9709b
Merge branch 'lcs' into lcs-dev
2021-01-26 21:10:55 +03:00
Nikolay Korolev
edb50b66a0
enum change
2021-01-26 20:46:42 +03: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
Nikolay Korolev
2fea28f194
fix
2021-01-26 02:27:57 +03:00
Nikolay Korolev
42d9d6abc8
syncd
2021-01-26 02:27:32 +03:00
Nikolay Korolev
46e63da4d8
sync
2021-01-26 02:25:47 +03:00
Nikolay Korolev
d7bd0be53e
garage stuff
2021-01-26 02:23:55 +03:00
IlDucci
3f80e92f2c
Updating Spanish.txt FOLLOWING the existing strings on master and miami, undoing LATAM contents
...
@ForeverL95 attempted to add Latin American Spanish elements into what's an originally European Spanish translation. If you want a Latin American Version, you should do a entire new file and not step into the existing one.
- Restoring all the new reLCS elements following what was done on miami, adding the new particularities/uppercasings currently in use.
- Removing all Latin American Spanish details (using íconos and not iconos, mouse instead of ratón, video instead of vídeo, Latin American Spanish verbal tense usage...)
2021-01-25 23:35:06 +01: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