mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:56:39 +00:00
Code Issues Releases Wiki Activity
9716 commits 115 branches 76 tags 128 MiB
Commit graph

9716 commits

This branch
This branch
All branches
Author SHA1 Message Date
gus
12d8b4e0f8 bugfix 2013-10-28 18:13:07 +01:00
gus
2d84f7d33d NPC run 2013-10-28 18:10:00 +01:00
gus
d7584f9df7 getLineOfSight, no script instruction yet 2013-10-28 18:01:40 +01:00
Marc Zinnschlag
29fce6d11f increased version number 2013-10-28 08:45:56 +01:00
Marc Zinnschlag
f5fbe7361f Merge remote-tracking branch 'lgro/saving' into saving 2013-10-28 08:35:51 +01:00
graffy76
b51bef0d98 fixed missing adjuster widget in file dialog open view 2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd Issue #913: Merge --master and --plugin switches 
Launcher part of master/plugin switches merge.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-10-27 20:03:12 +01:00
Lukasz Gromanowski
489475a32f Corrected compilation error (g++ 4.8.2) triggered by not found declaration 
in argument-dependent lookup at the point of instantiation.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-10-27 19:57:05 +01:00
Marc Zinnschlag
c2bbbef637 Merge remote-tracking branch 'rainChu/drowning-gauge' 2013-10-27 16:10:11 +01:00
gus
2515a1239e improved combat conditions 2013-10-27 14:22:51 +01:00
Marc Zinnschlag
9a80e11182 reimplemented add and appendBlankRecord via insertRecord 2013-10-27 14:13:10 +01:00
gus
968968502e NPC always face you when fighting 2013-10-27 14:03:58 +01:00
Marc Zinnschlag
525d6fadec added Collection insert function for arbitrary position and reimplemented appendRecord in via this function 2013-10-27 14:00:25 +01:00
gus
a0edb55f60 only NPC with fight over 80 will attack you now 2013-10-27 13:50:29 +01:00
gus
882b136b35 bugfix of bugfix ^^ 2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad
23eaf90846 Breath meter flashes when drowning 2013-10-27 04:05:01 -04:00
graffy76
ea7a8eb2a4 last commit 2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52 Hide adjusterwidget for open files view 2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3 Fix for file path issues 2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e Fixed merge conflicts with saving branch 2013-10-25 19:23:03 -05:00
scrawl
8c9a5de26f Fix an irritating error message 2013-10-25 23:47:53 +02:00
graffy76
9ce4a04a2d merge from saving 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
 2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3 Implemented Launcher namespace 2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731 Fixed filedialog new / edit content path issue 2013-10-24 17:33:28 -05:00
Marek Kochanowicz
cef3b30b25 Added tables.tex. It is almost empty at the moment. 2013-10-24 19:24:37 +02:00
Marek Kochanowicz
e89f1dd40a Corrected, according to Zini. Not completly, though. 2013-10-24 18:33:35 +02:00
graffy76
b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 2013-10-23 17:39:17 -05:00
Marek Kochanowicz
11779c27d3 Writting that manual… 2013-10-23 21:34:59 +02:00
Marek Kochanowicz
e34cbe857c Added a little more to the filters. 2013-10-23 12:37:28 +02:00
graffy76
ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for" 
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
 2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
Marek Kochanowicz
930aef7ae5 Added *.pdf to the gitignore. 2013-10-22 21:25:13 +02:00
Marek Kochanowicz
ca700c4cfd Creating the new branch for filters. 2013-10-22 17:20:15 +02:00
Marc Zinnschlag
67bc0a0c70 additional modification to the IDValidator (restricting relaxed mode slightly more) 2013-10-22 11:32:10 +02:00
Marc Zinnschlag
dc473221e7 added ID-argument to CollectionBase::getAppendIndex (required for info record collection) 2013-10-22 11:21:12 +02:00
Marc Zinnschlag
aa61948801 relaxed rules for new IDs when ID is also a user visible text 2013-10-22 11:08:37 +02:00
Marc Zinnschlag
3146af34d6 some fixes for the merged filter branch 2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566 Merge remote-tracking branch 'sirherrbatka/filters' into saving 2013-10-21 18:59:12 +02:00
Marek Kochanowicz
ce2c558257 Missed a file. 2013-10-21 18:40:20 +02:00
Marek Kochanowicz
70602c2c36 Removed changes in the unimplemented copy ctor. 2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b Corrected formatting in document.hpp 2013-10-21 18:15:26 +02:00
Marc Zinnschlag
88e09159c4 splitting off characters menu from mechanics menu (was getting too big) 2013-10-21 18:04:40 +02:00
Marc Zinnschlag
743c6ea5b1 save dialogue records 2013-10-21 16:47:32 +02:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b23df42817 Removed old comment. Changed to set resources path correctly. 2013-10-21 16:06:16 +02:00
Marc Zinnschlag
3b85d97087 handle deleted dialogue records 2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e add fixed dialogue records when creating a new omwgame file 2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431 disallow the deletion of non-topic, non-journal dialogue records 2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea set dialogue type for newly created dialogue records 2013-10-21 13:39:13 +02:00