mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
4,554 Commits
38 Branches
54 Tags
122 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '00a2de432a'
${ noResults }
Commit Graph

353 Commits (00a2de432ab6904e993eb7f86be2cb4848cb10d6)

Author SHA1 Message Date
scrawl 4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 13 years ago
Alexander "Ace" Olofsson f7a03b39c4 Some improvments for windows builds and installer 13 years ago
Jason Hooks 1ce759af06 Merging in master 13 years ago
Nikolay Kasyanov 0c739825f2 another fix 13 years ago
Nikolay Kasyanov 582d7ab213 building & packaging improvements for OS X 13 years ago
Marc Zinnschlag b76fd249c7 updated changelog; bumped version number 13 years ago
Marc Zinnschlag afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 13 years ago
k1ll 8156e9e5c4 Fixed install search path for openmw.desktop. It's directly in the binary dir. 13 years ago
k1ll 2d6cd16296 Now Debian Packages install the configured openmw.desktop file. 13 years ago
k1ll dc2751f4ec Moved Build options to the top. I need this for my tar.gz packages but i think this is a good idea in general. 13 years ago
k1ll 226f312163 Set the version in the openmw.desktop file via CMake 13 years ago
Marc Zinnschlag a4fb71a0fc Merge remote branch 'scrawl/graphics' 13 years ago
scrawl a727bcd4a4 override nif transparency settings (part 1) 13 years ago
scrawl 944654f263 image rotating function 13 years ago
Jason Hooks 74deb5588d Post merge 13 years ago
Jason Hooks ebab98a8a0 Restructuring things 13 years ago
Alexander "Ace" Olofsson bf5a009299 Some improvements to the windows installer 13 years ago
k1ll f2c4e513a4 Add support for building with a static build of the MyGui Libraries. 13 years ago
scrawl 2b4b941192 Merge branch 'master' into gamesettings 13 years ago
Marc Zinnschlag 6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 13 years ago
Jason Hooks 07d0203a3c Merge remote-tracking branch 'upstream/master' 13 years ago
Chris Robinson 63e0e82049 Implement an Audiere-based decoder 13 years ago
scrawl c2a82c3d89 Merge branch 'master' into gamesettings 13 years ago
scrawl f4bbcb48a6 settings-default.cfg 13 years ago
Roman Melnik ed58e9e553 Merge remote-tracking branch 'upstream/master' 13 years ago
Jason Hooks 0021ccf862 Merge remote-tracking branch 'upstream/master' 13 years ago
Roman Melnik 35f787c4bf Merge remote-tracking branch 'upstream/master' 13 years ago
Nikolay Kasyanov 057c2f2e2a Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 13 years ago
Sebastian Wick fbd626baf6 mwiniimporter 13 years ago
Marc Zinnschlag 2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
 13 years ago
Nikolay Kasyanov b21a6291f7 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp
 13 years ago
Nikolay Kasyanov c3357c4396 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
 13 years ago
Roman Melnik ef2f7e841a Merge branch 'master' of github.com:Kromgart/openmw 13 years ago
Marc Zinnschlag f2075c7f4f temporarily silence warnigns in OGRE headers 13 years ago
scrawl e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 13 years ago
scrawl 6bea08157e Merge branch 'master' into terrain18 13 years ago
Marc Zinnschlag 2b2eb34f8f Merge remote branch 'corristo/master' into next 13 years ago
Nikolay Kasyanov 362e6cb9ed Removed predefined SDK path. Found that it's generally not good idea to force it. Also -Wno-unused-but-set-parameter only set for gcc 4.6 or newer 13 years ago
Roman Melnik 35c3a0a3f9 Add Boost_USE_STATIC_LIBS parameter for Windows 
If this parameter is not set in windows, cmake expects
boost libraries to be named "boost_*.lib", while they are
actually "libboost_*.lib"

In findBoost.cmake (728):

  # Setting some more suffixes for the library
  set (Boost_LIB_PREFIX "")
  if (WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN)
    set(Boost_LIB_PREFIX "lib")
  endif()
 13 years ago
Chris Robinson 2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 13 years ago
Nikolay Kasyanov 8e76451cda Fix launcher style installation on OS X again 13 years ago
Alexander "Ace" Olofsson dcdc759719 Adding readme to windows builds 13 years ago
scrawl 9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 13 years ago
scrawl 6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 13 years ago
scrawl 250fcab7c2 moved the mygui resources to a more suitable location 13 years ago
Chris Robinson 9a48002025 Fix compilation of the FFmpeg decoder 13 years ago
scrawl 66baf9ec81 Merge branch 'master' into mygui 13 years ago
Chris Robinson 74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 13 years ago
Marc Zinnschlag 50b79de10b Merge remote branch 'psi29a/master' 13 years ago
Brother Brick b6b972b73b Removed libbullet and libogre dependencies and added nvidia-toolkit. 
We are releasing OpenMW based on static libraries, so the first two
are no longer necessary
 13 years ago
Brother Brick 42584b013f Updated dependency to match our PPA 13 years ago
Jason Hooks ed7cb1dc67 restarting 13 years ago
Lukasz Gromanowski fc95917253 Fix for not visible pthreads function with glibc 2.15 
Linking error will appear:

Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 13 years ago
Jason Hooks 51fb9e67cd Merge 13 years ago
gugus 7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
Marc Zinnschlag cab869824a bumping version number 13 years ago
scrawl 3a00fbb950 removed mygui from source tree and use system install instead 13 years ago
Marc Zinnschlag 655f9fe920 Merge remote branch 'k1ll/staticogre' 13 years ago
k1ll b83b7d0650 Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin. 13 years ago
Chris Robinson 246b0266fb Remove references to Audiere. It's not supported for now. 13 years ago
Chris Robinson 45b612ab3b Add a skeleton output classs using OpenAL 13 years ago
Chris Robinson 42b445383f Remove Mangle- and OpenEngine-related sound code 
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
 13 years ago
gugus 5b08baf5bf a little fix for CMake to be able not to build the launcher 13 years ago
Nikolay Kasyanov 65fc141b62 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 13 years ago
Marc Zinnschlag 5b378e820d warning level adjustments and some related fixes 13 years ago
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 13 years ago
Marc Zinnschlag 311c0b04e2 Merge remote branch 'ace/win-warning' 13 years ago
Alexander "Ace" Olofsson 04494893c8 Added some release mode warnings 13 years ago
Marc Zinnschlag ff866269ec Merge remote branch 'corristo/pgrd' 
Removed a warning

Conflicts:
	CMakeLists.txt
 13 years ago
Alexander "Ace" Olofsson 477525ee48 Minor modification and spelling correction 13 years ago
Alexander "Ace" Olofsson ac0ba0c273 A little bit more commenting and sorting out the "normally not enabled" warnings 13 years ago
Alexander "Ace" Olofsson e7c3ddfe40 Final warning changes 13 years ago
Alexander "Ace" Olofsson 2f11bfc984 I think I've added all the warnings now 13 years ago
Alexander "Ace" Olofsson cecc823cd0 Commented list of disabled warnings to start with 13 years ago
scrawl d22678faab fixed wrong merge 13 years ago
scrawl 4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 13 years ago
Nikolay Kasyanov 6325697bfe Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name 13 years ago
Nikolay Kasyanov 387c84e606 small fix in CMakeLists, thx ace13 13 years ago
Nikolay Kasyanov 5328853445 Feature #37 (In Progress) Render Path Grid 
added "togglepathgrid" script command
 13 years ago
Alexander "Ace" Olofsson 5beee8598d Giving the windows installer a more personal look. 13 years ago
scrawl 8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 13 years ago
Pieter van der Kloet 2429f3960f Merge remote-tracking branch 'upstream/master' into launcher 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
 13 years ago
Nikolay Kasyanov 40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records 
Struct sizes seems correct, but floats is broken
 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 13 years ago
Marc Zinnschlag a86d2877fc Merge remote branch 'ace/win64-fixes' 13 years ago
Nikolay Kasyanov b283ad86fb revert to old launcher stylesheet location on OS X 13 years ago
Alexander "Ace" Olofsson 2c4ef5c670 64-bit install path on windows was easier to fix than expected. 13 years ago
Pieter van der Kloet 11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 13 years ago
scrawl f2c3616638 Merge branch 'next' into terrain_next 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake
 13 years ago
Pieter van der Kloet 5b54a658d8 Launcher improvements: ask for data dir and write it to cfg if none is found 
and prevent removal of the default profile
 13 years ago
Marc Zinnschlag 7505c96fbb Merge remote branch 'lgro/master' 13 years ago
Lukasz Gromanowski cb5534c608 Updated website URL in CMakeLists file. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 13 years ago
Nikolay Kasyanov 822f47fbac Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms 13 years ago
Pieter van der Kloet 280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 13 years ago
Marc Zinnschlag b2b09320fc Merge branch 'config' 13 years ago
scrawl 694a537b57 - removed caelum sources, resources, build scripts 13 years ago
scrawl f7462f980f added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS 13 years ago
Marc Zinnschlag db205cf8aa Merge remote branch 'scrawl/next' into test 
Conflicts:
	libs/openengine
 13 years ago
scrawl f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 13 years ago
Alexander "Ace" Olofsson 6a71cf21b0 Added OpenAL redistributable to OpenMW installer 13 years ago