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

1864 commits

Author SHA1 Message Date
Marc Zinnschlag
d1d861e1be Merge branch 'run' 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
 2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 2014-09-14 10:45:26 +02:00
scrawl
a413e91442 ImageButton: get texture size from MyGUI, rather than from Ogre 2014-09-12 05:17:45 +02:00
scrawl
c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 2014-09-12 05:14:21 +02:00
scrawl
ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 2014-09-12 04:27:23 +02:00
scrawl
ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 2014-09-11 23:33:54 +02:00
Marc Zinnschlag
9ae9104a45 Merge branch 'openmw-32' 2014-09-11 14:22:07 +02:00
Marc Zinnschlag
14f32563e7 fixed script compiler code ordering issue 2014-09-09 13:55:10 +02:00
scrawl
f3f869e99a Don't produce NaN's for 0-length controllers in NifOgre::DefaultFunction 2014-09-07 23:47:57 +02:00
Marc Zinnschlag
d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 2014-09-07 10:10:54 +02:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
Marco Melletti
9b6faa2ffa wrong rearrangement fixes 
misleading comments fixed
 2014-09-06 17:04:50 +02:00
Marco Melletti
e1393ad2df reputation sorted out 2014-09-06 15:16:04 +02:00
Marco Melletti
2e47290ed0 finished loadnpc.hpp, fixed npdt 52byte structure 2014-09-05 21:23:25 +02:00
scrawl
1c178768f5 Allow Script records with missing SCDT (precompiled code, not used anyway) 
Not sure on the exact conditions, but this was missing in a plugin that I made in the TES-CS, while vanilla MW would load it just fine.
 2014-09-05 16:43:20 +02:00
Marco Melletti
bc7e154643 done with header files, unsure about mSkills and mReputation in 
loadnpc.hpp
 2014-09-04 13:23:29 +02:00
Marco Melletti
8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 2014-09-03 14:40:32 +02:00
scrawl
819234cdfe Use rbegin() instead of --end() 2014-09-02 05:46:12 +02:00
scrawl
9809748eba Store NIF keys mapped by time and use lower_bound for searches 2014-09-02 04:29:30 +02:00
scrawl
0da4757ee6 Merge branch 'master' of github.com:scrawl/openmw 2014-09-01 02:04:18 +02:00
scrawl
267cf4e140 Implement ResetActors script instruction (Fixes #1859) 2014-08-30 18:27:32 +02:00
Marc Zinnschlag
2eadff54d4 Merge remote-tracking branch 'rohitnirmal/scan-build-fixes' 2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663 Silence some scan-build warnings. 2014-08-28 20:55:32 -05:00
cc9cii
df87859d7c Move the workaround to loadscpt.cpp as per feedback comments. 2014-08-29 07:41:49 +10:00
Marc Zinnschlag
ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 2014-08-28 12:34:08 +02:00
cc9cii
7ff1136d81 For compiling in Windows with MSVC. 2014-08-27 21:25:47 +10:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
c2a91148f3 Implement multiple emitter nodes for NiBSPArrayController 
The particles for the flame, frost and storm atronachs work correctly now.
 2014-08-26 03:06:30 +02:00
scrawl
44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 2014-08-26 02:09:23 +02:00
Marc Zinnschlag
f1f38fc786 Merge remote-tracking branch 'miroslavr/master' 2014-08-25 22:03:40 +02:00
MiroslavR
46e9ee408f Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format. 2014-08-25 18:59:50 +02:00
MiroslavR
3823e36f05 Merge branch 'master' of github.com:OpenMW/openmw 2014-08-25 00:56:35 +02:00
MiroslavR
d16e0c063c Enchanting, spellmaking dialog: check for flags when listing known effects 2014-08-24 21:59:52 +02:00
Arthur Moore
b7852b8215 Convert niffile.cpp to use std::map instead of a custom search function. 
I haven't profiled this, but it should speed things up a decent bit.
 2014-08-24 14:39:59 -04:00
Arthur Moore
8be6aefd95 Moved functions from niffile.cpp to where they belong. 
Also cleaned up some #includes

Removed a few asserts.  Vector already throws an out_of_range error.
 2014-08-24 13:45:36 -04:00
Marc Zinnschlag
45c0be8f62 Merge remote-tracking branch 'emperorarthur/niftest' 2014-08-24 19:25:51 +02:00
Arthur Moore
cdfa24e15d (Re) Wrote a tool to test NIF files in BSAs and on the filesystem. 
Just give it a set of files, one file per argument, and it will make sure openmw can read them.

On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
 2014-08-24 12:09:39 -04:00
Marc Zinnschlag
111b55f48e Merge remote-tracking branch 'scrawl/script' 2014-08-24 17:58:05 +02:00
scrawl
174153b2da Revert "Fix member variable case problem" 
This reverts commit f0354ea04c.

Fixes #759 (again)

Conflicts:
	components/compiler/lineparser.cpp
 2014-08-24 17:46:08 +02:00
Marc Zinnschlag
52f6a2ec7b remote local variable access was always using variable with index 1 instead of the index specified by the access request (Fixes #1739) 2014-08-24 11:58:08 +02:00
Marc Zinnschlag
736ab76f68 limit argument error workaround to PositionCell instruction (Fixes #1732) 2014-08-24 10:17:55 +02:00
Marc Zinnschlag
d024c1a93f Merge remote-tracking branch 'scrawl/master' 2014-08-24 09:14:17 +02:00
scrawl
1a8acac40a Share keyframe data in NIF resource (Fixes #908) 2014-08-24 02:37:59 +02:00
scrawl
2b407a9995 Refactor NIF cache 
- Remove broken cache locking mechanism

This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.

 - Decouple cache from NIFFile (now a new nifcache component)

 - Add API for future background loading

 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
 2014-08-24 02:37:50 +02:00
Marc Zinnschlag
7c1b32ae62 Merge remote-tracking branch 'miroslavr/corprus' 2014-08-23 09:15:27 +02:00
Marc Zinnschlag
f468c53281 renamed the script field in DebugProfile to improve consistency 2014-08-22 13:38:03 +02:00
Marc Zinnschlag
232c6c9ad3 Merge branch 'scriptedit' into run 2014-08-22 13:20:02 +02:00
MiroslavR
85aa237baf Implement removal of corprus spells 2014-08-22 03:34:31 +02:00
MiroslavR
96e7ff666d Implement saving/loading of corprus stats, remove redundant code 2014-08-19 03:17:31 +02:00