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

18303 commits

Author SHA1 Message Date
Bret Curtis
a39b593b9b add beginning of openmw-cs docs 2017-02-17 12:23:24 +01:00
Marc Zinnschlag
79956e4b49 Merge remote-tracking branch 'origin/master' 2017-02-17 08:54:19 +01:00
Marc Zinnschlag
23818ec409 Merge remote-tracking branch 'matahualpa/openmw-cs_emittertype' 2017-02-17 08:48:32 +01:00
MiroslavR
f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 2017-02-17 03:11:37 +01:00
MAtahualpa
fb2618fe7b Update request for AUTHORS.md
If you don't mind, please update our credits file with the following changes.
(Sorted the name entries in the PR section along the way.)
2017-02-16 22:05:15 +01:00
scrawl
96ca50e108 Merge pull request #1211 from Allofich/warnings
Fix Clang and OS X Travis CI warnings
2017-02-16 19:16:53 +01:00
Allofich
621d3e56cf Fix Clang and OS X Travis CI warnings 2017-02-17 02:08:39 +09:00
David Cernat
27c4015f50 [General] Remove unused packet placeholder ID_OBJECT_HEALTH 2017-02-16 18:46:39 +02:00
David Cernat
1198caddf6 [Server] Add OnContainer script callback 2017-02-16 18:34:11 +02:00
David Cernat
5300bcd711 Merge pull request #153 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017, part 2
2017-02-16 18:25:21 +02:00
Bret Curtis
e8bc57c232 add the rest of the openmw source documentation 2017-02-16 16:03:43 +01:00
Bret Curtis
3b4c4f6f63 Merge pull request #1205 from psi29a/sphinx
make local documentation development easier
2017-02-16 14:48:49 +01:00
David Cernat
eba7d8408f [Server] Use script function to get spellbook action 2017-02-16 14:23:27 +02:00
Bret Curtis
d4ea85a4c6 reorganization and added mwgui 2017-02-16 13:19:22 +01:00
MAtahualpa
dab8b328c4 Replace light emitter check boxes with a combo box (fixes #3752)
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.

Related issue:
- Fixes #3752: Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
2017-02-16 12:48:47 +01:00
David Cernat
5b3fabdb9d [Client] Send ID_CONTAINER with all containers in cell when requested 2017-02-16 13:34:32 +02:00
David Cernat
c32c004516 Merge pull request #151 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017
2017-02-16 11:53:02 +02:00
MAtahualpa
7be46eb1f0 Fix for commit "d4972ab..." in PR 1208 (fixes #3751)
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
2017-02-16 00:08:38 +01:00
MAtahualpa
d4972ab166 Replace "Xyz blood" check boxes with a combo box (fixes #3751)
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Related issue:
- Fixes #3751: OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
2017-02-15 23:06:36 +01:00
scrawl
f10edb71cc Add environment variable for disabling IncrementalCompileOperation 2017-02-15 21:01:25 +01:00
scrawl
c4a89065a2 Preload VFX of spells selected by AI actors 2017-02-15 21:01:25 +01:00
scrawl
57b585570a Preload magic effect visuals of the player's selected weapon/spell 2017-02-15 21:01:25 +01:00
Marc Zinnschlag
e46fb1770c Merge remote-tracking branch 'matahualpa/openmw-cs_booktype' 2017-02-15 19:47:39 +01:00
David Cernat
4c240038e1 Merge pull request #150 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017, part 2
2017-02-15 20:15:30 +02:00
David Cernat
3b604a432e [General] Restructure ID_CONTAINER to allow multiple containers at once 2017-02-15 20:14:25 +02:00
MAtahualpa
2c34a8706b Replace "Scroll" check box with a combo box (fixes #3748)
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-15 18:59:55 +01:00
Bret Curtis
4073115159 add mwdialogue 2017-02-15 17:23:23 +01:00
Bret Curtis
19f732c4ee automate the task of including all the necessary files for openmw 2017-02-15 16:48:59 +01:00
David Cernat
88f891b5bd [Client] Make it possible to easily iterate through container items 2017-02-14 23:10:45 +02:00
David Cernat
c8cbfbef62 [General] Sketch out server requests to players for container data 2017-02-14 19:31:56 +02:00
scrawl
884c01fc3c Merge pull request #1206 from OpenMW/authors-update
I'm not inactive, just busy. ;)
2017-02-14 14:25:32 +01:00
MAtahualpa
607bd8b853 Replace "Scroll" check box with a combo box (fixes #3748)
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-14 11:48:37 +01:00
Bret Curtis
7886dd4c0a I'm not inactive, just busy. ;) 2017-02-14 09:33:24 +01:00
David Cernat
2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
2017-02-14 10:27:53 +02:00
scrawl
183c46b0ef Fix summoning effects 2017-02-14 07:58:16 +01:00
scrawl
a495b9b884 Fix wasteful allocations in Store<Land>::search 2017-02-14 07:58:16 +01:00
scrawl
72c6b11cf8 Move global map render to the worker thread 2017-02-14 07:58:16 +01:00
scrawl
026a05718f Construct the WorkQueue in Engine 2017-02-14 07:58:16 +01:00
scrawl
ddd6605608 Move WNAM out of LandData to avoid redundant (de)allocations on startup 2017-02-14 07:58:16 +01:00
scrawl
e00b420f68 Move saving of LandData into Land::save 2017-02-14 07:58:16 +01:00
scrawl
325bf66653 Return const Land in ESMStore 2017-02-14 07:58:16 +01:00
scrawl
e295a72d43 Add align=Center to GUI dialogs (Fixes #2289) 2017-02-14 07:58:16 +01:00
Bret Curtis
4d29bdc85e make source documentation great again 2017-02-13 21:53:53 +01:00
David Cernat
a5d7c5fd39 Merge pull request #148 from OpenMW/master
Add OpenMW commits up to 13 Feb 2017
2017-02-13 21:29:51 +02:00
Bret Curtis
4cc13a20de make source auto doc easier 2017-02-13 20:09:10 +01:00
Bret Curtis
8044663acd use breathe not breath 2017-02-13 12:40:56 +01:00
Bret Curtis
6483218cb5 create warnings for missing libs 2017-02-13 10:48:37 +01:00
Bret Curtis
8d1c7edcf6 fix warnings, replace fonts with font, make breath/doxygen/cmake imports optional 2017-02-13 10:29:20 +01:00
Marc Zinnschlag
5c3f914ff6 updated credits file 2017-02-13 10:17:26 +01:00
Marc Zinnschlag
93c5630e02 Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents' 2017-02-13 10:06:08 +01:00