Kyle Cooley
3a68f4bd8f
Fix travis build on master
...
- add luajit
- remove terra/callff
- fix template issue
- add missing include
- search for sol in extern
2018-05-20 14:26:25 -05:00
David Cernat
5bb09d3bed
Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwmp/WorldEvent.hpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
2018-04-01 11:34:04 +03:00
David Cernat
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
2018-03-30 10:28:52 +03:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +02:00
David Cernat
7ec08e125b
Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
2018-03-10 20:03:03 +02:00
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-03-09 21:07:46 +02:00
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
2018-03-08 21:23:24 +01:00
Kyle Cooley
e2103d0bea
Clean up find file for LuaJit, add one for Sol2
2018-01-04 21:40:17 -05:00
Koncord
ba07d7820f
[Server] Remove Terra
2017-12-10 10:20:24 +08:00
David Cernat
1ee460bba8
Merge pull request #344 from TES3MP/master
...
Add master commits up to 23 Nov 2017
2017-11-23 04:53:27 +02:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-23 04:51:13 +02:00
jbo-85
f896c9acb6
Fix search paths in FindSDL2.cmake to find SDL2 built from source
2017-11-19 11:56:24 +01:00
David Cernat
b801cf2c9e
Merge pull request #327 from TES3MP/master
...
Add master commits up to 26 Oct 2017
2017-10-26 17:34:00 +03:00
David Cernat
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
2017-10-26 17:28:56 +03:00
AnyOldName3
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
2017-10-24 23:29:18 +01:00
David Cernat
17a8e32782
Merge pull request #314 from TES3MP/master
...
Add master commits up to 16 Oct 2017
2017-10-16 07:47:37 +03:00
David Cernat
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-10-16 07:37:29 +03:00
AnyOldName3
a52c485090
Fix list length error
2017-10-12 18:16:10 +01:00
AnyOldName3
6af8ad70a5
Remove superfluous copy_all_files macro
2017-10-12 17:50:20 +01:00
AnyOldName3
76c4ff983a
Fix getting cmake property as variable
2017-10-12 17:17:25 +01:00
AnyOldName3
1f86fa3c31
Fix resource copying on non-MSVC targets
2017-10-12 17:09:01 +01:00
AnyOldName3
b00b94f0db
Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types.
2017-10-12 15:40:37 +01:00
AnyOldName3
f9a3562ccd
Remove duplicate macro definition and fix warning
2017-10-12 02:45:50 +01:00
AnyOldName3
5ceaaabeb2
Remove MESSAGE calls I accidentally left in
2017-10-11 22:08:49 +01:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01:00
Koncord
045dc566ea
Merge branch 'master' into new-script-api
2017-09-12 21:41:25 +08:00
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2017-09-12 07:38:49 +03:00
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
2017-09-10 18:30:10 +01:00
AnyOldName3
de14e43680
Seemingly fix everything by setting policies that were unset upon entering the macro
2017-09-10 03:18:22 +01:00
AnyOldName3
33c77d7a2a
Try using cmake_parse_arguments to make the macro work
2017-09-09 17:22:55 +01:00
krizd
c9f099ce07
Change CMake version check to include 3.8
2017-09-09 03:06:03 +01:00
AnyOldName3
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
2017-09-08 22:17:42 +01:00
Koncord
2d0840cb3a
[General] Modernize Script API
...
This commit changes the style of tes3mp serverside scripting mods. Short list of changes:
* Break compatibility with old server mods
* OOP style lua API
* Basic dependency checker, allowing the installation of multiple server mods without changing configs
* Remove support for C++ plugins
* Change outdated LuaBridge to [sol2](https://github.com/ThePhD/sol2 );
* Support GCC, Clang and MSVC compilers
* New environment variables: "TES3MP_SERVER_DIR" and "TES3MP_SERVER_USERDIR";
* New entity "Command controller" for registering new chat commands;
* New Event system
* Simplified Timer API
* All Lua mods now run in their own environments
* Add global namespace - Data that can be used for communicating between mods
* Player and Actor inherit base class NetActor
2017-08-28 00:15:56 +08:00
Koncord
b847914d6f
[General] Fix finding CallFF includes
2017-07-04 01:15:11 +08:00
Koncord
1c09e0c255
[Server] Add CallFF dependency
2017-06-30 17:58:41 +08:00
Koncord
9506f9ca35
[General] Allow luajit-2.1
2017-06-30 04:00:43 +08:00
Koncord
2d91c60a11
[General] Change "Lib" to "lib" in FindRakNet cmake module
2017-06-15 13:07:13 +08:00
Koncord
056ec2d434
[General] Fix CMake errors
2017-05-25 23:56:22 +08:00
Koncord
a27815fa7d
[General] Allow backslashes in add_component_dir to specify subgroups
2017-04-22 13:56:03 +08:00
Koncord
505905ab7d
[General] Allow backslashes in add_openmw_dir to specify subgroups
2017-04-18 16:49:21 +08:00
David Cernat
1d83098619
[Build] Use slilghtly retooled version of CMake's default FindLua51
2017-03-24 07:29:04 +02:00
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2017-03-13 18:20:07 +02:00
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
2017-03-07 21:53:49 +01:00
David Cernat
fb34e2c4ba
Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix"
...
This reverts commit faf1c416f3
2017-02-23 02:29:25 +02:00
Battlerax
faf1c416f3
[Build] Fix for MSYS2 build while maintaining MSVC fix
2017-02-22 16:22:05 -06:00
Battlerax
b47260f9dc
[Build] Fixed linker issue
2017-02-22 15:49:46 -06:00
David Cernat
213bc1e733
Print correct variable for Terra's library
2017-01-12 13:46:17 +02:00
David Cernat
10a0f165dd
Print paths used for server dependencies in CMake, change tabs to spaces
2017-01-12 13:45:04 +02:00
Koncord
cbae39412a
Fix RakNet module
2017-01-03 19:07:42 +08:00
U-VirtualBox-PC\Admin
6229269506
Some patches for lua on windows
2016-12-16 19:04:47 +03:00
