krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
13271 commits 35 branches 0 tags 65 MiB
Commit graph

13271 commits

This branch
This branch
All branches
Author SHA1 Message Date
Digmaster
5d77ebdc60 If v3 doesn't exist, copy from v2 2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c uses v3 input bindings, not v2 2015-02-27 22:19:13 +01:00
Digmaster
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0 Fix activating every frame when action is bound to a trigger 2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
2eedb3acec Include fix 2015-02-27 20:22:43 +01:00
scrawl
f91696723f Fix compile error 2015-02-27 19:58:43 +01:00
Marc Zinnschlag
44d1f43b2b Merge remote-tracking branch 'sandstranger/fixes-for-android' 2015-02-27 10:34:41 +01:00
sylar
edd3f9f95c small fix for float 2015-02-27 08:58:00 +04:00
sylar
cef725012c fix transpose error fo gles2 2015-02-27 08:56:20 +04:00
scrawl
7e684853fc Add StatsHandler for profiling (S key) 2015-02-26 21:20:07 +01:00
Marc Zinnschlag
093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 2015-02-26 19:05:30 +01:00
sylar
cda3782cf2 fix crash game on Android after start loading 2015-02-26 18:30:38 +04:00
sylar
70398e2f9f change Jni name method 2015-02-26 18:30:14 +04:00
sylar
1bb29f610f enable mipmapping for Android again 2015-02-26 18:29:38 +04:00
Marc Zinnschlag
70a482b3e8 Merge remote-tracking branch 'dteviot/Bug2346' 2015-02-26 13:26:45 +01:00
Marc Zinnschlag
80e6df6092 Merge remote-tracking branch 'scrawl/opencs' 2015-02-26 13:25:56 +01:00
Marc Zinnschlag
281e0042ab Merge remote-tracking branch 'scrawl/master' 2015-02-26 13:23:15 +01:00
dteviot
72e94380be fix: boost::filesystem::canonical() available from version 1.48. 2015-02-26 20:07:23 +13:00
scrawl
e7989a197d Add defaults for some required globals (Fixes #2397) 2015-02-25 20:35:11 +01:00
scrawl
3158d34abb Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all. 2015-02-25 20:25:41 +01:00
Marc Zinnschlag
a77fbdc965 Merge remote-tracking branch 'jordan-ayers/bugfix/2400' 2015-02-25 20:14:33 +01:00
dteviot
931c95d0b1 workaround for not building on Linux version of Travis. 2015-02-26 06:17:29 +13:00
dteviot
9d61457956 AddOn files can be checked if game file is checked, but dependencies do not exist. 2015-02-25 20:54:52 +13:00
Jordan Ayers
659a8ba279 Correction to teleportation changes. 
OMW Bug #2400
Related to OMW Bug #1533

Don't crash on confiscating items if a prison marker cannot be found.
 2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372 Correction to teleportation changes. 
OMW Bug #2400
Related to OMW Bug #1533

Don't crash when finding the closest marker to an exterior position.
 2015-02-24 20:51:57 -06:00
Bret Curtis
5672c86924 Rename window title for OpenMW-CS 2015-02-24 23:37:53 +01:00
scrawl
24de6ba27e Fix crash for LAND records without data 2015-02-24 21:42:40 +01:00
Marc Zinnschlag
e103262095 updated credits file 2015-02-24 18:15:41 +01:00
dteviot
cc815c63f1 Fix: no longer loose changes when run install wizard or iniimport. 2015-02-24 20:14:18 +13:00
dteviot
6878e317a7 launcher: decouple Combo Box model from Plug-ins model. 
fixes bug reported by scrawl
1. openmw.cfg had content files in order 'Bloodmoon.esm, Tribunal.esm, Morrowind.esm'
2. Blank_ESM_2.0.esm is in the Data Files directory
3. Do an ini file import.
4. Imported profile will have Blank_ESM_2.0.esm as the game file.  Should be Morrowind.esm.

Root cause: Game File combo box and Plugins Grid shared same data model, so changing plug-in file order also changed order of Game File combo box.
 2015-02-24 20:06:06 +13:00
scrawl
8d64f2081e Add particle system state loading 2015-02-24 01:25:31 +01:00
scrawl
2a92fb57f7 Add FlipController 2015-02-24 00:02:10 +01:00
scrawl
6c8613ae35 Add DarkTexture and DetailTexture 2015-02-23 23:21:56 +01:00
scrawl
c54ee16748 Add AlphaController and MaterialColorController 2015-02-23 21:55:32 +01:00
scrawl
3839d6f777 Simplify controller classes 2015-02-23 21:55:32 +01:00
scrawl
74dfb23e7b Handle material properties in trishapeToGeometry 2015-02-23 21:55:32 +01:00
scrawl
6c63bab8e4 Change Nif::Property flags to unsigned 2015-02-23 21:08:25 +01:00
scrawl
8e01d8cb19 Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
Marc Zinnschlag
da9bd09a8c Merge remote-tracking branch 'miroslavr/master' 2015-02-23 20:53:44 +01:00
Marc Zinnschlag
9109162030 Merge remote-tracking branch 'scrawl/master' 2015-02-23 20:51:18 +01:00
scrawl
77bb77b367 Fix for instant restore effects (Fixes #2392) 2015-02-23 19:07:12 +01:00
dteviot
63af9d848a Add constraint: Bloodmoon.esm requires Tribunal.esm. 2015-02-23 19:58:31 +13:00
dteviot
6dc202cba3 Removed unneeded parameter from ContentModel::setContentList() 2015-02-23 19:41:41 +13:00
dteviot
84762c4eb8 Progress bar at 0% shows no text. 2015-02-23 19:30:46 +13:00
MiroslavR
47c053444f Make the jail progress last one second 2015-02-23 00:23:09 +01:00
Marc Zinnschlag
8e007c91fd Merge remote-tracking branch 'jordan-ayers/bugfix/1533' 2015-02-22 21:58:01 +01:00
Marc Zinnschlag
07c27065d6 Merge remote-tracking branch 'slothlife/msvc-warning-fixes' 2015-02-22 21:34:46 +01:00