499dd26398
dialogue window topic list word-wrapping
13 years ago
9fc1138a87
opening, closing and taking books/scrolls works
13 years ago
0e6b82284f
book & scroll windows
13 years ago
aaa81397ed
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
11ebae3be2
toggleCompositors command useful for debugging
13 years ago
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
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
2bfd90f3f9
Issue #255 : added new environment class (not in use yet)
13 years ago
d4e9b62436
oups forgot to modify CMake
13 years ago
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
b309d245c5
cleaning up hircine work
13 years ago
cac662ca98
basic tooltips
13 years ago
37f478b69a
Merge branch 'spells'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwmechanics/npcstats.hpp
13 years ago
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
13 years ago
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
13 years ago
750d79eaf0
added spell container class
13 years ago
2a4fcf42a3
basic shadows
13 years ago
0aecb0ed5c
cmake fix
13 years ago
f52b9cc162
Merge branch 'autoequip'
13 years ago
bdbb8a8d84
Merge remote-tracking branch 'upstream/master' into windowsPinning
...
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
13 years ago
72b3f6121d
Windows Pinning: add files to CMakeLists.txt
...
Add new files (map_window and window_pinnable_base)
13 years ago
63e0e82049
Implement an Audiere-based decoder
13 years ago
d717b7b9dd
factored out actor related game mechanics code into a separate class
13 years ago
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
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
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
6bea08157e
Merge branch 'master' into terrain18
13 years ago
72ff7ec030
Merge branch 'next' into occlusionquery
...
Conflicts:
apps/openmw/mwrender/sky.cpp
13 years ago
55f1053b4f
Windows fixes for compiling and linking
13 years ago
18c2b5eb0a
Merge branch 'next' into occlusionquery
13 years ago
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
13 years ago
5fba52c238
Merge branch 'terrain18' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
f4898539e9
added some code that doesn't do anything yet, waiting for ogre 1.8
13 years ago
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
13 years ago
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
13 years ago
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
13 years ago
47bcbdef17
Merge remote branch 'scrawl/mygui' into mygui
13 years ago
0adbe258fd
Issue #217 : made Ptr track container; fixed a cmake script bug
13 years ago
66baf9ec81
Merge branch 'master' into mygui
13 years ago
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
13 years ago
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
51fb9e67cd
Merge
13 years ago
3a00fbb950
removed mygui from source tree and use system install instead
13 years ago
46cd84aac5
Add a skeleton ffmpeg decoder
13 years ago
10037e79e7
Add a skeleton decoder class using mpg123 and libsndfile
13 years ago
45b612ab3b
Add a skeleton output classs using OpenAL
13 years ago
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
13 years ago
4813a1ce9d
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
13 years ago
771f920c2c
Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap
13 years ago
5b38b17baf
local map rendering (nothing to see yet, as it is not displayed in GUI)
13 years ago
84c8cd3720
added InventoryStore class (doesn't do anything yet)
13 years ago
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
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
739870489a
Merge remote branch 'scrawl/weather' into weather
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
26bd2be1e8
Merge branch 'equipment' into next
13 years ago
af23cc352e
more cleanup
13 years ago
c1fb5ce769
added (incomplete) WeatherManager, created by World
13 years ago
2d8b0a4ac0
merged the sky manager implementation with its interface
13 years ago
694a537b57
- removed caelum sources, resources, build scripts
13 years ago
04d7db2860
moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience
13 years ago
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
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
d17ba6ce19
Forgot the CharacterCreation files
13 years ago
4b758376be
Created a class for char gen, and starting moving code to it
13 years ago
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
0d7f39fcb5
Merge branch 'refdata' into next
13 years ago
ea241d85ef
Fixed some issues with the CMake files
13 years ago
baf9cff21d
added customdata base class (issue #185 )
13 years ago
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
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
13 years ago
0c2de2c00c
Merge branch 'animation2'
13 years ago
8798f7dd40
Bringing in some of Azathoth's work
13 years ago
dd14368f76
correct CMake
13 years ago
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
13 years ago
0f4adc39b3
added animation-related script instructions
13 years ago
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
13 years ago
c25b49d2b6
refdata change
13 years ago
469086747e
Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed
13 years ago
cb1373a4c7
rewrote cmake scripts for components
13 years ago
f1bc5b0ab6
Objects started, RenderingInterface
13 years ago
db73487623
Physics fix and cmake changes
13 years ago
2ee6be1a34
finished cmake cleanup for apps/openmw source files
13 years ago
ad086312b8
testing: cmake script simplification
13 years ago
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
e8632a799d
Feature #28 : refactored out cell management into a separate class
14 years ago
0a2979caf2
more cleanup
14 years ago
54724d7e7f
start RenderingManager
14 years ago
4b846a54f1
PhysicsSystem
14 years ago
e7057bed29
moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals
14 years ago
27cba6c624
created config.hpp file for appps/openmw
14 years ago
5198de53b8
add the new header to the cmake script
14 years ago
84c19a90ad
deleted needless code
14 years ago
58cbdfd762
Merge branch 'journal'
14 years ago
7131c08ca4
moved path.hpp/path.cpp to a new component
14 years ago
7a1b215b6a
splitting of topic class from quest class
14 years ago
944291d34f
added quest tracking to the journal
14 years ago
5851e0a28c
added journal entry struct
14 years ago
e4a0702bb4
added journal-related script instructions
14 years ago
190f77f6c9
added journal class
14 years ago
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
2a53afc2bf
Move StatsWindow class to it's own file.
14 years ago
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
14 years ago
4028600768
Builds on OS X now
14 years ago
ee0d73e142
Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions
14 years ago
4468a2b6a8
added movement data to MW references; added movement interface to MWWorld::Class
14 years ago
7449de22b1
removed a leftover debugging breadcrumb
14 years ago
8b2252e7a1
first attempt at building with bullet
14 years ago
6a14ea8ec3
handle physics during player changing cells
14 years ago
9a5a6eac2b
stop reporting changes originating from physics system back to physics system
14 years ago
a724de2429
Follow the 'XDG Base Directory Specification' instead of putting the configfile in ~/.openmw/
...
Also updated based on feedback from athile:
Fix broken Linux elif.
Use boost:filesystem instead of mkdir for increased future portability.
Break appart class definition and implementation.
14 years ago
4221824681
Build debian package using cpack if dpkg is available
...
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
14 years ago
0a832f2d23
Merge branch 'playerpos' into script
14 years ago
f01a3d5e35
split Player class into a MWWorld and a MWRender component
14 years ago
4a12be11bf
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
14 years ago
2ffe1206a6
merged opcode classes that came in explicit and implicit variants
14 years ago
6bf10c93c8
Create a base class for dialog windows
14 years ago
be5562cb2c
Added dialouge window
14 years ago
38b434771a
Merge remote branch 'zini/master' into gui-windows
14 years ago
1c1d33e723
Initial work on the stat review dialog.
14 years ago
98405a5716
implemented magic effects from abilities (effects are not applied yet)
14 years ago
cd3e976b7c
Added birthsign dialog and spell effect widget.
14 years ago
cd8b88dea1
Introduced custom widgets (skill and attribute) which should make it easier to make new windows. Changed race and class dialog to use the new skill and attribute widgets.
14 years ago
eec34e9f0e
Added dialog for picking class from a list.
15 years ago
0868e76ffb
Added display of skills in stat window, the skills are configured with MWGui::WindowManager::configureSkills().
15 years ago
481734ee20
Implemented a general text input dialog which can be used to get text input from the player. Used the text input dialog to implement the name dialog for the character creation.
15 years ago
18cdb3cccc
Removed prefix from mw_layout.hpp.
15 years ago
93608ca892
Removed prefix from filename and changed name as only the race dialog will be placed in it.
15 years ago
beee17b36f
Implemented race dialog for character creation, it currently only contains hardcoded values.
15 years ago
1dc805d0d4
Merge branch 'master' into exterior
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
15 years ago
d911653846
Merge with athile's WIP windows build
15 years ago
9e2129c4b3
WIP Windows build
15 years ago
68a788b2c8
added instructions for enabling/disabling player controls (they don't do anything yet)
15 years ago
14cf007a3f
added first batch of AI-related instructions and functions (they don't do anything at this point)
15 years ago
0d20719158
re-routed player movement through MWWorld::World
15 years ago
0111631ee9
very early implementation of exterior rendering
15 years ago
358e1ca5a5
Added custom UTF8 converter. Removed iconv dependency.
15 years ago
2cfe5f0697
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
15 years ago
912c8b1f2d
Added mpg123 file reader
15 years ago
cad9712411
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
15 years ago
34572f0b19
Compiled and linked in sound system (not yet functional)
15 years ago
8086933282
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
7afc8ffd2e
Merge branch 'container'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
a7fe28ecbe
implemented take action
15 years ago
589f8b5ede
added GetItemCount
15 years ago
3ea85b4619
added AddItem instruction
15 years ago
0a60bde834
added insertIntoContainer function to class hierarchy
15 years ago
d42747e85b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
d6541d4f3c
changed file names to ensure consistent spelling
15 years ago
09c42589cc
implemented npc/creature activation (enters dialog gui mode for now)
15 years ago
8045320ac9
added dialog manager
15 years ago
ee7570f7e7
added containerstore
15 years ago
002345270b
implemented teleport doors (only for the player for now)
15 years ago
c38b02bd5c
added action interface
15 years ago
f50ced4616
added missing record classes
15 years ago
bfc282779b
added item health interface
15 years ago
33b6a0b800
moved concrete record classes to separate sub-system (mwclass)
15 years ago
ca842d1b4d
reimplemented access to creature stats via new class interface
15 years ago
a70c3876a2
added foundation for esm record class hierarchy
15 years ago
00c0a50f7f
Merge commit 'ape/master'
15 years ago
f3ee9ced5c
Added cmake file for the iconv library and extended relevant
...
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
15 years ago
77a0215d53
added get-, set- and mod-instructions for attributes
15 years ago
04b86f7e1e
added first set of character and creature stats (attributes)
15 years ago
61d09c4768
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
15 years ago
6e3aacca08
CMakeLists fix
15 years ago
281f2d1136
added script interpreter for console
15 years ago
5ff9344a87
Finished console GUI window
15 years ago
c61212202b
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
15 years ago
f3b70e05a9
added sky-related script functions and instructions
15 years ago
083b11c740
moved global variable handling into a separate class
15 years ago
608ddd0a58
Splitt inputmanager into hpp/cpp
15 years ago
4d74f85ae0
Moved mwgui manager to components, ready for testing
15 years ago
31b4d83fac
moved sound extensions from mwsound to mwscript (reduces coupling between openmw components)
15 years ago
6966c66091
Gave apps/openmw/ its own CMakeLists.txt
15 years ago
scrawl
Marc Zinnschlag
gugus
Roman Melnik
Chris Robinson
Alexander "Ace" Olofsson
Lukasz Gromanowski
Jason Hooks
k1ll
Cris Mihalache
Nikolay Kasyanov
Pieter van der Kloet
Jacob Essex
Jason Hooks
Sebastian Wick
Jan-Peter Nilsson
Jan Borsodi
Nicolay Korslund
athile
Armin Preiml