scrawl
|
58f7a03626
|
Merge branch 'terrain18' into terraincollision
Conflicts:
apps/openmw/mwworld/scene.cpp
|
13 years ago |
scrawl
|
8bbb02a1bd
|
ogre 1.8 fixes
|
13 years ago |
Jason Hooks
|
b9fabce9c4
|
Awesome, working
|
13 years ago |
scrawl
|
72ff7ec030
|
Merge branch 'next' into occlusionquery
Conflicts:
apps/openmw/mwrender/sky.cpp
|
13 years ago |
Jason Hooks
|
318355f1be
|
Bouncy effect gone
|
13 years ago |
scrawl
|
18c2b5eb0a
|
Merge branch 'next' into occlusionquery
|
13 years ago |
Lukasz Gromanowski
|
5185a28b60
|
Issue #225: Initialize all class members in constructor.
|
13 years ago |
Lukasz Gromanowski
|
d3b88b9e34
|
Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
|
13 years ago |
Lukasz Gromanowski
|
a7ac0e526e
|
Issue #225: Added cleanup of parts of PhysicEngine.
Added cleanup of CMotionState inserted to RigidBody,
and btSortedOverlappingPairCache inserted to btDbvtBroadphase
in PhysicEngine.
|
13 years ago |
Lukasz Gromanowski
|
633e80cded
|
Issue #225: Added cleanup of maps used in PhysicEngine.
|
13 years ago |
Chris Robinson
|
f8f749dbec
|
Merge remote branch 'zini/next' into sound-rewrite
|
13 years ago |
scrawl
|
382fa6ac68
|
fixes
|
13 years ago |
Jason Hooks
|
e4251be529
|
Down gravity
|
13 years ago |
scrawl
|
53d4be5cf6
|
object pickup should work everywhere
|
13 years ago |
scrawl
|
17a4adfe88
|
add raycast method that returns _all_ objects that were hit
|
13 years ago |
Jason Hooks
|
18a139cd66
|
adding up and down move buttons
|
13 years ago |
Chris Robinson
|
2bc81a778b
|
Merge remote branch 'zini/next' into sound-rewrite
|
13 years ago |
scrawl
|
f959a5cbeb
|
auto adjust size of map window title bar
|
13 years ago |
scrawl
|
99b2b6b648
|
ogre 1.8 fixes
|
13 years ago |
scrawl
|
64212c0ee6
|
replaced all the StaticImage and StaticText in code
|
13 years ago |
scrawl
|
b0b41a9199
|
should now compile warning free
|
13 years ago |
scrawl
|
d451d7bb67
|
compile fixes for mygui 3.2
|
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 |
Jason Hooks
|
2b3e75718c
|
Updating everything
|
13 years ago |
Jason Hooks
|
ed7cb1dc67
|
restarting
|
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
|
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 |
k1ll
|
b7eb7ff8e3
|
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
|
13 years ago |
Michael Papageorgiou
|
3b6826b1ac
|
Set the attenuation model to linear, to be more in line with the vanilla game
|
13 years ago |
scrawl
|
9612ce595b
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision
Conflicts:
CMakeLists.txt
|
13 years ago |
Michael Papageorgiou
|
836732096e
|
Fix both relative and 3D sounds
|
13 years ago |
Nikolay Kasyanov
|
b4343431c6
|
Merged openengine into openmw
|
13 years ago |
Nikolay Kasyanov
|
48c12e9d5c
|
Merge mangle into openmw
|
13 years ago |
Marc Zinnschlag
|
4c240c644f
|
OpenEngine update (log fix)
|
13 years ago |
Marc Zinnschlag
|
e7fa1d94b8
|
Merge remote branch 'scrawl/shapefix'
|
13 years ago |
scrawl
|
ba0365a427
|
collision shape scale fix
|
13 years ago |
Marc Zinnschlag
|
12b7c6f1ac
|
Merge remote branch 'corristo/master'
|
13 years ago |
Marc Zinnschlag
|
be70d197e5
|
Merge branch 'next'
Conflicts:
.gitignore
cmake/FindOGRE.cmake
|
13 years ago |
Nikolay Kasyanov
|
70da2a2a99
|
removed tabs
|
13 years ago |
Nikolay Kasyanov
|
fa3fbf940c
|
Fix for OS X 10.6 support
|
13 years ago |
scrawl
|
f2b807142a
|
update mangle
|
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 |
Marc Zinnschlag
|
1652680e9b
|
mangle update (music workaround)
|
13 years ago |
Nikolay Kasyanov
|
cb780720bb
|
fix for string.h: use our own strnlen only on OS X < 10.7
|
13 years ago |
Marc Zinnschlag
|
69a00df01a
|
submodule update (uncommon crash fix)
|
13 years ago |
Marc Zinnschlag
|
db205cf8aa
|
Merge remote branch 'scrawl/next' into test
Conflicts:
libs/openengine
|
13 years ago |
scrawl
|
60856b46e6
|
moved the renderer update call from OMW::Engine to RenderingManager
|
13 years ago |
scrawl
|
f81b615976
|
implemented script functions FadeIn, FadeOut, FadeTo
|
13 years ago |
Marc Zinnschlag
|
4fcb721054
|
openengine update (physics crash workaround
|
13 years ago |
Marc Zinnschlag
|
258ab0218a
|
submodule update (issue #131)
|
13 years ago |
Marc Zinnschlag
|
7a1799d529
|
submodule update
|
13 years ago |
Marc Zinnschlag
|
7c8853f6fe
|
post-merge fixes
|
13 years ago |
Marc Zinnschlag
|
960654e58f
|
using new openengine version
|
14 years ago |
Jan-Peter Nilsson
|
6aa1f3efdd
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
14 years ago |
Marc Zinnschlag
|
57c3414fcd
|
OpenEngine update (bug-fix)
|
14 years ago |
Marc Zinnschlag
|
615f10b8c0
|
OpenEngine update
|
14 years ago |
Marc Zinnschlag
|
bd08e308f8
|
mangle update
|
14 years ago |
Marc Zinnschlag
|
68004630e9
|
OpenEngine update
|
14 years ago |
Marc Zinnschlag
|
647e88003e
|
build and activation fix
|
14 years ago |
Marc Zinnschlag
|
c82a2fe37d
|
OpenEngine enhancements
|
14 years ago |
gugus
|
40193253b0
|
fix some time bug
|
14 years ago |
Marc Zinnschlag
|
bf10471668
|
various OpenEngine improvements (don't forget to update your submodules)
|
14 years ago |
Jan-Peter Nilsson
|
e290f2f82f
|
Get physic fix in openengine and build nifbullet
|
14 years ago |
Marc Zinnschlag
|
1e9dc4b435
|
de-Windownizing and some build-fixes
|
14 years ago |
Marc Zinnschlag
|
940554b5fc
|
openengine update (remember to do a submodule update)
|
14 years ago |
athile
|
c459eb7c55
|
Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.
|
14 years ago |
Marc Zinnschlag
|
b6e7de6527
|
new mangle version (remember to update your subnodules)
|
14 years ago |
Yuri Krupenin
|
6b6ee5440e
|
Minimal set of fixes to build with MinGW.
|
14 years ago |
Nicolay Korslund
|
004541f5cf
|
Tested and applied Chris' sound patch.
|
15 years ago |
Nicolay Korslund
|
aa91b0232f
|
submodule update
|
15 years ago |
Jan Borsodi
|
ec8e92f7cd
|
Submodule update
|
15 years ago |
Nicolay Korslund
|
fd5f4a5e5e
|
Mangle update (OpenAL bugfix)
|
15 years ago |
athile
|
11d0eb0bf2
|
submodule updates
|
15 years ago |
Nicolay Korslund
|
5552c44753
|
Cleaned up strnlen in esm_reader. Added -Werror switch to g++.
|
15 years ago |
Nicolay Korslund
|
e30306f7c3
|
Removed redundant custom exception class
|
15 years ago |
Nicolay Korslund
|
d911653846
|
Merge with athile's WIP windows build
|
15 years ago |
Nicolay Korslund
|
ca13c09209
|
Merged in athile's changes to mangle and openengine
|
15 years ago |
Nicolay Korslund
|
e123fc1107
|
OpenEngine update (fixed crash bug)
|
15 years ago |
athile
|
336fb1636c
|
Windows fixes
|
15 years ago |
athile
|
9e2129c4b3
|
WIP Windows build
|
15 years ago |
athile
|
72fbeb9b9a
|
Mangle update
|
15 years ago |
Nicolay Korslund
|
064bc4b6c9
|
Finished sound system
|
15 years ago |
Nicolay Korslund
|
65c2070086
|
Temporarily disabled music
|
15 years ago |
Nicolay Korslund
|
ef9ed99622
|
Mangle update (not important)
|
15 years ago |
Nicolay Korslund
|
f2b2fe560f
|
Mangle update: Implemented streaming, fixed various bugs.
|
15 years ago |
Nicolay Korslund
|
08289158d7
|
Added support for WAV files with libsndfile
|
15 years ago |
Nicolay Korslund
|
9875d74abf
|
Implemented 3D sound placement. Sound management / lookup system not
done yet.
|
15 years ago |
Nicolay Korslund
|
979ea4e607
|
Mangle update for const error
|
15 years ago |
Nicolay Korslund
|
912c8b1f2d
|
Added mpg123 file reader
|
15 years ago |
Nicolay Korslund
|
ebcbff255e
|
Changed how avcodec/avformat (ffmpeg) is included
|
15 years ago |
Nicolay Korslund
|
cad9712411
|
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
|
15 years ago |
Nicolay Korslund
|
cf4185faef
|
Added sound test (remember to git submodule update)
|
15 years ago |
Nicolay Korslund
|
7516e4ca53
|
Added music playing as a test
|
15 years ago |
Nicolay Korslund
|
34572f0b19
|
Compiled and linked in sound system (not yet functional)
|
15 years ago |
Nicolay Korslund
|
925b5d29dd
|
Added back right version of libs/openengine/ submodule. Please run git submodule update.
|
15 years ago |
Marc Zinnschlag
|
d72ed19460
|
implemented script compiler for console
|
15 years ago |
Nicolay Korslund
|
c61212202b
|
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
|
15 years ago |
Nicolay Korslund
|
c84672a560
|
Added MyGUI to OpenMW, fully working (with events and script hooks)
|
15 years ago |
Nicolay Korslund
|
4eb2863db4
|
Added input to apps/mygui_dev/
|
15 years ago |
Nicolay Korslund
|
13d3f9c87e
|
Integrated OpenEngine, replaces entire components/engine/ directory.
|
15 years ago |
Nicolay Korslund
|
259908013e
|
Started integrating OE (NO-COMPILE)
|
15 years ago |
Nicolay Korslund
|
5005f5eb06
|
Fixed platform/strings.h to work again on Linux
|
15 years ago |
athile
|
b2485e8a52
|
Windows build fixes
|
15 years ago |
Nicolay Korslund
|
91f5c9c01f
|
Moved mangle submodule. Running 'git submodule update' should be enough.
|
15 years ago |
Marc Zinnschlag
|
e4f85cb3e6
|
directory structure reorganisation (still missing the mangle stuff)
|
15 years ago |