1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00
Commit Graph

1277 Commits

Author SHA1 Message Date
85f49bc968 CGHeroInstance::initArmy: don't use GS RNG. Get RNG through a ref
This function used by both server-side and gamestate so it's must use appropriate random source.
2016-09-09 23:16:42 +03:00
2ba3b20928 Multiple changes to RNG usage to both client and server
Server should never use RNG from CGameState directly.
Instead server get's own RNG that's state is secret for client.
2016-09-09 23:16:42 +03:00
02f70464fb Fix mismatched-tags Clang warnings
They're not important at all, but sicne there only few of them left just fix them.
2016-09-08 19:42:59 +03:00
a109580b91 Use const for ObjectTemplate 2016-09-08 18:06:28 +03:00
114dac7e81 Added ObjectTemplate copy constructor and assignment operator 2016-09-08 17:02:59 +03:00
044e2b9e51 Properly calculate building requirements
In OH3 you can't build Capitol when Tavern is not builded.
In VCMI up to now you could.
2016-08-30 22:15:24 +02:00
326be61ecb Show atrifact's name in message of Warrior's tomb 2016-08-30 20:50:03 +02:00
52797082aa Do not show whether Shrine is visited by hero, if was not visited by player yet 2016-08-30 20:48:03 +02:00
c6d257f328 Fixed CQuest leak 2016-08-30 09:48:10 +03:00
94bb5b9901 CGKeys::wasMyColorVisited: fix to not change playerKeyMap on client 2016-08-25 16:47:52 +03:00
a90b657b86 Add reset to some static variables on client 2016-08-25 15:52:20 +03:00
355f0a74ab CGSeerHut: add initialization to constructor 2016-08-23 01:19:03 +03:00
52e660f087 CQuest: add proper constructor to avoid uninitialized fields 2016-08-22 20:41:37 +03:00
206c5699cf CGHeroInstance::SecondarySkillsInfo: always set rand seed
Seed will always be set again on hero initialization, but for save sync it's must be same before that. Related to issue 2459
2016-08-19 23:31:54 +03:00
ab06cfd586 More fixes for uninitialized fields 2016-08-18 18:53:28 +03:00
e26384062f Fixed memory leak in CObjectClassesHandler 2016-08-17 09:24:01 +03:00
b0045fa357 Fix TurnInfo memory leaks 2016-08-16 15:47:21 +03:00
2410f0af61 - WeightedRule optimization - part 1
- comments, style
2016-08-11 07:49:08 +02:00
2bffd4e5c1 Moar optimization! 2016-08-09 13:40:46 +02:00
201ed26795 Fixed #1213 2016-06-06 09:30:45 +02:00
10dbbead2d Fix indentation of logging code and around it
That wouldn't be as big issue if problem affected few files, but it everywhere in codebase.
Fixed it everywhere since in most files that is the only code with wrong indentation.
2016-03-12 04:46:21 +03:00
8f1fba9551 Merge pull request #146 from vcmi/feature/VCMIMapFormat1
Ok let's try it.
2016-03-01 07:49:54 +01:00
5408b6c1ff Formatting 2016-02-26 18:19:41 +03:00
8e3e574900 Fix map object appearance serialization 2016-02-26 02:03:14 +03:00
0de1a37d65 Fix missing template zIndex saving 2016-02-26 01:01:07 +03:00
2021decb91 Serialize town spells 2016-02-25 22:59:17 +03:00
d2f04332d0 Load object appearance and pos before addNewObject call, it is required for block-visit calculation.
Added a test for tile block-visit.
2016-02-24 00:44:17 +03:00
17e557be17 Advance Logical identifier condition 2016-02-23 16:36:21 +03:00
4bcfb8c27d Draft of new Event conditions 2016-02-22 23:43:57 +03:00
dc5ad7d7b3 Make string instance names persistent 2016-02-22 19:26:42 +03:00
ac281f3fec Tweaks 2016-02-22 04:53:14 +03:00
9428f865d3 CGTownInstance: erase all stacks when town is captured by enemy 2016-02-22 03:33:15 +03:00
64cb0267a3 Do not save "visitableFrom" if object do not have active tiles. 2016-02-22 03:22:10 +03:00
51bee1000b Implemented CGWitchHut::serializeJsonOptions 2016-02-22 03:16:33 +03:00
d15106bf63 CGTownInstance: implement armies merging on siege. Fix issue 169
Merging algorithm is replicate one from original game.
2016-02-22 02:46:31 +03:00
dd1aabbe23 Use JsonSerializeFormat for map objects 2016-02-22 02:37:19 +03:00
53b5587c2e Advance map header serialization 2016-02-21 21:21:22 +03:00
07961766ca CGPandoraBox: don't use giveCreatures object removal feature
For pandora box there's own removal function and for CGEvent based on it we sometimes don't want to remove object at all.
2016-02-17 11:28:54 +03:00
4d9058e412 Whitespace cleanup. (No code changes.) 2016-02-15 13:34:37 +03:00
67b03b9658 Fixed remaining tempOwner testsю 2016-02-14 12:25:49 +03:00
fb322b41bc Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 2016-02-14 12:14:57 +03:00
800f32c4cb Fix few cases of tempOwner initialization. 2016-02-14 12:13:30 +03:00
709dd833d5 Added hacks for hero identification. 2016-02-14 11:25:01 +03:00
e0af4a665a Added hacks fot spell scroll support. 2016-02-13 19:43:05 +03:00
d4524c2fbd CGDwelling: dont set owner for Refugee Camp. Fix issue 2029 2016-02-13 19:26:47 +03:00
a59f0c23ce Dedug tweaks 2016-02-13 17:16:00 +03:00
fb17914ae5 Debug tweaks 2016-02-10 08:59:24 +03:00
6db94ab74c Explicit army serialization - too much CArmedInstance descendants 2016-02-09 10:11:59 +03:00
53dc49e92a CGShipyard, CGShrine serialization 2016-02-09 09:17:20 +03:00
401ba48257 CGScholar serialization 2016-02-09 09:02:34 +03:00