Commit Graph

2839 Commits

Author SHA1 Message Date
aap
9950d105f7 Merge branch 'master' of github.com:gtamodding/re3 2020-04-30 10:17:26 +02:00
Sergeanur
080689589c Jap fixes 2020-04-30 02:27:15 +03:00
Nikolay Korolev
b1a093c6ff Merge remote-tracking branch 'upstream/master' 2020-04-29 23:35:17 +03:00
aap
d6bf0ec007 update librw 2020-04-29 21:33:10 +02:00
Nikolay Korolev
38655693f5 Merge remote-tracking branch 'upstream/master' 2020-04-29 21:56:25 +03:00
aap
3580e31ce0 Merge branch 'master' of github.com:gtamodding/re3 2020-04-29 20:53:54 +02:00
aap
804b022e67 implemented improved video modes for win.cpp 2020-04-29 18:24:25 +02:00
eray orçunus
fdb1580e15 Mouse wheel fix 2020-04-29 18:53:05 +03:00
Nikolay Korolev
71cacfcd21 Merge remote-tracking branch 'upstream/master' 2020-04-29 15:06:42 +03:00
aap
474b0418d3 for real this time 2020-04-29 13:34:53 +02:00
aap
0d37a202c5 fixed links 2020-04-29 13:26:48 +02:00
aap
6998e070ac fixed links 2020-04-29 13:24:43 +02:00
Nikolay Korolev
c035cd512a Merge remote-tracking branch 'upstream/master' 2020-04-29 12:59:59 +03:00
aap
0bdb558804 improvements (?) to premakefile 2020-04-29 11:44:26 +02:00
Nikolay Korolev
1e78278b5a Merge remote-tracking branch 'upstream/master' 2020-04-29 11:44:33 +03:00
aap
4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
2020-04-29 10:26:36 +02:00
aap
34194ff981
Merge pull request #498 from Sergeanur/premakestuff
premake stuff
2020-04-29 10:26:23 +02:00
Sergeanur
d5256f74e5 premake stuff 2020-04-28 23:50:59 +03:00
Nikolay Korolev
7608174224 Merge remote-tracking branch 'upstream/master' 2020-04-28 15:11:22 +03:00
aap
b32eedc230 haha re3 goes librrrrrrrrrw 2020-04-28 14:10:36 +02:00
aap
dc435a4165 Merge branch 'master' of github.com:gtamodding/re3 2020-04-28 13:41:03 +02:00
aap
79295346a0 silly librw bug 2020-04-28 13:40:57 +02:00
Sergeanur
299bbc47ec Changing prefixes for some audio fields 2020-04-28 14:00:38 +03:00
Nikolay Korolev
45d744ba20 Merge remote-tracking branch 'upstream/master' 2020-04-28 13:46:59 +03:00
aap
8304f035d9 librw update 2020-04-28 12:45:11 +02:00
Nikolay Korolev
d8371dcf80 Merge remote-tracking branch 'upstream/master' 2020-04-28 12:16:50 +03:00
Nikolay Korolev
d921871a88
Allow keyboard controls for flying cheats 2020-04-28 12:05:52 +03:00
aap
c7e2845602 removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp? 2020-04-28 10:56:30 +02:00
Nikolay Korolev
fcf9011601 Merge remote-tracking branch 'upstream/master' 2020-04-28 00:47:47 +03:00
Sergeanur
fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
aap
1180cc2947 Merge branch 'master' of github.com:gtamodding/re3 2020-04-27 20:56:53 +02:00
aap
f399fd1050 little support for gl3 textures; txd.img enabled again 2020-04-27 20:56:44 +02:00
Sergeanur
64e6af1db8 Fix tVehicleSampleData struct 2020-04-27 20:26:24 +03:00
Sergeanur
c94ccce6d6 Audio structs moved to their AudioManager.h 2020-04-27 20:06:54 +03:00
aap
d397a59951 Merge branch 'master' of github.com:gtamodding/re3 2020-04-27 12:31:49 +02:00
aap
d9c987bd8c fix (temporary?) for black bullet traces 2020-04-27 12:31:38 +02:00
Sergeanur
7bf45124e6 Fix use of integers instead of enum/bool/nil 2020-04-27 12:41:34 +03:00
Nikolay Korolev
9df04961ce Merge remote-tracking branch 'upstream/master' 2020-04-27 12:20:28 +03:00
Sergeanur
81fce4edab Audio fixes 2020-04-27 02:49:07 +03:00
Sergeanur
669bbe3cc7 Workaround for a crash on release 2020-04-27 01:55:06 +03:00
Nikolay Korolev
8f701e6470 Merge remote-tracking branch 'upstream/master' 2020-04-27 00:57:02 +03:00
Nikolay Korolev
ef5a70b8c0 librw update 2020-04-27 00:56:49 +03:00
Nikolay Korolev
a38a867cc5 sync with upstream 2020-04-27 00:55:22 +03:00
aap
a069aa57db Merge branch 'master' of github.com:gtamodding/re3 2020-04-26 23:54:48 +02:00
Nikolay Korolev
74fde1397e pools compatibility 2020-04-27 00:54:43 +03:00
aap
6efd322ec2 librw update 2020-04-26 23:54:38 +02:00
Nikolay Korolev
68bf239868
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
2020-04-27 00:53:54 +03:00
aap
e467cb08b8 Merge branch 'master' of github.com:gtamodding/re3 2020-04-26 21:51:11 +02:00
aap
1b5616688e tried to fix some half-pixel bugs 2020-04-26 21:50:52 +02:00
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