Commit Graph

18370 Commits (3adbf17545e71e96748e7a918bfc771db6af970a)
 

Author SHA1 Message Date
Koncord 1fb2176cfa [Server] Add forgotten type for callbacks 8 years ago
scrawl aa8459b5c7 Revert "Remove redundant allocations for NIF meshes"
This reverts commit a7c5beb7c5.

Conflicts:
	components/nif/data.cpp
	components/nifbullet/bulletnifloader.cpp
	components/nifosg/nifloader.cpp
8 years ago
scrawl 6a37909ee7 Revert "Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580)"
This reverts commit 115e563a7a.
8 years ago
David Cernat 0d75264221 Merge pull request #155 from OpenMW/master
Add OpenMW commits up to 17 Feb 2017, part 2
8 years ago
David Cernat c01ab63239 [Server] Add script functions for setting container item info 8 years ago
scrawl f2174ee9f4 Merge pull request #1217 from Allofich/follow
Fix loading 0-duration Follow and Escort packages
8 years ago
scrawl cb142f01e4 Merge pull request #1215 from MiroslavR/armor_rating
Fix incorrect calculation of armor rating
8 years ago
Allofich 3897c49e30 Fix loading 0-duration Follow and Escort packages
(Fixes #3755)
8 years ago
MAtahualpa 520e82ed4f Fix for commit "affc0eb..." in PR 1216 (fixes #3756)
Fixed use of tab character.
8 years ago
David Cernat 941d6269c1 [General] Slightly reorder variables in ID_OBJECT_PLACE 8 years ago
David Cernat aa1549606f [Server] Add script functions for getting container item info 8 years ago
MAtahualpa affc0eb37f Replace "Female" check box with a combo box, part 1/2 (fixes #3756)
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.

Related issue:
- Fixes #3756: Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
8 years ago
David Cernat 70470e12b4 [Server] Reorder World script functions 8 years ago
David Cernat 8a5bc77699 [Server] Add GetBaseEventAction script function 8 years ago
David Cernat e0bc557aa4 Merge pull request #154 from OpenMW/master
Add OpenMW commits up to 17 Feb 2017
8 years ago
Bret Curtis e0afaf3a7d finish up openmw-cs 8 years ago
Bret Curtis a4372b6c5f get openmw-cs model covered 8 years ago
Bret Curtis a39b593b9b add beginning of openmw-cs docs 8 years ago
Marc Zinnschlag 79956e4b49 Merge remote-tracking branch 'origin/master' 8 years ago
Marc Zinnschlag 23818ec409 Merge remote-tracking branch 'matahualpa/openmw-cs_emittertype' 8 years ago
MiroslavR f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 8 years ago
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.)
8 years ago
scrawl 96ca50e108 Merge pull request #1211 from Allofich/warnings
Fix Clang and OS X Travis CI warnings
8 years ago
Allofich 621d3e56cf Fix Clang and OS X Travis CI warnings 8 years ago
David Cernat 27c4015f50 [General] Remove unused packet placeholder ID_OBJECT_HEALTH 8 years ago
David Cernat 1198caddf6 [Server] Add OnContainer script callback 8 years ago
David Cernat 5300bcd711 Merge pull request #153 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017, part 2
8 years ago
Bret Curtis e8bc57c232 add the rest of the openmw source documentation 8 years ago
Bret Curtis 3b4c4f6f63 Merge pull request #1205 from psi29a/sphinx
make local documentation development easier
8 years ago
David Cernat eba7d8408f [Server] Use script function to get spellbook action 8 years ago
Bret Curtis d4ea85a4c6 reorganization and added mwgui 8 years ago
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.)
8 years ago
David Cernat 5b3fabdb9d [Client] Send ID_CONTAINER with all containers in cell when requested 8 years ago
David Cernat c32c004516 Merge pull request #151 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017
8 years ago
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
8 years ago
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.)
8 years ago
scrawl f10edb71cc Add environment variable for disabling IncrementalCompileOperation 8 years ago
scrawl c4a89065a2 Preload VFX of spells selected by AI actors 8 years ago
scrawl 57b585570a Preload magic effect visuals of the player's selected weapon/spell 8 years ago
Marc Zinnschlag e46fb1770c Merge remote-tracking branch 'matahualpa/openmw-cs_booktype' 8 years ago
David Cernat 4c240038e1 Merge pull request #150 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017, part 2
8 years ago
David Cernat 3b604a432e [General] Restructure ID_CONTAINER to allow multiple containers at once 8 years ago
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.
8 years ago
Bret Curtis 4073115159 add mwdialogue 8 years ago
Bret Curtis 19f732c4ee automate the task of including all the necessary files for openmw 8 years ago
David Cernat 88f891b5bd [Client] Make it possible to easily iterate through container items 8 years ago
David Cernat c8cbfbef62 [General] Sketch out server requests to players for container data 8 years ago
scrawl 884c01fc3c Merge pull request #1206 from OpenMW/authors-update
I'm not inactive, just busy. ;)
8 years ago
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.
8 years ago
Bret Curtis 7886dd4c0a I'm not inactive, just busy. ;) 8 years ago