scrawl
13afcc9324
Don't link to OgreTerrain
12 years ago
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
12 years ago
scrawl
5c8950f91c
Merge branch 'master' of git://github.com/zinnschlag/openmw
12 years ago
Sebastian Wick
b43f41c2bd
use a mygui controller for scrollbar repeat
12 years ago
scrawl
123a60581f
Only link to SDL2main on windows
12 years ago
Alexander "Ace" Olofsson
0a2ed8b0d7
Make OpenMW able to initialize SDL in windows builds
12 years ago
Nikolay Kasyanov
5984a15846
We don't need Carbon on OS X anymore
12 years ago
scrawl
ab3634d692
Removed some remains of OIS
12 years ago
scrawl
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
12 years ago
scrawl
daab4f55a3
Use Morrowind's fonts
12 years ago
scrawl
7a2d1cd8ce
Security skill
12 years ago
scrawl
0c4a963132
Container UI rewrite
12 years ago
scrawl
c6edb0288a
Remove unused file
12 years ago
scrawl
78e6dab9d2
Dialogue history rewrite WIP
12 years ago
scrawl
2a42556aa5
Merge branch 'master' into HEAD
12 years ago
Chris Robinson
d17e1e83d5
Rename MWRender's Player to Camera
12 years ago
scrawl
9343b4459e
Opening doors
12 years ago
Nathan Jeffords
f02a53b121
Created a helper class to format books for display from the journal
...
view-model data.
12 years ago
Nathan Jeffords
50d688c2fc
Created a view-model to present journal data to the UI in the form it
...
intends to display it.
12 years ago
Nathan Jeffords
55ca037411
Created a MyGUI widget to present a page of formatted text.
12 years ago
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
12 years ago
gus
b5b0e7a656
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
12 years ago
Britt Mathis
d768f6b57e
Deleted *_* files in MwGui, builds.
12 years ago
Marc Zinnschlag
e8c32d0c3d
MWWorld::Player cleanup
12 years ago
gus
1eb3d3e10e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
...
Conflicts:
apps/openmw/CMakeLists.txt
12 years ago
Chris Robinson
04aeb3dd07
Rename Mechanics' Activators to Objects
12 years ago
gus
63424ade56
refactoring
12 years ago
scrawl
b0199c703c
Companion UI
12 years ago
scrawl
51204f098e
Added soulgem dialog; made interactive message boxes not close the previous UI
12 years ago
Marc Zinnschlag
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
12 years ago
Glorf
6643fe789c
Enchanting system
12 years ago
scrawl
a2ca679beb
Added PC repair feature
12 years ago
scrawl
20774f8f81
Added merchant repair feature
12 years ago
Glorf
521bebd2f4
Fallback system rewritten, added light fallbacks
12 years ago
scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
scrawl
cf87708c1f
Magic effect icons for spells
12 years ago
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
12 years ago
scrawl
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
12 years ago
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
12 years ago
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Chris Robinson
bbde0146a7
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
12 years ago
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Chris Robinson
6a9755778e
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
Marc Zinnschlag
1a079ec8d3
Merge branch 'master' into next
12 years ago
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
scrawl
d47090b312
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Nikolay Kasyanov
0d4b0bfd93
Trying to resolve sound issues on OS X with ffmpeg backend
12 years ago
Chris Robinson
2c39760bd5
Move the movement solver code to mwworld's physics system
12 years ago
Marc Zinnschlag
86fb3574a0
Merge remote-tracking branch 'wheybags/master' into next
12 years ago
Chris Robinson
bd4fdf47a3
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/sky.cpp
12 years ago
scrawl
0f37c24d5f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
Chris Robinson
1747c1e01a
Integrate a new movement solver to handle object movement and collisions
...
Temporary, and pretty breoken. Needs some serious integration fixes.
12 years ago
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
12 years ago
Tom Mason
ac112ef972
refactored special variable code
12 years ago
Marc Zinnschlag
c97553703a
fixes for static build without cg
12 years ago
scrawl
a461b282c1
water ripples (experimental)
12 years ago
Chris Robinson
8d98f3649c
Use a separate class to handle activator mechanics
12 years ago
Chris Robinson
94b93227d3
Treat activators as actors for rendering and mechanics
...
Kinda hacky, but it's the only way to get animated activators (flags, silt
striders, etc) to work properly.
12 years ago
Jordan Milne
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
12 years ago
Chris Robinson
771a5f7316
Add the beginnings of a character controller
12 years ago
Jordan Milne
6449f68d61
Merge branch 'master' into sdl_input
12 years ago
Jordan Milne
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
12 years ago
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
scrawl
35f4d09288
swscale handled better (cmake)
12 years ago
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
12 years ago
Marc Zinnschlag
5d45bcd03a
Merge remote-tracking branch 'trombonecot/master'
...
Conflicts:
apps/openmw/mwclass/light.cpp
12 years ago
eduard
82ea547ce4
Failed action
12 years ago
Marc Zinnschlag
3dc013ceae
Merge remote-tracking branch 'gohan/Gohan'
12 years ago
marcin
4b939c7521
Feature #391 Dummy AI package classes
12 years ago
marcin
698afbec3e
Feature #391 Dummy AI package classes
12 years ago
Marc Zinnschlag
4614d2bc8e
Issue #219 : added basic select struct analysis and type checking
12 years ago
Marc Zinnschlag
1502b3f6f8
Issue #219 : Begin of refactoring; added filter class (doesn't do anything yet)
12 years ago
greye
7cf0b8a680
just replace esmstore, inconsistent
12 years ago
greye
2057f5619e
move ESMStore to MWWorld
12 years ago
Marc Zinnschlag
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
12 years ago
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
12 years ago
scrawl
1a2034b4dd
training window
12 years ago
gugus
4f5c4bf89a
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
12 years ago
Marc Zinnschlag
cd343c4fbd
Issue #61 : Basic alchemy class (doesn't do anything yet)
12 years ago
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
12 years ago
gugus
3060fbee60
TravelGUI, not completly finished.
12 years ago
scrawl
73c69e8eda
video playback
12 years ago
scrawl
9d7c35ae48
and go
12 years ago
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
scrawl
86cfc91ef3
global map rendering
12 years ago
scrawl
0ba996f290
dialog layout
12 years ago
scrawl
95f3a20e2c
Merge branch 'master' into levelup
12 years ago
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
12 years ago
Marc Zinnschlag
b7c9285b24
added support for out of world rendering
12 years ago
scrawl
b76a28f69c
beginnings of the gui
12 years ago
scrawl
d90af9c524
Merge branch 'master' into characterpreview
12 years ago
Marc Zinnschlag
835c530e06
Merge branch 'ingredients'
12 years ago
Marc Zinnschlag
fe68a252d5
Issue #356 : Implemented ingredient eating
12 years ago
scrawl
4f3eb3c34a
character preview WIP
12 years ago
scrawl
2b339f6c0f
loading screen
12 years ago
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
12 years ago
Adam Hogan
562df5388f
Merge branch 'master' of git://github.com/zinnschlag/openmw
12 years ago
Adam Hogan
ebf80943a9
Added spell buying window
12 years ago
Lukasz Gromanowski
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
12 years ago
Marc Zinnschlag
345eec1135
Issue #389 : added AI package base class and AI packages management class
13 years ago
scrawl
5ebcaeb098
Merge branch 'next' into quick_keys
13 years ago
scrawl
fab4cfecb1
some unfinished work on quick keys window
13 years ago
Nikolay Kasyanov
5395721c26
more appropriate fix for #189
13 years ago
scrawl
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
Lukasz Gromanowski
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
scrawl
86d6f190bf
Input system rewrite
13 years ago
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
0231533d05
Issue #107 : InputManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
b68f9d6a28
Issue #107 : MechanicsManager is accessed only through the interface class from now on
13 years ago
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
Marc Zinnschlag
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
13 years ago
Marc Zinnschlag
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
d00d40cc3f
Issue #107 : Journal is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
13 years ago
greye
ec9cf4d3c6
rotateObject() added, input system rewritten
13 years ago
Marc Zinnschlag
28ecfb4290
Issue #107 : ScriptManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
13 years ago
scrawl
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
13 years ago
scrawl
4434fb640e
Merge branch 'master' into shadersystem
13 years ago
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
13 years ago
scrawl
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
Marc Zinnschlag
da916cecfb
fixed a bug in a cmake script that resulted in some files being compiled twice
13 years ago
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
Marc Zinnschlag
29b4a5e5f7
Issue #314 : added apply actions
13 years ago
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
13 years ago
scrawl
3537af051d
removed the old shader helper
13 years ago
Marc Zinnschlag
771863e73b
Issue #324 : Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
13 years ago
scrawl
a1e48b0feb
builds now
13 years ago
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
Marc Zinnschlag
035c1c4b6e
added World interface class; cleanup of World interface
13 years ago
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
13 years ago
scrawl
c7268233df
spell window layout & opening/closing/pinning logic
13 years ago
scrawl
f1d3978897
Issue #290 : Auto-Close MW-reference related GUI windows
13 years ago
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
13 years ago
scrawl
689cf7ce05
ConfirmationDialog
13 years ago
scrawl
313294c522
settings window (hotkey F2) which does nothing. Yay!
13 years ago
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
3e85151c9d
Merge remote branch 'scrawl/inventoryGUI'
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
Marc Zinnschlag
9f1919a230
Issue #256 : added active spell management (completely untested)
13 years ago
Marc Zinnschlag
a4343bfa18
Issue #256 : added TimeStamp class
13 years ago
scrawl
0c1d06d9f7
added some trade window stuff, which does nothing yet.
13 years ago
scrawl
0f1e09d2c1
make Class::use method return an equip action for equippable items, add sound for equipping
13 years ago
scrawl
24a0fecd37
implemented item count selection dialog
13 years ago
scrawl
967fb13fca
remove the old inventory code, split HUD, map and mainmenu into seperate implementation files
13 years ago
scrawl
296dbce298
Merge branch 'master' into graphics
13 years ago
scrawl
a1b86acc38
Merge branch 'master' into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
files/mygui/core.xml
13 years ago
gugus
8e8f80807e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/armor.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/clothing.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/light.cpp
apps/openmw/mwclass/lockpick.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/probe.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwclass/weapon.cpp
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
apps/openmw/mwworld/class.cpp
13 years ago
scrawl
cd351ba3af
simple scroll text parsing (tags are ignored until now)
13 years ago
scrawl
499dd26398
dialogue window topic list word-wrapping
13 years ago
scrawl
9fc1138a87
opening, closing and taking books/scrolls works
13 years ago
scrawl
0e6b82284f
book & scroll windows
13 years ago
scrawl
aaa81397ed
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
scrawl
11ebae3be2
toggleCompositors command useful for debugging
13 years ago
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
13 years ago
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
Marc Zinnschlag
2bfd90f3f9
Issue #255 : added new environment class (not in use yet)
13 years ago
gugus
d4e9b62436
oups forgot to modify CMake
13 years ago
gugus
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
gugus
b309d245c5
cleaning up hircine work
13 years ago
scrawl
cac662ca98
basic tooltips
13 years ago
Marc Zinnschlag
37f478b69a
Merge branch 'spells'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwmechanics/npcstats.hpp
13 years ago
Marc Zinnschlag
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
13 years ago
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
13 years ago
Marc Zinnschlag
750d79eaf0
added spell container class
13 years ago
scrawl
2a4fcf42a3
basic shadows
13 years ago
Marc Zinnschlag
0aecb0ed5c
cmake fix
13 years ago
Marc Zinnschlag
f52b9cc162
Merge branch 'autoequip'
13 years ago
Roman Melnik
bdbb8a8d84
Merge remote-tracking branch 'upstream/master' into windowsPinning
...
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
13 years ago
Roman Melnik
72b3f6121d
Windows Pinning: add files to CMakeLists.txt
...
Add new files (map_window and window_pinnable_base)
13 years ago
Chris Robinson
63e0e82049
Implement an Audiere-based decoder
13 years ago
Marc Zinnschlag
d717b7b9dd
factored out actor related game mechanics code into a separate class
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
scrawl
4a6d034591
Merge branch 'master' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
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
scrawl
72ff7ec030
Merge branch 'next' into occlusionquery
...
Conflicts:
apps/openmw/mwrender/sky.cpp
13 years ago
Alexander "Ace" Olofsson
55f1053b4f
Windows fixes for compiling and linking
13 years ago
scrawl
18c2b5eb0a
Merge branch 'next' into occlusionquery
13 years ago
Chris Robinson
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
13 years ago
scrawl
5fba52c238
Merge branch 'terrain18' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
scrawl
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
scrawl
f4898539e9
added some code that doesn't do anything yet, waiting for ogre 1.8
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
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
13 years ago
Marc Zinnschlag
47bcbdef17
Merge remote branch 'scrawl/mygui' into mygui
13 years ago
Marc Zinnschlag
0adbe258fd
Issue #217 : made Ptr track container; fixed a cmake script bug
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
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
scrawl
3a00fbb950
removed mygui from source tree and use system install instead
13 years ago
Chris Robinson
46cd84aac5
Add a skeleton ffmpeg decoder
13 years ago
Chris Robinson
10037e79e7
Add a skeleton decoder class using mpg123 and libsndfile
13 years ago
Chris Robinson
45b612ab3b
Add a skeleton output classs using OpenAL
13 years ago
k1ll
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
13 years ago
scrawl
4813a1ce9d
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
13 years ago
scrawl
771f920c2c
Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap
13 years ago
scrawl
5b38b17baf
local map rendering (nothing to see yet, as it is not displayed in GUI)
13 years ago
Marc Zinnschlag
84c8cd3720
added InventoryStore class (doesn't do anything yet)
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
scrawl
f34b2c73c5
committing the terrain material generator from ogre 1.7.4, it seems to
...
be almost impossible to make a derived class of TerrainMaterialGeneratorA
because of the many classes it contains and the inter-relationships
between them; just adding the whole source makes it a lot easier to modify
if we decide to update this source from OGRE upstream at any point
(which seems unlikely), we can take the diff from this commit on
to see the changes we did to the material generator
13 years ago
Marc Zinnschlag
739870489a
Merge remote branch 'scrawl/weather' into weather
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
Marc Zinnschlag
26bd2be1e8
Merge branch 'equipment' into next
13 years ago
Marc Zinnschlag
af23cc352e
more cleanup
13 years ago
scrawl
c1fb5ce769
added (incomplete) WeatherManager, created by World
13 years ago
scrawl
2d8b0a4ac0
merged the sky manager implementation with its interface
13 years ago
scrawl
694a537b57
- removed caelum sources, resources, build scripts
13 years ago
scrawl
04d7db2860
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
13 years ago
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag
52a6605f10
Merge remote branch 'mirc/refactor_wm' into refactor_wm
...
- changed the way dynamics stats are passed to the character creation object
- some more clean up
Conflicts:
.gitignore
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
13 years ago
Cris Mihalache
d17ba6ce19
Forgot the CharacterCreation files
13 years ago
Cris Mihalache
4b758376be
Created a class for char gen, and starting moving code to it
13 years ago
Nikolay Kasyanov
a301fc355e
Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)
13 years ago
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
13 years ago
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
13 years ago
Marc Zinnschlag
baf9cff21d
added customdata base class (issue #185 )
13 years ago
Marc Zinnschlag
6a88133178
Split refdata.hpp in a hpp and a cpp file
...
Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117 .
13 years ago
Jacob Essex
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
13 years ago
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
13 years ago
Jason Hooks
8798f7dd40
Bringing in some of Azathoth's work
13 years ago
gugus
dd14368f76
correct CMake
13 years ago
Jason Hooks
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
13 years ago
Marc Zinnschlag
0f4adc39b3
added animation-related script instructions
13 years ago
Jason Hooks
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
13 years ago
Jason Hooks
c25b49d2b6
refdata change
13 years ago
Jason Hooks
469086747e
Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed
13 years ago
Marc Zinnschlag
cb1373a4c7
rewrote cmake scripts for components
13 years ago
Jason Hooks
f1bc5b0ab6
Objects started, RenderingInterface
13 years ago
Jason Hooks
db73487623
Physics fix and cmake changes
13 years ago
Marc Zinnschlag
2ee6be1a34
finished cmake cleanup for apps/openmw source files
13 years ago
Marc Zinnschlag
ad086312b8
testing: cmake script simplification
13 years ago
Marc Zinnschlag
10778d8c3e
Issue #19 : factored out local script handling into a separate class
...
This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)
13 years ago
Marc Zinnschlag
e8632a799d
Feature #28 : refactored out cell management into a separate class
14 years ago
Marc Zinnschlag
0a2979caf2
more cleanup
14 years ago
Sebastian Wick
54724d7e7f
start RenderingManager
14 years ago
Sebastian Wick
4b846a54f1
PhysicsSystem
14 years ago
Sebastian Wick
e7057bed29
moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals
14 years ago
Marc Zinnschlag
27cba6c624
created config.hpp file for appps/openmw
14 years ago
Sebastian Wick
5198de53b8
add the new header to the cmake script
14 years ago
Sebastian Wick
84c19a90ad
deleted needless code
14 years ago
Marc Zinnschlag
58cbdfd762
Merge branch 'journal'
14 years ago
Marc Zinnschlag
7131c08ca4
moved path.hpp/path.cpp to a new component
14 years ago
Marc Zinnschlag
7a1b215b6a
splitting of topic class from quest class
14 years ago
Marc Zinnschlag
944291d34f
added quest tracking to the journal
14 years ago
Marc Zinnschlag
5851e0a28c
added journal entry struct
14 years ago
Marc Zinnschlag
e4a0702bb4
added journal-related script instructions
14 years ago
Marc Zinnschlag
190f77f6c9
added journal class
14 years ago