Commit graph

34 commits

Author SHA1 Message Date
eray orçunus
732b760829 64-bit on Windows 2020-07-24 20:26:33 +03:00
Sergeanur
b26eec5daf Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp
2020-06-29 12:56:50 +03:00
Fire_Head
860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Fire-Head
1f1782c587 restore Text.cpp 2020-06-28 08:32:56 +03:00
Fire-Head
b8f633de24 fixes 2020-06-28 01:57:01 +03:00
Fire-Head
1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Sergeanur
af22bb1495 CText 2020-05-18 01:28:40 +03:00
aap
9558baa353 fixed CText to be 64 bit compatible 2020-05-16 12:52:37 +02:00
aap
b21f49ad6b fixed CText to be 64 bit compatible 2020-05-16 12:51:54 +02:00
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Sergeanur
dcd1ba6578 Fix CMessages::InsertStringInString 2020-05-03 01:40:37 +03:00
Sergeanur
fe353a7cc9 Fixes 2020-04-27 22:41:09 +03: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
eray orçunus
6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
Fire-Head
2308321805 Add polish lang support 2020-04-19 22:32:59 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Sergeanur
b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
Sergeanur
e373d0526e Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-15 00:10:50 +03:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
Sergeanur
c0c09f2720 Japanese 2020-04-05 12:02:51 +03:00
Sergeanur
bb8868eba7 Add russian lang support 2020-03-30 14:50:14 +03:00
Sergeanur
cd913404a3 Fix Text n Pager 2020-03-28 04:58:58 +02:00
Fire_Head
649aea7bf7
fix Messages.cpp 2019-10-27 07:46:54 +03:00
Sergeanur
ccf9c53049 Fixing array sizes in CMessages 2019-10-25 22:44:00 +03:00
Sergeanur
17441c972b Fix CPager::Process loop 2019-10-25 22:15:07 +03:00
Sergeanur
6fec864750 Fixes 2019-10-21 02:41:15 +03:00
Sergeanur
e35780df43 Full Messages 2019-10-21 01:11:47 +03:00
Sergeanur
c97a28b385 Full CPager 2019-10-20 20:34:16 +03:00
Sergeanur
383f70d1e7 Move Messages 2019-10-20 20:33:16 +03:00
Sergeanur
bc0ddc6b18 CText encoding fixes 2019-10-20 20:31:59 +03:00