Commit Graph

480 Commits

Author SHA1 Message Date
ptitSeb
698af6d1f8
Merge pull request #72 from twolife/exePath
small fix in FileSystem abstraction
2023-07-24 14:46:17 +02:00
Sébastien Noel
b22bd62dc8 fix exePath in the FileSystem abstraction, it should point to a file. 2023-07-24 13:21:33 +02:00
ptitSeb
9889193d0a
Merge pull request #71 from twolife/search_cdpath
Look at +cdpath parameter when searching for files to build menus
2023-05-15 11:47:29 +02:00
ptitSeb
7d70431301
Merge pull request #70 from twolife/mapscreen
Fix "Map Screen" when loading a level (no more black screen)
2023-05-15 11:46:23 +02:00
Sébastien Noel
907678afa5 Look at +cdpath parameter when searching for files to build menus 2023-05-15 11:38:46 +02:00
Sébastien Noel
24c71a34dd Fix "Map Screen" when loading a level (no more black screen)
This happen when the engine do not have access to the map graphics
 from both games (ie: we didn't copy "SE1_10.gro")
 Should fix https://github.com/icculus/Serious-Engine/issues/51
2023-05-15 11:31:14 +02:00
ptitSeb
cb0ad7a57f
Merge pull request #69 from twolife/splashscreen
don't segfault when hidding the splashscreen
2023-05-08 10:54:08 +02:00
Sébastien Noel
c4c6cc95e3 don't segfault when hidding the splashscreen 2023-05-08 10:17:51 +02:00
ptitSeb
7613c03331
Merge pull request #68 from twolife/spelling
spelling-error-in-binary, thanks Lintian
2023-05-04 16:51:25 +02:00
ptitSeb
92360e897e
Merge pull request #67 from twolife/useless-stub
Remove useless stub
2023-05-04 16:50:06 +02:00
ptitSeb
537f498d47
Merge pull request #66 from twolife/toggle-fullscreen
don't rebuild GL context to toggle fullscreen
2023-05-04 16:49:35 +02:00
ptitSeb
3e36706d26
Merge pull request #65 from twolife/pause
Pause the game when the window is minimized
2023-05-04 16:48:33 +02:00
Sébastien Noel
08c77c602c fixup! don't rebuild GL context to toggle fullscreen 2023-05-04 16:31:23 +02:00
Sébastien Noel
09b48d1176 don't rebuild GL context to toggle fullscreen 2023-05-04 15:43:34 +02:00
Sébastien Noel
65ff2cad03 Pause the game when the window is minimized 2023-05-04 15:24:34 +02:00
Sébastien Noel
d99ade2ea5 Not really possible/desirable
see https://github.com/libsdl-org/SDL/issues/5658
2023-05-04 15:22:02 +02:00
Sébastien Noel
e0e6cde47d we do not have "AfterSam.exe" on non win32 platform 2023-05-04 15:18:49 +02:00
Sébastien Noel
9a9f8e78a2 spelling-error-in-binary, thanks Lintian 2023-05-04 15:12:41 +02:00
ptitSeb
4c0b882e85
Merge pull request #63 from severusseptimius/master
A few corrections to the Readme.md file
2023-02-22 20:34:52 +01:00
severusseptimius
2796ccc179 Emphasize the fact that the ModEXT.txt file is needed just for SS:TSE 2023-02-22 21:17:55 +02:00
severusseptimius
12c2e526d8 Correcting the commands for the install script. 2023-02-22 21:05:10 +02:00
ptitSeb
507606ca19
Merge pull request #62 from severusseptimius/master
Fix Intro loop when here are no demos
2023-02-22 19:06:11 +01:00
severusseptimius
a659f2a769 Fix Intro loop when here are no demos 2023-02-22 18:44:02 +02:00
ptitSeb
d7d1d80ec5
Merge pull request #60 from pac85/master
Fix sniper FOV bug
2022-12-30 16:15:30 +01:00
antonino
3ef902a04a Fix sniper FOV bug 2022-12-30 15:01:36 +01:00
ptitSeb
01c14d2ac9
Merge pull request #59 from Pedro-Beirao/master
Check for AppleClang
2022-08-26 23:24:41 +02:00
PBeGood4
15d7cf315f Check for AppleClang 2022-08-26 19:31:15 +01:00
ptitSeb
9f44e31172
Merge pull request #57 from kytulendu/tfe_green_menu
Restore TFE green colors menu.
2022-05-20 19:41:59 +02:00
Khralkatorrix
a5b0e704fc Restore TFE green colors menu.
Patches from https://github.com/sultim-t/Serious-Engine-RT
2022-05-20 23:30:38 +07:00
ptitSeb
ab0aa4f6f7
Merge pull request #51 from iamthesenate1/master
Remove some redundant #ifdefs and added some new ones
2022-01-25 22:09:17 +01:00
iamthesenate1
da8f644d46 Remove some redundant #ifdefs and added some new ones 2022-01-25 22:06:56 +02:00
ptitSeb
9179b4e2f0
Merge pull request #49 from iamthesenate1/master
Some optimisations
2021-12-27 10:28:00 +01:00
iamthesenate1
3609bf4df8 Some optimisations 2021-12-27 11:22:24 +02:00
ptitSeb
0ab04baf9a
Merge pull request #48 from chewi/standalone-ecc
Allow ecc to be built independently using its own CMakeLists.txt file
2021-11-17 07:42:13 +01:00
James Le Cuirot
c09d18623e
Allow ecc to be built independently using its own CMakeLists.txt file
This makes cross-compiling easier, and saves having to build once each
for TFE and TSE.

I considered using CMake's import/export feature, but there's little
point when you're only importing one binary target. Pointing the ECC
variable at the ecc binary itself is simpler.

I copied the minimum CMake version of 2.8.7 from the parent
project. To be confident this would actually work, I tested building
under CentOS 7 with CMake 2.8.12.
2021-11-16 23:06:41 +00:00
James Le Cuirot
bd68934e32
Swap PLATFORM_* macros for standard ones in ecc
This simplifies the standalone CMakeLists.txt file arriving in the
next commit.

_WIN32 is defined by MVSC and the MinGW toolchain for all relevant
Windows versions.

We don't need to explicitly check for UNIX because it's the only
non-Windows case we care about.
2021-11-15 23:33:16 +00:00
James Le Cuirot
6087022b9c
Delete unused Sources/Ecc/unistd.h
It's not clear why this was added. It looks like a compatibility hack
for Windows, but we include io.h directly on Windows anyway.

Having this file present breaks building ecc separately on UNIX.
2021-11-15 23:31:11 +00:00
James Le Cuirot
229a87a620
Remove unused variables in ecc 2021-11-15 23:31:07 +00:00
ptitSeb
824986f62d
Merge pull request #47 from chewi/camera-Waddress
Fix GCC -Waddress warning in PlayCamera
2021-11-16 00:12:12 +01:00
James Le Cuirot
ad5655e60c
Fix GCC -Waddress warning in PlayCamera
GCC 11 says:

  Sources/Entities/Camera.es:397:10: warning: the compiler can assume
  that the address of ‘cm’ will never be NULL [-Waddress]

The MP version of Camera.es simply checks m_penTarget instead, so
that's what I've done here. It's not clear what the intention of the
original code was.
2021-11-15 22:24:00 +00:00
ptitSeb
8f1a2733d8
Merge pull request #43 from iamthesenate1/readme.md
Fix some typos and rephrase some sentences in README.md
2021-09-11 18:39:20 +02:00
iamthesenate1
90ed592ff7
Update README.md 2021-09-11 19:38:08 +03:00
iamthesenate1
4f54c49b08 Fix some typos and rephrase some sentences in README.md 2021-09-11 19:32:05 +03:00
ptitSeb
7fd3b651d1
Merge pull request #42 from iamthesenate1/GCC-11.x
Fix compilation with GCC 11.X
2021-09-04 13:51:57 +02:00
iamthesenate1
6f3ff98fa4 Fix compilation with GCC 11.X 2021-09-04 14:07:03 +03:00
ptitSeb
52313115bb Forgot this file for Pyra version 2021-08-02 09:02:35 +02:00
ptitSeb
f777ad622b Added PYRA option (also inverted Shoulder buttons function on Pandora/Pyra build) 2021-08-02 09:02:35 +02:00
ptitSeb
7aabe0bd70
Merge pull request #31 from linuxoidmc/master
macOS/ARM: little nasty typo fix in .sh and force -O0 flag for every …
2021-04-05 22:16:41 +02:00
Pavel Zenov
aff8f250eb macOS/ARM: little nasty typo fix in .sh and force -O0 flag for every build target as a temporary workaround for segfaults 2021-04-05 22:50:51 +03:00
ptitSeb
8cafd5f860
Merge pull request #30 from linuxoidmc/master
Initial support for Apple ARM64
2021-04-04 21:49:17 +02:00