mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
19464 commits 38 branches 54 tags 122 MiB
Commit graph

792 commits

Author SHA1 Message Date
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03:00
Nikolay Kasyanov
4138723bbf [OS X] Add libc++ to linker flags 2017-06-09 16:49:25 +02:00
Bret Curtis
5fa2f46499 only set libc++ for APPLE 2017-06-09 16:49:25 +02:00
Bret Curtis
26c023efe2 stdlib to libc++ 2017-06-09 16:49:25 +02:00
Bret Curtis
cb26f52032 matching ifs 2017-06-09 16:49:25 +02:00
Bret Curtis
5a65d6e18d fix std::move 2017-06-09 16:49:25 +02:00
Bret Curtis
433129e728 only bundle with Qt5, for now 2017-06-09 16:49:25 +02:00
Bret Curtis
dbc29854b2 try to fix enums 2017-06-09 16:48:40 +02:00
Bret Curtis
b657517bea use c++11 and see what happens 2017-06-09 16:48:40 +02:00
Koncord
c35d5a2c6c [Master] Implement Master server 2017-04-23 13:39:43 +08: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
ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2017-02-09 12:17:27 +02:00
scrawl
cdca9b0488 Accept bullet 283 on appveyor as well 2017-02-07 20:40:07 +01:00
scrawl
dfa43af818 Update bullet dependency to 2.86 2017-02-07 18:05:24 +01:00
David Cernat
0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 2017-01-19 12:14:25 +02:00
David Cernat
b1bcba3055 Use Qt 5 by default 2017-01-14 17:31:13 +02:00
David Cernat
76162fbfde Fix netlauncher target properties in CMake for Visual Studio 2017-01-14 17:14:04 +02:00
Koncord
90908ed113 rename openmw-netlauncher to tes3mp-netlauncher 2017-01-12 08:54:11 +08:00
Koncord
cb799ee446 Server browser 2017-01-11 22:05:40 +08:00
Koncord
27afb91936 RPI v3 patch #1 2017-01-03 19:03:51 +08:00
David Cernat
59c3dbe6af Merge pull request #120 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2016-12-30 23:59:30 +02:00
David Cernat
7bbeed629d Merge pull request #109 from OpenMW/master 
Add OpenMW changes up to 25 Nov
 2016-11-26 01:58:43 +02:00
Nikolay Kasyanov
ee7f5d7d85 [macOS] Move all configs & resources into app bundles 
Fixes #3566 (https://bugs.openmw.org/issues/3566).
 2016-11-25 02:54:02 +01:00
scrawl
5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure 
[macOS] Move all resources files inside application bundles (fixes #3566)
 2016-11-25 02:51:32 +01:00
Marc Zinnschlag
0874d69546 increased version number 2016-11-24 17:07:52 +01:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles 
Fixes #3566 (https://bugs.openmw.org/issues/3566).
 2016-11-23 22:32:54 +01:00
David Cernat
b028f0b51f Merge pull request #104 from OpenMW/master 
Add OpenMW commits up to 17 Nov
 2016-11-17 21:13:58 +02:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
7383cc9de4 Forgot to undo my test edits because I am a big dum-dum 2016-11-13 17:06:00 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
2efd38b1ab Fix install procedure so it works with all MSVC build configurations, not just Release 2016-11-13 13:32:42 -06:00
David Cernat
3136a12051 Resolve conflicts in pull request #75 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2016-10-14 18:34:17 +03:00
scrawl
105fcc5e20 Move the setting of BOOST_COMPONENTS closer to where it's actually used 2016-10-10 18:23:06 +02:00
scrawl
50bcb65ee0 Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms 2016-10-08 19:20:24 +02:00
Nikolay Kasyanov
4815938de2 [OS X] Add missing plugins to packaging script 
Source: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OSG_plugins
Issue: https://bugs.openmw.org/issues/3585
 2016-10-08 17:07:06 +02:00
David Cernat
91a6da9041 Merge pull request #67 from OpenMW/master 
Add OpenMW commits up to 28 Sep
 2016-09-28 18:53:54 +03:00
Bret Curtis
55fb33670c Make building osgQt dependant on building openmw-cs 2016-09-28 14:36:51 +02:00
David Cernat
3b7693c719 Resolve conflicts in pull request #55 
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2016-09-15 08:49:57 +03:00
Alexander "Ace" Olofsson
c01d9e9ec5 Only package the Qt 5 platform DLLs on Qt 5 2016-09-08 02:19:12 +02:00
Koncord
2567c35434 shut up variadic macros warning in GCC 2016-09-04 16:41:16 +08:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
Alexander "Ace" Olofsson
c9d4ff35c4 Install Qt5 platform DLLs on Windows 2016-08-29 18:40:40 +02:00
Alexander "Ace" Olofsson
d781846f53 Fix the /bigobj issue and some script cleanup 
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
 2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
dd5b6a46f5 Visual Studio 2015 support 2016-08-28 21:42:48 +02:00
David Cernat
4d2ca20445 Resolve conflicts in pull request #43 
# Conflicts:
#	README.md
 2016-08-24 22:03:35 +03:00
Marc Zinnschlag
cc7b1f8543 Merge branch 'openmw-40' 2016-08-24 09:59:50 +02:00
David Cernat
d31046204f Use tes3mp icon for executable 2016-08-23 23:50:20 +03:00
David Cernat
2ac0c4e689 Rename openmw to tes3mp for Windows too... 2016-08-19 05:36:24 +03:00
David Cernat
436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 2016-08-18 15:10:52 +03:00