1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:49:56 +00:00
Commit graph

6482 commits

Author SHA1 Message Date
Lukasz Gromanowski
cb18cf1eee Added OpenMW dependencies into .travis.yml file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-04-02 23:30:44 +02:00
Lukasz Gromanowski
df8da0486d Small changes in .travis.yml file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-04-02 23:20:59 +02:00
Lukasz Gromanowski
061fb4c482 Added simple Travis CI cfg file.
Added simple Travis CI configuration file for testing.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-04-02 23:15:22 +02:00
Glorf
7b7d3353a6 Exception for enchanting with Azura Star 2013-04-02 22:23:38 +02:00
Marc Zinnschlag
ffb133c862 Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround' 2013-04-02 22:18:32 +02:00
Lukasz Gromanowski
98727d2fb6 Workaround for launcher compilation problems due to bug in Qt MOC compiler.
For details please see:

https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-04-02 21:32:23 +02:00
Glorf
369cf0b4ca Enchanting price mechanics 2013-04-02 20:46:48 +02:00
Marc Zinnschlag
676a92e2e0 moved Verify function from World menu to File menu 2013-04-02 15:47:25 +02:00
Marc Zinnschlag
9d009af2a1 simplified code for sub view factory creation 2013-04-02 15:33:28 +02:00
Marc Zinnschlag
0856e3ebc2 Merge remote-tracking branch 'glorf/bugfix' 2013-04-02 14:35:14 +02:00
Marc Zinnschlag
df658d29f0 Merge branch 'faction' 2013-04-02 14:21:51 +02:00
Marc Zinnschlag
82498f6cff added hidden flag column to faction table 2013-04-02 14:20:51 +02:00
Marc Zinnschlag
384c88182d dealing with unset attribute fields 2013-04-02 14:15:22 +02:00
Glorf
900c2cfa81 Minor bugfix #646 change 2013-04-02 14:08:59 +02:00
Marc Zinnschlag
ec6bdbeb40 added skill columns to faction table 2013-04-02 14:04:13 +02:00
Marc Zinnschlag
f9f520df34 adjusted faction record to increase consistency with other records 2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d added faction table 2013-04-02 12:00:45 +02:00
Glorf
d25c838e1d Bugfix #646 2013-04-02 11:42:29 +02:00
gus
6a33170ca2 More bugfix, but I don't like this one. 2013-04-01 17:44:06 +00:00
gus
20af7d89a2 post master-merge fixes. Looks a little odd. 2013-04-01 17:30:40 +00:00
gus
2be9405c96 the sgn function is no longer in the global namespace 2013-04-01 15:44:08 +00:00
Marc Zinnschlag
751c679255 Merge remote-tracking branch 'glorf/enchanting' 2013-04-01 17:35:04 +02:00
Marc Zinnschlag
9dbd024076 another minor fix 2013-04-01 17:30:54 +02:00
Glorf
1bff6ed872 Enchaning values import, fixed constness 2013-04-01 17:12:47 +02:00
gus
1eb3d3e10e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
Conflicts:
	apps/openmw/CMakeLists.txt
2013-04-01 14:10:19 +00:00
gus
47cc945ef4 more refactoring 2013-04-01 12:38:13 +00:00
Marc Zinnschlag
26db983599 minor fix 2013-04-01 10:46:08 +02:00
Chris Robinson
f976eb5bd8 Improve mouselook scaling 2013-03-31 17:32:39 -07:00
Chris Robinson
d0703efd69 Another place to check the class' isActor method 2013-03-31 17:32:39 -07:00
Chris Robinson
04aeb3dd07 Rename Mechanics' Activators to Objects 2013-03-31 17:32:38 -07:00
Chris Robinson
10d04c928c Use the object's class to check if it's an actor 2013-03-31 17:32:38 -07:00
Glorf
d29a42dcbe Fixed enchanting mechanics 2013-03-31 23:18:23 +02:00
gus
63424ade56 refactoring 2013-03-31 17:30:03 +00:00
Lukasz Gromanowski
acae815cd2 Added workaround for OpenCS compilation problems due to bug in Qt MOC compiler.
For details please see:

https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-03-31 18:00:46 +02:00
scrawl
c7fbcf609d Merge branch 'master' of git://github.com/zinnschlag/openmw into bug688 2013-03-31 15:56:39 +02:00
scrawl
8fd961bbac Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't. 2013-03-31 15:50:48 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
scrawl
857f2b33db Fix companion layout align 2013-03-31 14:48:48 +02:00
Marc Zinnschlag
687ab1e9df Merge remote-tracking branch 'scrawl/companion' 2013-03-31 14:47:33 +02:00
Marc Zinnschlag
fd0aa1a4b8 Issue #685: Treat : as a whitespace 2013-03-31 14:46:46 +02:00
scrawl
bc6e1fd981 Add missing files 2013-03-31 14:36:03 +02:00
scrawl
af6409b9f5 Fix NPC physics scale problem 2013-03-31 13:50:57 +02:00
scrawl
b0199c703c Companion UI 2013-03-31 13:13:46 +02:00
Chris Robinson
4836ba16f7 Implement turning states 2013-03-31 03:50:20 -07:00
Chris Robinson
7611caa6eb Merge remote-tracking branch 'zini/master' into rotation 2013-03-31 03:00:11 -07:00
Chris Robinson
13c098266c Pass player rotation through the movement settings 2013-03-31 02:57:22 -07:00
scrawl
69099c11a2 Merge branch 'enchanting' into companion 2013-03-31 11:52:55 +02:00
gus
e150e22652 Merge branch 'AI' of git@github.com:gugus/openmw.git into AI 2013-03-31 09:25:14 +00:00
Chris Robinson
18e8ff7198 Actually rotate the object when updating physics 2013-03-31 02:24:44 -07:00
gugus
b2be0d3e34 Merge pull request #3 from scrawl/AI
Ai
2013-03-31 02:24:29 -07:00