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

273 commits

Author SHA1 Message Date
Marc Zinnschlag
345eec1135 Issue #389: added AI package base class and AI packages management class 2012-09-04 13:25:53 +02:00
scrawl
5ebcaeb098 Merge branch 'next' into quick_keys 2012-08-27 11:04:23 +02:00
scrawl
fab4cfecb1 some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
Nikolay Kasyanov
5395721c26 more appropriate fix for #189 2012-08-20 21:05:02 +04:00
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
 2012-08-19 22:09:22 +02:00
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>
 2012-08-19 22:23:46 +03:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
Marc Zinnschlag
aca08eb4c2 Merge branch 'decouple' into player_control 
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp
 2012-08-09 16:12:10 +02:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
greye
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
Marc Zinnschlag
28ecfb4290 Issue #107: ScriptManager is accessed only through the interface class from now on 2012-08-08 15:18:55 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
Marc Zinnschlag
da916cecfb fixed a bug in a cmake script that resulted in some files being compiled twice 2012-07-15 19:29:09 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
Marc Zinnschlag
29b4a5e5f7 Issue #314: added apply actions 2012-07-13 09:41:38 +02:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
scrawl
3537af051d removed the old shader helper 2012-07-10 00:17:52 +02:00
Marc Zinnschlag
771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 2012-07-06 15:50:26 +02:00
scrawl
a1e48b0feb builds now 2012-07-03 22:48:16 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
Marc Zinnschlag
035c1c4b6e added World interface class; cleanup of World interface 2012-07-03 01:06:38 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
scrawl
c7268233df spell window layout & opening/closing/pinning logic 2012-05-29 09:02:22 +02:00
scrawl
f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 2012-05-27 01:14:33 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
scrawl
313294c522 settings window (hotkey F2) which does nothing. Yay! 2012-05-22 21:40:42 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
Marc Zinnschlag
3e85151c9d Merge remote branch 'scrawl/inventoryGUI' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-05-21 10:13:27 +02:00
Marc Zinnschlag
9f1919a230 Issue #256: added active spell management (completely untested) 2012-05-19 15:01:07 +02:00
Marc Zinnschlag
a4343bfa18 Issue #256: added TimeStamp class 2012-05-18 22:04:22 +02:00
scrawl
0c1d06d9f7 added some trade window stuff, which does nothing yet. 2012-05-17 13:36:25 +02:00
scrawl
0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 2012-05-16 16:08:55 +02:00
scrawl
24a0fecd37 implemented item count selection dialog 2012-05-15 12:51:51 +02:00
scrawl
967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files 2012-05-13 18:14:03 +02:00
scrawl
296dbce298 Merge branch 'master' into graphics 2012-05-12 13:47:56 +02:00
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
 2012-05-11 16:41:27 +02:00
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
 2012-05-11 10:40:40 +02:00
scrawl
cd351ba3af simple scroll text parsing (tags are ignored until now) 2012-05-08 00:39:52 +02:00
scrawl
499dd26398 dialogue window topic list word-wrapping 2012-05-04 23:53:50 +02:00
scrawl
9fc1138a87 opening, closing and taking books/scrolls works 2012-05-03 05:26:05 +02:00
scrawl
0e6b82284f book & scroll windows 2012-05-03 03:33:33 +02:00
scrawl
aaa81397ed Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-04-30 18:24:05 +02:00
scrawl
11ebae3be2 toggleCompositors command useful for debugging 2012-04-29 03:33:10 +02:00
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
 2012-04-24 02:02:03 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Marc Zinnschlag
2bfd90f3f9 Issue #255: added new environment class (not in use yet) 2012-04-23 10:57:16 +02:00
gugus
d4e9b62436 oups forgot to modify CMake 2012-04-21 11:11:40 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
scrawl
cac662ca98 basic tooltips 2012-04-14 17:47:44 +02:00
Marc Zinnschlag
37f478b69a Merge branch 'spells' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwmechanics/npcstats.hpp
 2012-04-13 11:32:33 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
Marc Zinnschlag
750d79eaf0 added spell container class 2012-04-11 19:03:06 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
Marc Zinnschlag
0aecb0ed5c cmake fix 2012-04-08 23:44:40 +02:00
Marc Zinnschlag
f52b9cc162 Merge branch 'autoequip' 2012-04-07 18:48:30 +02:00
Roman Melnik
bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning 
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
 2012-04-07 17:30:20 +03:00
Roman Melnik
72b3f6121d Windows Pinning: add files to CMakeLists.txt 
Add new files (map_window and window_pinnable_base)
 2012-04-07 12:37:15 +03:00
Chris Robinson
63e0e82049 Implement an Audiere-based decoder 2012-04-01 15:02:07 -07:00
Marc Zinnschlag
d717b7b9dd factored out actor related game mechanics code into a separate class 2012-03-30 16:18:58 +02:00
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
 2012-03-30 15:38:14 +02:00
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
 2012-03-30 14:39:42 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-28 21:37:20 +02:00
scrawl
6bea08157e Merge branch 'master' into terrain18 2012-03-28 21:30:15 +02:00
scrawl
72ff7ec030 Merge branch 'next' into occlusionquery 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2012-03-27 23:46:48 +02:00
Alexander "Ace" Olofsson
55f1053b4f Windows fixes for compiling and linking 2012-03-27 00:36:53 +02:00
scrawl
18c2b5eb0a Merge branch 'next' into occlusionquery 2012-03-26 22:09:41 +02:00
Chris Robinson
2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 2012-03-24 17:27:10 -07:00
scrawl
5fba52c238 Merge branch 'terrain18' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-24 15:14:33 +01:00
scrawl
f2a7acb102 Merge branch 'next' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-24 13:19:17 +01:00
scrawl
f4898539e9 added some code that doesn't do anything yet, waiting for ogre 1.8 2012-03-24 13:06:01 +01:00
scrawl
9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 2012-03-22 22:31:49 +01:00
scrawl
6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 2012-03-22 21:41:32 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47bcbdef17 Merge remote branch 'scrawl/mygui' into mygui 2012-03-22 18:46:21 +01:00
Marc Zinnschlag
0adbe258fd Issue #217: made Ptr track container; fixed a cmake script bug 2012-03-21 12:20:19 +01:00
scrawl
66baf9ec81 Merge branch 'master' into mygui 2012-03-20 20:02:30 +01:00
Chris Robinson
74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 2012-03-20 06:17:02 -07:00
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>
 2012-03-19 20:54:30 +01:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
Chris Robinson
46cd84aac5 Add a skeleton ffmpeg decoder 2012-03-16 23:59:21 -07:00
Chris Robinson
10037e79e7 Add a skeleton decoder class using mpg123 and libsndfile 2012-03-16 23:18:15 -07:00
Chris Robinson
45b612ab3b Add a skeleton output classs using OpenAL 2012-03-16 22:12:17 -07:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
scrawl
4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-13 16:00:59 +01:00
scrawl
771f920c2c Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap 2012-03-13 15:59:09 +01:00
scrawl
5b38b17baf local map rendering (nothing to see yet, as it is not displayed in GUI) 2012-03-10 15:28:18 +01:00