Commit graph

2093 commits

Author SHA1 Message Date
YueR
49a4679986 update 2019-09-06 11:21:11 +08:00
YueR
fe5f74b2a2 update 2019-09-06 11:02:03 +08:00
YueR
4d1b0632b0 update 2019-09-06 11:01:46 +08:00
YueR
8b79bad320 update 2019-09-06 00:07:40 +08:00
YueR
f8f9221746 commit info 2019-09-05 23:18:35 +08:00
YueR
ca3cc0c438 update 2019-09-05 22:39:18 +08:00
YueR
8e79800f80 Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv 2019-09-05 22:23:18 +08:00
YueR
6984f5ce01 update 2019-09-05 22:23:00 +08:00
lishaoxia1985
faa90dd269 update chinese traslation (#1026)
* systemProp

* update

* update

* update
2019-09-05 15:27:22 +03:00
lishaoxia1985
6f779301dd
Merge branch 'master' into master 2019-09-05 11:10:15 +08:00
YueR
95c2b7bf3a Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv 2019-09-05 11:03:27 +08:00
YueR
9c546e6997 update 2019-09-05 11:01:13 +08:00
pikkolpk
359ac26f1f Update Diplomacy,Trade,Nations. (Russian translation) 2019-09-04 22:53:44 +03:00
Yair Morgenstern
e9bb39d9e5 Added name and description for map editor objects 2019-09-04 20:27:23 +03:00
Yair Morgenstern
59cb9f972c You now see your own Diplomacy screen when in multiplayer, and not that of the current player 2019-09-04 20:12:13 +03:00
Yair Morgenstern
6b2b8fae38
Update README.md 2019-09-03 23:56:58 +03:00
Yair Morgenstern
29cd6fcd31 Travis fix 2019-09-03 23:47:17 +03:00
Yair Morgenstern
91ac744692 Added "user id from clipboard" button in New Game screen
Fixed other user id problems
2019-09-03 23:22:27 +03:00
YueR
75224eb89e update to master 2019-09-04 02:30:05 +08:00
lishaoxia1985
455de79d28 Update chinese translation (#1024)
* systemProp

* update

* update
2019-09-03 21:10:42 +03:00
Yair Morgenstern
5f5adb1fcb
Merge branch 'master' into master 2019-09-03 21:06:31 +03:00
Smashfanful
225976365e Update Buildings.json 2019-09-03 21:05:11 +03:00
Smashfanful
4b530ebe38 Update Diplomacy,Trade,Nations.json 2019-09-03 21:04:56 +03:00
YueR
5bdfb72ef2 update 2019-09-04 01:22:45 +08:00
YueR
8fc704222c update 2019-09-03 22:25:12 +08:00
YueR
b1100bb9c3 systemProp 2019-09-03 19:56:26 +08:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
pikkolpk
9fa6c4ffce Update Units,Promotions.json (Russian Translation) 2019-09-02 22:44:32 +03:00
pikkolpk
4090f52606 Update Notifications.json (Russian translation) 2019-09-02 22:44:15 +03:00
Yair Morgenstern
c82ce697b9
Update NewCivs.md 2019-09-02 00:04:45 +03:00
Yair Morgenstern
a3a5a82eaa
Update NewCivs.md 2019-09-02 00:02:29 +03:00
Yair Morgenstern
65251ef04a Added documentation for adding a new civ 2019-09-02 00:00:06 +03:00
pikkolpk
f18d1fdaf3 Update Buildings.json 2019-09-01 23:06:00 +03:00
pikkolpk
16a362ac2f Update Techs.json 2019-09-01 23:06:00 +03:00
pikkolpk
a99e7866e6 Update Units translation(Russian) 2019-09-01 23:06:00 +03:00
Yair Morgenstern
675d05d1e4 Minor fixes to multiplayer UI components 2019-09-01 17:18:08 +03:00
Yair Morgenstern
efaa0c9a6c Performance improvements for NativeFont - separated chinese and other charsForFonts,
since the chinese have hundreds of chars and it makes the font loading time really long
2019-09-01 17:12:47 +03:00
Yair Morgenstern
a032269cd9 Resolved #563 - Added American unique B17 and Japanese unique Zero units 2019-09-01 16:35:20 +03:00
Yair Morgenstern
ab26f66e1a Implemented Alexander's unique - #563 2019-09-01 15:26:27 +03:00
Smashfanful
9a3ea36e2d Update Other.json 2019-09-01 15:16:18 +03:00
Smashfanful
743ecf3560 Update NewGame,SaveGame,LoadGame,Options.json 2019-09-01 15:16:10 +03:00
Yair Morgenstern
20493b12b6 Resolved #1014 - Great Engineers can hurry National Wonders 2019-09-01 15:13:06 +03:00
lishaoxia1985
62a85cd14a can use native font and "WenQuanYimicroHei" in andriod and desktop (#1013)
* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* Can Change Language with No "ttf" Font (#772)

* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* update nativefont for Desktop and IOS

* Delete NativeFontIOS.java

* can choose nativefont or font downloading from internet

* update

* update

* Update Fonts.kt

* Update Fonts.kt

* update

* update

* update

* update

* Update build.gradle

* update

* update

* update

* can choose native font or "WenquanYiMicroHei"

* update

* update

* update

* update
2019-09-01 13:01:37 +03:00
Yair Morgenstern
8d3a2d6da3 Organized Multiplayer popup 2019-08-31 22:24:18 +03:00
Yair Morgenstern
015b8343c7 Hoh boy so many changes to ensure the regular game works with multiplayer... 2019-08-30 14:46:52 +03:00
Yair Morgenstern
bc1592bafe Added game ID copy and join, so one person can create a game, send it to someone else, and the other person can join it 2019-08-29 13:18:09 +03:00
Yair Morgenstern
fd4d96ed8e Policy screen button moved to world screen instead of being in the menu 2019-08-29 12:04:43 +03:00
Yair Morgenstern
acdeea06b8 More steps towards upload/downloading multiplayer games 2019-08-29 11:09:57 +03:00
Yair Morgenstern
eb06ed2cf6 Unified PopupTable.addCloseButton()
Added basic online game upload/download functionality
2019-08-29 10:27:08 +03:00
Yair Morgenstern
ef75593794 More PopupTable.close() uses 2019-08-28 13:30:49 +03:00