Commit Graph

1568 Commits

Author SHA1 Message Date
Sergeanur
f0890b1112 Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-26 22:03:15 +03:00
Sergeanur
4dc2f30791 Remove little hack 2020-04-26 21:58:12 +03:00
aap
c076998ba3 update librw 2020-04-26 20:18:10 +02:00
aap
41586c7cda fixes for glfw 2020-04-26 20:16:31 +02:00
Sergeanur
b7ee3792df Remove struct workaround in CControllerConfigManager 2020-04-26 20:11:19 +03:00
Sergeanur
1a44bcccd5 A few fixes 2020-04-26 14:18:34 +03:00
Sergeanur
4f763cba49 Fix compilation error 2020-04-26 13:59:06 +03:00
aap
7052b0b64c
Merge pull request #492 from erorcun/erorcun
Initial GLFW support
2020-04-26 12:49:31 +02:00
eray orçunus
6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
aap
ea79cc4469 update librw 2020-04-25 15:56:20 +02:00
aap
8289b42c9e fixed shooting target 2020-04-25 14:37:58 +02:00
aap
241352e312 real names (from LCS) 2020-04-25 14:03:20 +02:00
aap
f15a5ac0f9 using librw GS alpha test emulation 2020-04-25 12:16:50 +02:00
aap
05bba73225 Merge branch 'master' of github.com:gtamodding/re3 2020-04-25 11:26:05 +02:00
aap
dbc810044e librw 2020-04-25 11:25:46 +02:00
aap
ad9ebbd390
Merge pull request #490 from aap/debugmenu
implemented debugmenu
2020-04-25 11:25:19 +02:00
aap
ac19de45b8 few fixes 2020-04-25 00:41:17 +02:00
Nikolay Korolev
4b883f2b40
disable mouse steering by default 2020-04-24 20:50:00 +03:00
aap
5bb4e99926 implemented debugmenu 2020-04-24 14:08:06 +02:00
aap
17dda21cca
Merge pull request #488 from aap/master
Skinned Peds
2020-04-24 13:49:30 +02:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
aap
6467e2003a Merge branch 'master' of github.com:gtamodding/re3 2020-04-23 22:10:46 +02:00
Nikolay Korolev
458eb3a4f0
removed fix that made no sense 2020-04-23 16:40:19 +03:00
Fire_Head
e1495ba9df
Merge pull request #485 from Fire-Head/master
ps2 particle
2020-04-23 11:58:38 +03:00
Fire_Head
ff46dc1c6c
Merge branch 'master' into master 2020-04-23 11:50:06 +03:00
Fire-Head
2925b7e0c3 fix #ifdef 2020-04-23 11:35:42 +03:00
Fire-Head
75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
shfil
56eebfc8d7
Merge pull request #482 from withmorten/master
switch out milessdk with fake miles header and lib
2020-04-22 13:35:11 +02:00
erorcun
9660594634
Merge pull request #481 from erorcun/erorcun
Crossplatform work continues
2020-04-22 14:08:01 +03:00
eray orçunus
c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Fire_Head
f754e05321
Merge pull request #483 from Fire-Head/master
fix RenderExtraPlayerShadows
2020-04-21 22:56:16 +03:00
Fire_Head
828dc85be5
fix RenderExtraPlayerShadows 2 2020-04-21 22:53:55 +03:00
Fire_Head
fba4c51f6b
fix RenderExtraPlayerShadows 2020-04-21 22:52:42 +03:00
withmorten
2cb0df1ef3 switch out milessdk with fake miles header and lib 2020-04-21 15:09:08 +02:00
aap
959f84ff95 fixed extra directory issues 2020-04-21 13:56:33 +02:00
aap
9c2fd41bce librw 2020-04-21 13:40:44 +02:00
aap
6571715cb2 librw skin pipe 2020-04-21 01:27:27 +02:00
aap
5603546856 Merge branch 'master' of github.com:gtamodding/re3 2020-04-20 20:17:43 +02:00
aap
6494bdaf11 librw 2020-04-20 20:17:34 +02:00
shfil
7794cca429
Merge pull request #477 from ShFil119/mingw
Try to make code working on more platforms
2020-04-20 19:50:12 +02:00
aap
36f7550f84 updated librw again 2020-04-20 19:20:22 +02:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
aap
98fc8ecef0 update librw (matfx) 2020-04-20 16:05:39 +02:00
Fire_Head
c9920b6a2d
Merge pull request #480 from Fire-Head/master
camerapickup ps2 code
2020-04-20 08:21:27 +03:00
Fire-Head
556a6df401 camerapickup ps2 code 2020-04-20 08:17:08 +03:00
Fire_Head
0a07a2233b
Merge pull request #479 from Fire-Head/master
OddJob sliding text
2020-04-20 07:46:44 +03:00
Fire-Head
83810168ee beta OddJob(unique jump etc) sliding text 2020-04-20 07:45:17 +03:00
Fire_Head
37e92013db
Merge pull request #478 from Fire-Head/master
fixed missing keys in gxt for PL/RU langs
2020-04-20 07:21:17 +03:00
Fire-Head
753343bcac rem english.gxt 2020-04-20 07:20:14 +03:00
Fire-Head
81ca8596c8 fixed missing keys in gxt for PL/RU langs 2020-04-20 07:18:26 +03:00